Media Remoting: Add remoting control logic for encrypted contents.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 344ea5b418251cb7e9adcf95c027db41f4766c67..17dc7e346408354756279417eb3ca0cd157bc76a 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -256,7 +256,9 @@
 #endif
 
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
-#include "media/remoting/remoting_controller.h"        // nogncheck
+#include "media/remoting/remoting_cdm_controller.h"       // nogncheck
+#include "media/remoting/remoting_cdm_factory.h"          // nogncheck
+#include "media/remoting/remoting_renderer_controller.h"  // nogncheck
 #include "media/remoting/remoting_renderer_factory.h"  // nogncheck
 #endif
 
@@ -2678,16 +2680,17 @@ blink::WebPlugin* RenderFrameImpl::createPlugin(
 }
 
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
-std::unique_ptr<media::RemotingController>
-RenderFrameImpl::CreateRemotingController() {
+std::unique_ptr<media::RemotingRendererController>
+RenderFrameImpl::CreateRemotingRendererController() {
   media::mojom::RemotingSourcePtr remoting_source;
   media::mojom::RemotingSourceRequest remoting_source_request =
       mojo::GetProxy(&remoting_source);
   media::mojom::RemoterPtr remoter;
   GetRemoterFactory()->Create(std::move(remoting_source),
                               mojo::GetProxy(&remoter));
-  return base::MakeUnique<media::RemotingController>(
-      std::move(remoting_source_request), std::move(remoter));
+  return base::MakeUnique<media::RemotingRendererController>(
+      make_scoped_refptr(new media::RemotingSourceImpl(
+          std::move(remoting_source_request), std::move(remoter))));
 }
 #endif
 
@@ -2732,8 +2735,8 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
 #endif  // defined(OS_ANDROID)
 
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
-  std::unique_ptr<media::RemotingController> remoting_controller =
-      CreateRemotingController();
+  std::unique_ptr<media::RemotingRendererController> remoting_controller =
+      CreateRemotingRendererController();
   base::WeakPtr<media::MediaObserver> media_observer =
       remoting_controller->GetWeakPtr();
 #else
@@ -2791,7 +2794,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
   }
 
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
-  media::RemotingController* remoting_controller_ptr =
+  media::RemotingRendererController* remoting_controller_ptr =
       remoting_controller.get();
   media_renderer_factory = base::MakeUnique<media::RemotingRendererFactory>(
       std::move(media_renderer_factory), std::move(remoting_controller));
@@ -6402,6 +6405,12 @@ media::CdmFactory* RenderFrameImpl::GetCdmFactory() {
   DCHECK(frame_);
   cdm_factory_.reset(
       new RenderCdmFactory(base::Bind(&PepperCdmWrapperImpl::Create, frame_)));
+#if BUILDFLAG(ENABLE_MEDIA_REMOTING)
+  cdm_factory_.reset(new media::RemotingCdmFactory(
+      base::MakeUnique<RenderCdmFactory>(
+          base::Bind(&PepperCdmWrapperImpl::Create, frame_)),
+      GetRemoterFactory()));

[xhwang, 2016/11/01 08:21:28]

On desktop, where we have both ENABLE_PEPPER_CDMS and ENABLE_MEDIA_REMOTING,
we'll create a RendererCdmFactory, destroy it, and create another one. Can we
streamline the logic to avoid this?

[xjz, 2016/11/01 21:55:52]

Done. Nice catch. Thanks.

+#endif  // BUILDFLAG(ENABLE_MEDIA_REMOTING)
 #endif  // BUILDFLAG(ENABLE_PEPPER_CDMS)
 
   return cdm_factory_.get();