Encrypted Media: Add DefaultCdmFactory.

mojo/services/html_viewer/webmediaplayer_factory.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 "mojo/services/html_viewer/webmediaplayer_factory.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_output_stream_sink.h"
 #include "media/base/audio_hardware_config.h"
 #include "media/base/media.h"
 #include "media/base/media_log.h"
 #include "media/blink/webmediaplayer_impl.h"
 #include "media/blink/webmediaplayer_params.h"
+#include "media/cdm/default_cdm_factory.h"
 #include "media/filters/default_renderer_factory.h"
 #include "media/filters/gpu_video_accelerator_factories.h"
 #include "media/mojo/interfaces/media_renderer.mojom.h"
 #include "media/mojo/services/mojo_renderer_factory.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 
 namespace mojo {
 
 #if !defined(OS_ANDROID)
@@ skipping 63 matching lines @@
         new media::DefaultRendererFactory(media_log,
                                           nullptr,  // No GPU factory.
                                           GetAudioHardwareConfig()));
   }
 
   media::WebMediaPlayerParams params(
       media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(),
       media_log, GetMediaThreadTaskRunner(), compositor_task_runner_, nullptr);
   base::WeakPtr<media::WebMediaPlayerDelegate> delegate;
 
-  // TODO(xhwang): Provide a media based CdmFactory implementation.
-  return new media::WebMediaPlayerImpl(
-      frame, client, delegate, media_renderer_factory.Pass(), nullptr, params);
+  scoped_ptr<media::CdmFactory> cdm_factory(new media::DefaultCdmFactory());
+
+  return new media::WebMediaPlayerImpl(frame, client, delegate,
+                                       media_renderer_factory.Pass(),
+                                       cdm_factory.Pass(), params);
 #endif
 }
 
 const media::AudioHardwareConfig&
 WebMediaPlayerFactory::GetAudioHardwareConfig() {
   return audio_hardware_config_;
 }
 
 scoped_refptr<media::AudioRendererSink>
 WebMediaPlayerFactory::CreateAudioRendererSink() {
   // TODO(dalecurtis): Replace this with an interface to an actual mojo service;
   // the AudioOutputStreamSink will not work in sandboxed processes.
   return new media::AudioOutputStreamSink();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 WebMediaPlayerFactory::GetMediaThreadTaskRunner() {
   if (!media_thread_.IsRunning())
     media_thread_.Start();
 
   return media_thread_.message_loop_proxy();
 }
 
 }  // namespace mojo