WIP - Add EME

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 deb09b09d3268cba0c77775c9f65b92b6d310da2..7a41ba35371949a217a6f3d794e2a9ffc2b4bcc2 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -257,7 +257,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,19 @@ 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));
+  scoped_refptr<media::RemotingSourceImpl> remoting_source_impl =
+      new media::RemotingSourceImpl(std::move(remoting_source_request),
+                                    std::move(remoter));
+  return base::MakeUnique<media::RemotingRendererController>(

[miu, 2016/10/25 04:21:25]

nit: Looks like you were trying to do this:

  return base::MakeUnique<media::RemotingRendererController(
      make_scoped_refptr(new media::RemotingSourceImpl(
          std::move(remoting_source_request), std::move(remoter))));

[xjz, 2016/10/26 22:00:25]

Done.

+      std::move(remoting_source_impl));
 }
 #endif
 
@@ -2732,8 +2737,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 +2796,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));
@@ -6380,6 +6385,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()));
+#endif  // BUILDFLAG(ENABLE_MEDIA_REMOTING)
 #endif  // BUILDFLAG(ENABLE_PEPPER_CDMS)
 
   return cdm_factory_.get();