Pass MojoMediaClient instance to MojoMediaApplication constructor.

media/mojo/services/mojo_media_application.cc

Index: media/mojo/services/mojo_media_application.cc
diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc
index e568514c07837833bb5d91c52accd01e2adbe770..41e2feeb0d381b08c28c58237b2e898ccb5c88de 100644
--- a/media/mojo/services/mojo_media_application.cc
+++ b/media/mojo/services/mojo_media_application.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "media/base/media_log.h"
+#include "media/mojo/services/mojo_media_client.h"
 #include "media/mojo/services/service_factory_impl.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
@@ -17,12 +18,16 @@ scoped_ptr<mojo::ApplicationDelegate> MojoMediaApplication::CreateApp() {
   // In all existing use cases we don't need to initialize logging when using
   // CreateApp() to create the application. We can pass |enable_logging| in
   // CreateApp() if this isn't the case any more in the future.
-  return scoped_ptr<mojo::ApplicationDelegate>(new MojoMediaApplication(false));
+  return scoped_ptr<mojo::ApplicationDelegate>(
+      new MojoMediaApplication(false, MojoMediaClient::Create()));
 }
 
 // TODO(xhwang): Hook up MediaLog when possible.
-MojoMediaApplication::MojoMediaApplication(bool enable_logging)
+MojoMediaApplication::MojoMediaApplication(
+    bool enable_logging,
+    scoped_ptr<MojoMediaClient> mojo_media_client)
     : enable_logging_(enable_logging),
+      mojo_media_client_(std::move(mojo_media_client)),
       app_impl_(nullptr),
       media_log_(new MediaLog()) {}
 
@@ -39,6 +44,7 @@ void MojoMediaApplication::Initialize(mojo::ApplicationImpl* app) {
     // Display process ID, thread ID and timestamp in logs.
     logging::SetLogItems(true, true, true, false);
   }
+  mojo_media_client_->Initialize();
 }
 
 bool MojoMediaApplication::ConfigureIncomingConnection(
@@ -53,7 +59,8 @@ void MojoMediaApplication::Create(
   // The created object is owned by the pipe.
   new ServiceFactoryImpl(request.Pass(), connection->GetServiceProvider(),
                          media_log_,
-                         app_impl_->app_lifetime_helper()->CreateAppRefCount());
+                         app_impl_->app_lifetime_helper()->CreateAppRefCount(),
+                         mojo_media_client_.get());
 }
 
 }  // namespace media