| 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 8112c7c66fa5a3c3b0c7eeae079e0b2e9c6938ad..eda509605ddafb2a4495441b1aba2e732969e74f 100644
|
| --- a/media/mojo/services/mojo_renderer_factory.cc
|
| +++ b/media/mojo/services/mojo_renderer_factory.cc
|
| @@ -4,17 +4,16 @@
|
|
|
| #include "media/mojo/services/mojo_renderer_factory.h"
|
|
|
| -#include "base/single_thread_task_runner.h"
|
| -#include "media/mojo/interfaces/service_factory.mojom.h"
|
| +#include "media/mojo/interfaces/renderer.mojom.h"
|
| #include "media/mojo/services/mojo_renderer_impl.h"
|
| -#include "mojo/public/cpp/bindings/interface_request.h"
|
| +#include "mojo/application/public/cpp/connect.h"
|
|
|
| namespace media {
|
|
|
| MojoRendererFactory::MojoRendererFactory(
|
| - interfaces::ServiceFactory* service_factory)
|
| - : service_factory_(service_factory) {
|
| - DCHECK(service_factory_);
|
| + mojo::ServiceProvider* service_provider)
|
| + : service_provider_(service_provider) {
|
| + DCHECK(service_provider_);
|
| }
|
|
|
| MojoRendererFactory::~MojoRendererFactory() {
|
| @@ -25,11 +24,10 @@ scoped_ptr<Renderer> MojoRendererFactory::CreateRenderer(
|
| const scoped_refptr<base::TaskRunner>& /* worker_task_runner */,
|
| AudioRendererSink* /* audio_renderer_sink */,
|
| VideoRendererSink* /* video_renderer_sink */) {
|
| - DCHECK(service_factory_);
|
| + DCHECK(service_provider_);
|
|
|
| interfaces::RendererPtr mojo_renderer;
|
| - service_factory_->CreateRenderer(mojo::GetProxy(&mojo_renderer));
|
| -
|
| + mojo::ConnectToService(service_provider_, &mojo_renderer);
|
| return scoped_ptr<Renderer>(
|
| new MojoRendererImpl(media_task_runner, mojo_renderer.Pass()));
|
| }
|
|
|