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

media/remoting/fake_remoter.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/remoting/fake_remoting_controller.h"
+#include "media/remoting/fake_remoter.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "media/remoting/remoting_source_impl.h"
-#include "media/remoting/rpc/proto_utils.h"
+#include "media/remoting/proto_utils.h"
+#include "media/remoting/shared_session.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
+namespace remoting {
 
 FakeRemotingDataStreamSender::FakeRemotingDataStreamSender(
     mojom::RemotingDataStreamSenderRequest request,
     mojo::ScopedDataPipeConsumerHandle consumer_handle)
     : binding_(this, std::move(request)),
       consumer_handle_(std::move(consumer_handle)),
       consume_data_chunk_count_(0),
       send_frame_count_(0),
       cancel_in_flight_count_(0) {}
 
@@ skipping 10 matching lines @@
 bool FakeRemotingDataStreamSender::ValidateFrameBuffer(size_t index,
                                                        size_t size,
                                                        bool key_frame,
                                                        int pts_ms) {
   if (index >= received_frame_list.size()) {
     VLOG(1) << "There is no such frame";
     return false;
   }
 
   const std::vector<uint8_t>& data = received_frame_list[index];
-  scoped_refptr<::media::DecoderBuffer> media_buffer =
-      remoting::ByteArrayToDecoderBuffer(data.data(), data.size());
+  scoped_refptr<DecoderBuffer> media_buffer =
+      ByteArrayToDecoderBuffer(data.data(), data.size());
 
   // Checks if pts is correct or not
   if (media_buffer->timestamp().InMilliseconds() != pts_ms) {
     VLOG(1) << "Pts should be:" << pts_ms << "("
             << media_buffer->timestamp().InMilliseconds() << ")";
     return false;
   }
 
   // Checks if key frame is set correct or not
   if (media_buffer->is_key_frame() != key_frame) {
@@ skipping 108 matching lines @@
 
 FakeRemoterFactory::~FakeRemoterFactory() {}
 
 void FakeRemoterFactory::Create(mojom::RemotingSourcePtr source,
                                 mojom::RemoterRequest request) {
   mojo::MakeStrongBinding(
       base::MakeUnique<FakeRemoter>(std::move(source), start_will_fail_),
       std::move(request));
 }
 
-scoped_refptr<RemotingSourceImpl> CreateRemotingSourceImpl(
+// static
+scoped_refptr<SharedSession> FakeRemoterFactory::CreateSharedSession(
     bool start_will_fail) {
   mojom::RemotingSourcePtr remoting_source;
   mojom::RemotingSourceRequest remoting_source_request(&remoting_source);
   mojom::RemoterPtr remoter;
-  std::unique_ptr<mojom::RemoterFactory> remoter_factory =
-      base::MakeUnique<FakeRemoterFactory>(start_will_fail);
-  remoter_factory->Create(std::move(remoting_source),
-                          mojo::MakeRequest(&remoter));
-  return new RemotingSourceImpl(std::move(remoting_source_request),
-                                std::move(remoter));
+  FakeRemoterFactory remoter_factory(start_will_fail);
+  remoter_factory.Create(std::move(remoting_source),
+                         mojo::MakeRequest(&remoter));
+  return new SharedSession(std::move(remoting_source_request),
+                           std::move(remoter));
 }
 
+}  // namespace remoting
 }  // namespace media