Introduce MojoRendererFactory::ServiceProvider.

mojo/services/html_viewer/webmediaplayer_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 "mojo/services/html_viewer/webmediaplayer_factory.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
@@ skipping 28 matching lines @@
 
   if (!media::IsMediaLibraryInitialized()) {
     base::FilePath module_dir;
     CHECK(PathService::Get(base::DIR_EXE, &module_dir));
     CHECK(media::InitializeMediaLibrary(module_dir));
   }
 }
 
 WebMediaPlayerFactory::~WebMediaPlayerFactory() {
 }
 

[xhwang, 2014/12/13 01:06:31]

err, I'll add #if !defined(OS_ANDROID) here...

[xhwang, 2014/12/15 19:51:11]

Done.

+// Helper function to take the ownership of |service_provider_ptr|. Note that
+// mojo::ConnectToService takes a raw pointer which doesn't take the ownership.
+static void ConnectToMediaRendererService(
+    ServiceProviderPtr service_provider_ptr,
+    InterfacePtr<MediaRenderer>* media_renderer_ptr) {
+  ConnectToService(service_provider_ptr.get(), media_renderer_ptr);
+}
+
 blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client,
     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;
     shell->ConnectToApplication("mojo:media",
                                 GetProxy(&media_renderer_service_provider));
-    media_renderer_factory.reset(
-        new media::MojoRendererFactory(media_renderer_service_provider.Pass()));
+    media_renderer_factory.reset(new media::MojoRendererFactory(
+        base::Bind(&ConnectToMediaRendererService,
+                   base::Passed(&media_renderer_service_provider))));
   } 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_, nullptr);
@@ skipping 19 matching lines @@
 
 scoped_refptr<base::SingleThreadTaskRunner>
 WebMediaPlayerFactory::GetMediaThreadTaskRunner() {
   if (!media_thread_.IsRunning())
     media_thread_.Start();
 
   return media_thread_.message_loop_proxy();
 }
 
 }  // namespace mojo