Introduce MojoRendererFactory::ServiceProvider.

media/mojo/services/mojo_renderer_factory.h

Index: media/mojo/services/mojo_renderer_factory.h
diff --git a/media/mojo/services/mojo_renderer_factory.h b/media/mojo/services/mojo_renderer_factory.h
index 3290b74ca0df5cac495e47e2abc863dc21ea6d71..95c852f384e67185c4896e5c71dffc0846da6fe5 100644
--- a/media/mojo/services/mojo_renderer_factory.h
+++ b/media/mojo/services/mojo_renderer_factory.h
@@ -7,14 +7,26 @@
 
 #include "media/base/media_export.h"
 #include "media/base/renderer_factory.h"
-#include "mojo/public/interfaces/application/service_provider.mojom.h"
+#include "media/mojo/interfaces/media_renderer.mojom.h"
+#include "mojo/public/cpp/bindings/interface_ptr.h"
 
 namespace media {
 
 // The default factory class for creating MojoRendererImpl.
 class MEDIA_EXPORT MojoRendererFactory : public RendererFactory {
  public:
-  MojoRendererFactory(mojo::ServiceProviderPtr renderer_service_provider);
+  class ServiceProvider {

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

comment?

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

Done.

+   public:
+    ServiceProvider(){};

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

no ;, spacing seems odd. did you run 'git cl format'?

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

Yep, done by git cl format. Fixed manually.

+    virtual ~ServiceProvider(){};
+    virtual void ConnectToService(
+        mojo::InterfacePtr<mojo::MediaRenderer>* media_renderer_ptr) = 0;
+
+   private:
+    DISALLOW_COPY_AND_ASSIGN(ServiceProvider);
+  };
+
+  MojoRendererFactory(scoped_ptr<ServiceProvider> service_provider);

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

explicit

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

Done.

   ~MojoRendererFactory() final;
 
   scoped_ptr<Renderer> CreateRenderer(
@@ -22,7 +34,7 @@ class MEDIA_EXPORT MojoRendererFactory : public RendererFactory {
       AudioRendererSink* audio_renderer_sink) final;
 
  private:
-  mojo::ServiceProviderPtr renderer_service_provider_;
+  scoped_ptr<ServiceProvider> service_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoRendererFactory);
 };