media: Support CdmFactory in MojoMediaClient.

media/mojo/services/default_mojo_media_client.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_client.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_output_stream_sink.h"
 #include "media/audio/fake_audio_log_factory.h"
 #include "media/base/media.h"
 #include "media/base/null_video_sink.h"
+#include "media/cdm/default_cdm_factory.h"
 #include "media/renderers/default_renderer_factory.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 
 namespace media {
 namespace internal {
 
 class DefaultMojoMediaClient : public PlatformMojoMediaClient {
  public:
   DefaultMojoMediaClient() {
     InitializeMediaLibrary();
@@ skipping 42 matching lines @@
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) override {
     return make_scoped_ptr(
         new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60),
                           NullVideoSink::NewFrameCB(), task_runner));
   }
 
   const AudioHardwareConfig& GetAudioHardwareConfig() override {
     return *audio_hardware_config_;
   }
 
+  scoped_ptr<CdmFactory> GetCdmFactory() override {
+    return make_scoped_ptr(new DefaultCdmFactory());

[ddorwin, 2015/07/09 18:13:03]

It seems odd that this creates a new object each time it is called and returns a
scoped_ptr. s/Get/Create/?

[xhwang, 2015/07/09 21:16:31]

This makes sense. But then most other methods need to be renamed as well. Can I
do that in a separate CL?

[ddorwin, 2015/07/09 21:19:20]

Yes.

+  }
+
  private:
   FakeAudioLogFactory fake_audio_log_factory_;
   scoped_ptr<AudioHardwareConfig> audio_hardware_config_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultMojoMediaClient);
 };
 
 scoped_ptr<PlatformMojoMediaClient> CreatePlatformMojoMediaClient() {
   return make_scoped_ptr(new DefaultMojoMediaClient());
 }
 
 }  // namespace internal
 }  // namespace media