Pass MojoMediaClient instance to MojoMediaApplication constructor.

media/mojo/services/mojo_media_client.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_MOJO_SERVICES_MOJO_MEDIA_CLIENT_H_
 #define MEDIA_MOJO_SERVICES_MOJO_MEDIA_CLIENT_H_
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 25 matching lines @@
   virtual scoped_ptr<VideoRendererSink> CreateVideoRendererSink(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
 
   // Returns the CdmFactory to be used by MojoCdmService.
   virtual scoped_ptr<CdmFactory> CreateCdmFactory(
       mojo::ServiceProvider* service_provider);
 };
 
 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(
       const scoped_refptr<MediaLog>& media_log);
   scoped_refptr<AudioRendererSink> CreateAudioRendererSink();
   scoped_ptr<VideoRendererSink> CreateVideoRendererSink(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
   scoped_ptr<CdmFactory> CreateCdmFactory(
       mojo::ServiceProvider* service_provider);
 
  private:
-  friend struct base::DefaultLazyInstanceTraits<MojoMediaClient>;
+  MojoMediaClient(scoped_ptr<PlatformMojoMediaClient> platform_client);
 
-  MojoMediaClient();
-  ~MojoMediaClient();
-
-  scoped_ptr<PlatformMojoMediaClient> mojo_media_client_;
+  scoped_ptr<PlatformMojoMediaClient> platform_client_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoMediaClient);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_MEDIA_CLIENT_H_