Pass MojoMediaClient instance to MojoMediaApplication constructor.

media/mojo/services/mojo_media_client.h

Index: media/mojo/services/mojo_media_client.h
diff --git a/media/mojo/services/mojo_media_client.h b/media/mojo/services/mojo_media_client.h
index 323d748593e68e07670f4fa3b58d542670dd1208..bd209773cc73619e382c6e7dc144eabb2c6c2046 100644
--- a/media/mojo/services/mojo_media_client.h
+++ b/media/mojo/services/mojo_media_client.h
@@ -43,9 +43,9 @@ class PlatformMojoMediaClient {
 
 class MojoMediaClient {
  public:
-  // Returns an instance of the MojoMediaClient object.  Only one instance will
-  // exist per process.
-  static MojoMediaClient* Get();
+  ~MojoMediaClient();
+
+  static scoped_ptr<MojoMediaClient> Create();
 
   // Copy of the PlatformMojoMediaClient interface.
   scoped_ptr<RendererFactory> CreateRendererFactory(
@@ -57,12 +57,9 @@ class MojoMediaClient {
       mojo::ServiceProvider* service_provider);
 
  private:
-  friend struct base::DefaultLazyInstanceTraits<MojoMediaClient>;
-
-  MojoMediaClient();
-  ~MojoMediaClient();
+  MojoMediaClient(scoped_ptr<PlatformMojoMediaClient> impl);
 
-  scoped_ptr<PlatformMojoMediaClient> mojo_media_client_;
+  scoped_ptr<PlatformMojoMediaClient> impl_;

[xhwang, 2015/12/16 21:30:31]

BTW, |impl| doesn't match the class name, maybe |platform_client_| if you want
to keep PlatformMojoMediaClient.

[xhwang, 2015/12/16 21:30:31]

What's your plan about MojoMediaClient::Create() in the chromecast world? I
never really liked the structure here where we have a different
PlatformMojoMediaClient interface. 

With your changes, maybe we can just remove PlatformMojoMediaClient and let each
platform create it's MojoMediaClient directly?

[alokp, 2015/12/16 22:57:29]

Done.

[alokp, 2015/12/16 22:57:30]

I could make MojoMediaClient an abstract class and let each client implement
MojoMediaClient::Create similar to how they implement
CreatePlatformMojoMediaClient right now. wdyt?

[xhwang, 2015/12/16 23:43:36]

Yes, that's what I meant. But feel free to do it in a separate CL :)

 
   DISALLOW_COPY_AND_ASSIGN(MojoMediaClient);
 };