media: Add ServiceFactory mojo interface and implementation.

media/mojo/services/mojo_renderer_factory.cc

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 39402f62a16f44da77ac62ef187de22104f2c8ae..9f06cf4f87a99ac50725d1140310ed5eb9b8f0fc 100644
--- a/media/mojo/services/mojo_renderer_factory.cc
+++ b/media/mojo/services/mojo_renderer_factory.cc
@@ -5,15 +5,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/services/mojo_renderer_impl.h"
-#include "mojo/application/public/cpp/connect.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 
 namespace media {
 
 MojoRendererFactory::MojoRendererFactory(
-    mojo::ServiceProvider* service_provider)
-    : service_provider_(service_provider) {
-  DCHECK(service_provider_);
+    interfaces::ServiceFactory* service_factory)
+    : service_factory_(service_factory) {
+  DCHECK(service_factory_);
 }
 
 MojoRendererFactory::~MojoRendererFactory() {
@@ -23,10 +24,10 @@ scoped_ptr<Renderer> MojoRendererFactory::CreateRenderer(
     const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
     AudioRendererSink* /* audio_renderer_sink */,
     VideoRendererSink* /* video_renderer_sink */) {
-  DCHECK(service_provider_);
+  DCHECK(service_factory_);
 
   interfaces::MediaRendererPtr mojo_media_renderer;
-  mojo::ConnectToService(service_provider_, &mojo_media_renderer);
+  service_factory_->CreateRenderer(mojo::GetProxy(&mojo_media_renderer));
 
   return scoped_ptr<Renderer>(
       new MojoRendererImpl(media_task_runner, mojo_media_renderer.Pass()));