media: Support CdmFactory in MojoMediaClient.

media/mojo/services/mojo_media_application.cc

 // 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.
 
 #include "media/mojo/services/mojo_media_application.h"
 
 #include "base/logging.h"
+#include "media/base/cdm_factory.h"
 #include "media/base/media_log.h"
 #include "media/base/renderer_factory.h"
 #include "media/mojo/services/mojo_cdm_service.h"
 #include "media/mojo/services/mojo_media_client.h"
 #include "media/mojo/services/mojo_renderer_service.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
 
 namespace media {
 
@@ skipping 28 matching lines @@
     mojo::ApplicationConnection* connection) {
   connection->AddService<mojo::ContentDecryptionModule>(this);
   connection->AddService<mojo::MediaRenderer>(this);
   return true;
 }
 
 void MojoMediaApplication::Create(
     mojo::ApplicationConnection* connection,
     mojo::InterfaceRequest<mojo::ContentDecryptionModule> request) {
   // The created object is owned by the pipe.
-  new MojoCdmService(&cdm_service_context_, request.Pass());
+  new MojoCdmService(&cdm_service_context_, GetCdmFactory(), request.Pass());
 }
 
 void MojoMediaApplication::Create(
     mojo::ApplicationConnection* connection,
     mojo::InterfaceRequest<mojo::MediaRenderer> request) {
   // The created object is owned by the pipe.
   new MojoRendererService(&cdm_service_context_, GetRendererFactory(),
                           media_log_, request.Pass());
 }
 
 RendererFactory* MojoMediaApplication::GetRendererFactory() {
   if (!renderer_factory_)
     renderer_factory_ = MojoMediaClient::Get()->GetRendererFactory(media_log_);
   return renderer_factory_.get();
 }
 
+CdmFactory* MojoMediaApplication::GetCdmFactory() {
+  if (!cdm_factory_)
+    cdm_factory_ = MojoMediaClient::Get()->GetCdmFactory();
+  return cdm_factory_.get();
+}
+
 }  // namespace media