media: Support creation and SetCdm() for mojo based CDM.

mojo/services/html_viewer/webmediaplayer_factory.cc

Index: mojo/services/html_viewer/webmediaplayer_factory.cc
diff --git a/mojo/services/html_viewer/webmediaplayer_factory.cc b/mojo/services/html_viewer/webmediaplayer_factory.cc
index 0b73a9856c6109d7b8b87a7e2b0fa5045c2e30a0..423c5b96824dec6d1746260c6c7632134aef6130 100644
--- a/mojo/services/html_viewer/webmediaplayer_factory.cc
+++ b/mojo/services/html_viewer/webmediaplayer_factory.cc
@@ -17,7 +17,9 @@
 #include "media/blink/webmediaplayer_impl.h"
 #include "media/blink/webmediaplayer_params.h"
 #include "media/cdm/default_cdm_factory.h"
+#include "media/mojo/interfaces/content_decryption_module_factory.mojom.h"
 #include "media/mojo/interfaces/media_renderer.mojom.h"
+#include "media/mojo/services/mojo_cdm_factory.h"
 #include "media/mojo/services/mojo_renderer_factory.h"
 #include "media/renderers/default_renderer_factory.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
@@ -86,18 +88,26 @@ blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer(
 #else
   scoped_refptr<media::MediaLog> media_log(new media::MediaLog());
   scoped_ptr<media::RendererFactory> media_renderer_factory;
+  scoped_ptr<media::CdmFactory> cdm_factory;
 
   if (enable_mojo_media_renderer_) {
-    ServiceProviderPtr media_renderer_service_provider;
-    shell->ConnectToApplication(
-        "mojo:media", GetProxy(&media_renderer_service_provider), nullptr);
+    ServiceProviderPtr media_service_provider;
+    shell->ConnectToApplication("mojo:media", GetProxy(&media_service_provider),
+                                nullptr);
+
+    // TODO(xhwang): Create only one |cdm_factory_ptr| per process.
+    mojo::ContentDecryptionModuleFactoryPtr cdm_factory_ptr;
+    mojo::ConnectToService(media_service_provider.get(), &cdm_factory_ptr);
+    cdm_factory.reset(new media::MojoCdmFactory(cdm_factory_ptr.Pass()));
+
     media_renderer_factory.reset(new media::MojoRendererFactory(make_scoped_ptr(
-        new RendererServiceProvider(media_renderer_service_provider.Pass()))));
+        new RendererServiceProvider(media_service_provider.Pass()))));
   } else {
     media_renderer_factory.reset(
         new media::DefaultRendererFactory(media_log,
                                           nullptr,  // No GPU factory.
                                           GetAudioHardwareConfig()));
+    cdm_factory.reset(new media::DefaultCdmFactory());
   }
 
   media::WebMediaPlayerParams params(
@@ -107,8 +117,6 @@ blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer(
       initial_cdm);
   base::WeakPtr<media::WebMediaPlayerDelegate> delegate;
 
-  scoped_ptr<media::CdmFactory> cdm_factory(new media::DefaultCdmFactory());
-
   return new media::WebMediaPlayerImpl(frame, client, delegate,
                                        media_renderer_factory.Pass(),
                                        cdm_factory.Pass(), params);