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"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_output_stream_sink.h"
 #include "media/base/audio_hardware_config.h"
 #include "media/base/media.h"
 #include "media/base/media_log.h"
 #include "media/blink/webmediaplayer_impl.h"
 #include "media/blink/webmediaplayer_params.h"
 #include "media/filters/default_renderer_factory.h"
 #include "media/filters/gpu_video_accelerator_factories.h"
 #include "media/mojo/interfaces/media_renderer.mojom.h"
 #include "media/mojo/services/mojo_renderer_factory.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 
 namespace mojo {
 
+#if !defined(OS_ANDROID)
+namespace {
+
+class RendererServiceProvider
+    : public media::MojoRendererFactory::ServiceProvider {
+ public:
+  RendererServiceProvider(ServiceProviderPtr service_provider_ptr);

[jamesr, 2014/12/16 01:47:37]

explicit

[xhwang, 2014/12/16 05:05:11]

Done.

+  ~RendererServiceProvider() final;
+  void ConnectToService(
+      mojo::InterfacePtr<mojo::MediaRenderer>* media_renderer_ptr) final;

[jamesr, 2014/12/16 01:47:37]

this code is in namespace mojo, you can drop all these 'mojo::'s

[xhwang, 2014/12/16 05:05:11]

Done.

+
+ private:
+  ServiceProviderPtr service_provider_ptr_;
+
+  DISALLOW_COPY_AND_ASSIGN(RendererServiceProvider);
+};
+
+RendererServiceProvider::RendererServiceProvider(

[jamesr, 2014/12/16 01:47:37]

i would just inline these

[xhwang, 2014/12/16 05:05:11]

Done.

+    ServiceProviderPtr service_provider_ptr)
+    : service_provider_ptr_(service_provider_ptr.Pass()) {
+}
+
+RendererServiceProvider::~RendererServiceProvider() {
+}
+
+void RendererServiceProvider::ConnectToService(
+    mojo::InterfacePtr<mojo::MediaRenderer>* media_renderer_ptr) {
+  mojo::ConnectToService(service_provider_ptr_.get(), media_renderer_ptr);
+}
+
+}  // namespace
+#endif
+
 WebMediaPlayerFactory::WebMediaPlayerFactory(
     const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
     bool enable_mojo_media_renderer)
     : compositor_task_runner_(compositor_task_runner),
       enable_mojo_media_renderer_(enable_mojo_media_renderer),
       media_thread_("Media"),
       audio_manager_(media::AudioManager::Create(&fake_audio_log_factory_)),
       audio_hardware_config_(
           audio_manager_->GetInputStreamParameters(
               media::AudioManagerBase::kDefaultDeviceId),
@@ skipping 17 matching lines @@
 #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(
+        scoped_ptr<media::MojoRendererFactory::ServiceProvider>(

[jamesr, 2014/12/16 01:47:37]

you don't need to spell this type out again. just say "make_scoped_ptr(new
....)"

(this works now because rvalue to scoped_ptr<Derived> can be converted to
rvalues of scoped_ptr<Base>)

[xhwang, 2014/12/16 05:05:11]

Good to know. Thanks!

+            new RendererServiceProvider(
+                media_renderer_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_, 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