Media Remoting: Add remoting control logic for encrypted contents.

media/remoting/remote_renderer_impl_unittest.cc

Index: media/remoting/remote_renderer_impl_unittest.cc
diff --git a/media/remoting/remote_renderer_impl_unittest.cc b/media/remoting/remote_renderer_impl_unittest.cc
index 3d552b969f90051d9cc410216a346697ba9ef8b3..7b1d7b725b3f59eab3d0e784146fe0e4774d5859 100644
--- a/media/remoting/remote_renderer_impl_unittest.cc
+++ b/media/remoting/remote_renderer_impl_unittest.cc
@@ -8,7 +8,7 @@
 #include "media/base/pipeline_status.h"
 #include "media/remoting/fake_remoting_controller.h"
 #include "media/remoting/fake_remoting_demuxer_stream_provider.h"
-#include "media/remoting/remoting_controller.h"
+#include "media/remoting/remoting_renderer_controller.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -117,7 +117,7 @@ class RemoteRendererImplTest : public testing::Test {
         acquire_done->set_proc(
             remoting::pb::RpcMessage::RPC_ACQUIRE_RENDERER_DONE);
         acquire_done->set_integer_value(receiver_renderer_handle_);
-        remoting_controller_->GetRpcBroker()->ProcessMessageFromRemote(
+        remoting_renderer_controller_->GetRpcBroker()->ProcessMessageFromRemote(
             std::move(acquire_done));
       } break;
       case remoting::pb::RpcMessage::RPC_R_INITIALIZE: {
@@ -137,8 +137,8 @@ class RemoteRendererImplTest : public testing::Test {
           ds_init->set_handle(sender_audio_demuxer_handle_);
           ds_init->set_proc(remoting::pb::RpcMessage::RPC_DS_INITIALIZE);
           ds_init->set_integer_value(receiver_audio_demuxer_callback_handle_);
-          remoting_controller_->GetRpcBroker()->ProcessMessageFromRemote(
-              std::move(ds_init));
+          remoting_renderer_controller_->GetRpcBroker()
+              ->ProcessMessageFromRemote(std::move(ds_init));
         }
         if (sender_video_demuxer_handle_ != remoting::kInvalidHandle) {
           std::unique_ptr<remoting::pb::RpcMessage> ds_init(
@@ -146,8 +146,8 @@ class RemoteRendererImplTest : public testing::Test {
           ds_init->set_handle(sender_video_demuxer_handle_);
           ds_init->set_proc(remoting::pb::RpcMessage::RPC_DS_INITIALIZE);
           ds_init->set_integer_value(receiver_video_demuxer_callback_handle_);
-          remoting_controller_->GetRpcBroker()->ProcessMessageFromRemote(
-              std::move(ds_init));
+          remoting_renderer_controller_->GetRpcBroker()
+              ->ProcessMessageFromRemote(std::move(ds_init));
         }
       } break;
       case remoting::pb::RpcMessage::RPC_DS_INITIALIZE_CALLBACK: {
@@ -168,8 +168,8 @@ class RemoteRendererImplTest : public testing::Test {
           init_cb->set_proc(
               remoting::pb::RpcMessage::RPC_R_INITIALIZE_CALLBACK);
           init_cb->set_boolean_value(true);
-          remoting_controller_->GetRpcBroker()->ProcessMessageFromRemote(
-              std::move(init_cb));
+          remoting_renderer_controller_->GetRpcBroker()
+              ->ProcessMessageFromRemote(std::move(init_cb));
           renderer_initialized_ = true;
         }
 
@@ -180,7 +180,7 @@ class RemoteRendererImplTest : public testing::Test {
             new remoting::pb::RpcMessage());
         flush_cb->set_handle(rpc->renderer_flushuntil_rpc().callback_handle());
         flush_cb->set_proc(remoting::pb::RpcMessage::RPC_R_FLUSHUNTIL_CALLBACK);
-        remoting_controller_->GetRpcBroker()->ProcessMessageFromRemote(
+        remoting_renderer_controller_->GetRpcBroker()->ProcessMessageFromRemote(
             std::move(flush_cb));
 
       } break;
@@ -207,7 +207,7 @@ class RemoteRendererImplTest : public testing::Test {
     EXPECT_CALL(*render_client_, OnPipelineStatus(_)).Times(1);
     DCHECK(remote_renderer_impl_);
     // Redirect RPC message for simulate receiver scenario
-    remoting_controller_->GetRpcBroker()->SetMessageCallbackForTesting(
+    remoting_renderer_controller_->GetRpcBroker()->SetMessageCallbackForTesting(
         base::Bind(&RemoteRendererImplTest::RpcMessageResponseBot,
                    base::Unretained(this)));
     RunPendingTasks();
@@ -217,7 +217,7 @@ class RemoteRendererImplTest : public testing::Test {
                    base::Unretained(render_client_.get())));
     RunPendingTasks();
     // Redirect RPC message back to save for later check.
-    remoting_controller_->GetRpcBroker()->SetMessageCallbackForTesting(
+    remoting_renderer_controller_->GetRpcBroker()->SetMessageCallbackForTesting(
         base::Bind(&RemoteRendererImplTest::OnSendMessageToSink,
                    base::Unretained(this)));
     RunPendingTasks();
@@ -232,18 +232,19 @@ class RemoteRendererImplTest : public testing::Test {
   }
 
   void SetUp() override {
-    // Creates RemotingController.
-    remoter_factory_.reset(new FakeRemoterFactory(true));
-    remoting_controller_ = CreateRemotingController(remoter_factory_.get());
+    // Creates RemotingRendererController.
+    remoting_renderer_controller_ =
+        base::MakeUnique<RemotingRendererController>(
+            CreateRemotingSourceImpl(false));
     // Redirect RPC message to RemoteRendererImplTest::OnSendMessageToSink().
-    remoting_controller_->GetRpcBroker()->SetMessageCallbackForTesting(
+    remoting_renderer_controller_->GetRpcBroker()->SetMessageCallbackForTesting(
         base::Bind(&RemoteRendererImplTest::OnSendMessageToSink,
                    base::Unretained(this)));
 
     // Creates RemoteRendererImpl.
     remote_renderer_impl_.reset(
         new RemoteRendererImpl(base::ThreadTaskRunnerHandle::Get(),
-                               remoting_controller_->GetWeakPtr()));
+                               remoting_renderer_controller_->GetWeakPtr()));
     RunPendingTasks();
   }
 
@@ -270,8 +271,7 @@ class RemoteRendererImplTest : public testing::Test {
     ASSERT_EQ(remote_renderer_impl_->current_max_time_, current_max);
   }
 
-  std::unique_ptr<FakeRemoterFactory> remoter_factory_;
-  std::unique_ptr<RemotingController> remoting_controller_;
+  std::unique_ptr<RemotingRendererController> remoting_renderer_controller_;
   std::unique_ptr<RendererClientImpl> render_client_;
   std::unique_ptr<FakeRemotingDemuxerStreamProvider> demuxer_stream_provider_;
   std::unique_ptr<RemoteRendererImpl> remote_renderer_impl_;
@@ -317,8 +317,9 @@ TEST_F(RemoteRendererImplTest, Flush) {
 
   // Flush Renderer.
   // Redirect RPC message for simulate receiver scenario
-  remoting_controller_->GetRpcBroker()->SetMessageCallbackForTesting(base::Bind(
-      &RemoteRendererImplTest::RpcMessageResponseBot, base::Unretained(this)));
+  remoting_renderer_controller_->GetRpcBroker()->SetMessageCallbackForTesting(
+      base::Bind(&RemoteRendererImplTest::RpcMessageResponseBot,
+                 base::Unretained(this)));
   RunPendingTasks();
   EXPECT_CALL(*render_client_, OnFlushCallback()).Times(1);
   remote_renderer_impl_->Flush(
@@ -372,8 +373,9 @@ TEST_F(RemoteRendererImplTest, SetPlaybackRate) {
   InitializeRenderer();
   RunPendingTasks();
 
-  remoting_controller_->GetRpcBroker()->SetMessageCallbackForTesting(base::Bind(
-      &RemoteRendererImplTest::OnSendMessageToSink, base::Unretained(this)));
+  remoting_renderer_controller_->GetRpcBroker()->SetMessageCallbackForTesting(
+      base::Bind(&RemoteRendererImplTest::OnSendMessageToSink,
+                 base::Unretained(this)));
   remote_renderer_impl_->SetPlaybackRate(2.5);
   RunPendingTasks();
   ASSERT_EQ(1, ReceivedRpcMessageCount());