Media Remoting Clean-up: Less-redundant naming, style consistency, etc.

media/remoting/fake_demuxer_stream_provider.h

Index: media/remoting/fake_demuxer_stream_provider.h
diff --git a/media/remoting/fake_remoting_demuxer_stream_provider.h b/media/remoting/fake_demuxer_stream_provider.h
similarity index 67%
rename from media/remoting/fake_remoting_demuxer_stream_provider.h
rename to media/remoting/fake_demuxer_stream_provider.h
index 2ae13975fd39b33f70838aaa0f493e1f46afcef6..dfebff96b1b5c3990bc1e8701dc113f8178ae31d 100644
--- a/media/remoting/fake_remoting_demuxer_stream_provider.h
+++ b/media/remoting/fake_demuxer_stream_provider.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_REMOTING_FAKE_REMOTING_DEMUXER_STREAM_PROVIDER_H_
-#define MEDIA_REMOTING_FAKE_REMOTING_DEMUXER_STREAM_PROVIDER_H_
+#ifndef MEDIA_REMOTING_FAKE_DEMUXER_STREAM_PROVIDER_H_
+#define MEDIA_REMOTING_FAKE_DEMUXER_STREAM_PROVIDER_H_
 
 #include <deque>
 
@@ -14,11 +14,12 @@
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
+namespace remoting {
 
-class DummyDemuxerStream : public DemuxerStream {
+class FakeDemuxerStream : public DemuxerStream {
  public:
-  explicit DummyDemuxerStream(bool is_audio);
-  ~DummyDemuxerStream() override;
+  explicit FakeDemuxerStream(bool is_audio);
+  ~FakeDemuxerStream() override;
 
   // DemuxerStream implementation.
   MOCK_METHOD1(Read, void(const ReadCB& read_cb));
@@ -37,31 +38,32 @@ class DummyDemuxerStream : public DemuxerStream {
   void CreateFakeFrame(size_t size, bool key_frame, int pts_ms);
 
  private:
-  using BufferQueue = std::deque<scoped_refptr<::media::DecoderBuffer>>;
+  using BufferQueue = std::deque<scoped_refptr<DecoderBuffer>>;
   BufferQueue buffer_queue_;
   ReadCB pending_read_cb_;
   Type type_;
   AudioDecoderConfig audio_config_;
   VideoDecoderConfig video_config_;
 
-  DISALLOW_COPY_AND_ASSIGN(DummyDemuxerStream);
+  DISALLOW_COPY_AND_ASSIGN(FakeDemuxerStream);
 };
 
 // Audio only demuxer stream provider
-class FakeRemotingDemuxerStreamProvider : public DemuxerStreamProvider {
+class FakeDemuxerStreamProvider : public DemuxerStreamProvider {
  public:
-  FakeRemotingDemuxerStreamProvider();
-  ~FakeRemotingDemuxerStreamProvider() final;
+  FakeDemuxerStreamProvider();
+  ~FakeDemuxerStreamProvider() final;
 
   // DemuxerStreamProvider implementation.
   DemuxerStream* GetStream(DemuxerStream::Type type) override;
 
  private:
-  std::unique_ptr<DummyDemuxerStream> demuxer_stream_;
+  std::unique_ptr<FakeDemuxerStream> demuxer_stream_;
 
-  DISALLOW_COPY_AND_ASSIGN(FakeRemotingDemuxerStreamProvider);
+  DISALLOW_COPY_AND_ASSIGN(FakeDemuxerStreamProvider);
 };
 
+}  // namespace remoting
 }  // namespace media
 
-#endif  // MEDIA_REMOTING_FAKE_REMOTING_DEMUXER_STREAM_PROVIDER_H_
+#endif  // MEDIA_REMOTING_FAKE_DEMUXER_STREAM_PROVIDER_H_