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

components/html_viewer/web_media_player_factory.cc

Index: components/html_viewer/web_media_player_factory.cc
diff --git a/components/html_viewer/web_media_player_factory.cc b/components/html_viewer/web_media_player_factory.cc
index 0ffe31222a2b11ed458e4d9887492eeb83e3156d..f519d4684f52facac6583f3b720a914511b1b361 100644
--- a/components/html_viewer/web_media_player_factory.cc
+++ b/components/html_viewer/web_media_player_factory.cc
@@ -89,13 +89,13 @@ blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer(
   scoped_ptr<media::RendererFactory> media_renderer_factory;
 
   if (enable_mojo_media_renderer_) {
-    ServiceProviderPtr media_renderer_service_provider;
+    ServiceProviderPtr media_service_provider;
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From("mojo:media");
-    shell->ConnectToApplication(
-        request.Pass(), GetProxy(&media_renderer_service_provider), nullptr);
+    shell->ConnectToApplication(request.Pass(),
+                                GetProxy(&media_service_provider), nullptr);
     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,