Index: media/mojo/services/mojo_renderer_factory.cc |
diff --git a/media/mojo/services/mojo_renderer_factory.cc b/media/mojo/services/mojo_renderer_factory.cc |
index 029c378ad24e8c77437f040cd22ecbe16642c3a6..dffa43222d8edde9af9cc19c3a7ec46879a8b37c 100644 |
--- a/media/mojo/services/mojo_renderer_factory.cc |
+++ b/media/mojo/services/mojo_renderer_factory.cc |
@@ -7,13 +7,13 @@ |
#include "base/single_thread_task_runner.h" |
#include "media/mojo/interfaces/media_renderer.mojom.h" |
#include "media/mojo/services/mojo_renderer_impl.h" |
-#include "mojo/public/cpp/application/connect.h" |
namespace media { |
MojoRendererFactory::MojoRendererFactory( |
- mojo::ServiceProviderPtr renderer_service_provider) |
- : renderer_service_provider_(renderer_service_provider.Pass()) { |
+ const ConnectToServiceCB& connect_to_service_cb) |
+ : connect_to_service_cb_(connect_to_service_cb) { |
+ DCHECK(!connect_to_service_cb_.is_null()); |
} |
MojoRendererFactory::~MojoRendererFactory() { |
@@ -22,10 +22,8 @@ MojoRendererFactory::~MojoRendererFactory() { |
scoped_ptr<Renderer> MojoRendererFactory::CreateRenderer( |
const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
AudioRendererSink* /* audio_renderer_sink */) { |
- DCHECK(renderer_service_provider_.get()); |
mojo::MediaRendererPtr mojo_media_renderer; |
- mojo::ConnectToService(renderer_service_provider_.get(), |
- &mojo_media_renderer); |
+ connect_to_service_cb_.Run(&mojo_media_renderer); |
return scoped_ptr<Renderer>( |
new MojoRendererImpl(media_task_runner, mojo_media_renderer.Pass())); |
} |