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

components/html_viewer/web_media_player_factory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/html_viewer/web_media_player_factory.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
@@ skipping 71 matching lines @@
     media::CdmFactory* cdm_factory,
     blink::WebContentDecryptionModule* initial_cdm,
     mojo::Shell* shell) {
 #if defined(OS_ANDROID)
   return nullptr;
 #else
   scoped_refptr<media::MediaLog> media_log(new media::MediaLog());
   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,
                                           nullptr,  // No GPU factory.
                                           GetAudioHardwareConfig()));
   }
 
   media::WebMediaPlayerParams params(
       media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(),
       media_log, GetMediaThreadTaskRunner(), compositor_task_runner_,
@@ skipping 21 matching lines @@
 
 scoped_refptr<base::SingleThreadTaskRunner>
 WebMediaPlayerFactory::GetMediaThreadTaskRunner() {
   if (!media_thread_.IsRunning())
     media_thread_.Start();
 
   return media_thread_.message_loop_proxy();
 }
 
 }  // namespace html_viewer