Pass mojo::MediaRendererPtr in MojoRendererImpl's constructor.

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/base/renderer.h"
 #include "media/blink/webmediaplayer_impl.h"
 #include "media/blink/webmediaplayer_params.h"
 #include "media/filters/gpu_video_accelerator_factories.h"
+#include "media/mojo/interfaces/media_renderer.mojom.h"
 #include "media/mojo/services/mojo_renderer_impl.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 
 namespace mojo {
 
 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),
@@ skipping 21 matching lines @@
     Shell* shell) {
 #if defined(OS_ANDROID)
   return NULL;
 #else
   scoped_ptr<media::Renderer> renderer;
 
   if (enable_mojo_media_renderer_) {
     ServiceProviderPtr media_renderer_service_provider;
     shell->ConnectToApplication("mojo:media",
                                 GetProxy(&media_renderer_service_provider));
-    renderer.reset(new media::MojoRendererImpl(
-        GetMediaThreadTaskRunner(), media_renderer_service_provider.get()));
+
+    mojo::MediaRendererPtr mojo_media_renderer;

[jamesr, 2014/12/05 23:12:31]

we're in namespace mojo here, so you can drop the "mojo::" from this line and
the next

[xhwang, 2014/12/05 23:31:00]

Done.

+    mojo::ConnectToService(media_renderer_service_provider.get(),
+                           &mojo_media_renderer);
+
+    renderer.reset(new media::MojoRendererImpl(GetMediaThreadTaskRunner(),
+                                               mojo_media_renderer.Pass()));
   }
 
   media::WebMediaPlayerParams params(
       media::WebMediaPlayerParams::DeferLoadCB(),
       CreateAudioRendererSink(),
       GetAudioHardwareConfig(),
       new media::MediaLog(),
       scoped_refptr<media::GpuVideoAcceleratorFactories>(),
       GetMediaThreadTaskRunner(),
       compositor_task_runner_,
@@ skipping 20 matching lines @@
 
 scoped_refptr<base::SingleThreadTaskRunner>
 WebMediaPlayerFactory::GetMediaThreadTaskRunner() {
   if (!media_thread_.IsRunning())
     media_thread_.Start();
 
   return media_thread_.message_loop_proxy();
 }
 
 }  // namespace mojo