Support unprefixed EME in HTMLViewer.

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"
@@ skipping 60 matching lines @@
   }
 }
 
 WebMediaPlayerFactory::~WebMediaPlayerFactory() {
 }
 
 blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client,
+    blink::WebContentDecryptionModule* initial_cdm,
     mojo::Shell* shell) {
 #if defined(OS_ANDROID)
   return nullptr;
 #else
   scoped_refptr<media::MediaLog> media_log(new media::MediaLog());
   scoped_ptr<media::RendererFactory> media_renderer_factory;
 
   if (enable_mojo_media_renderer_) {
     ServiceProviderPtr media_renderer_service_provider;
     shell->ConnectToApplication("mojo:media",
                                 GetProxy(&media_renderer_service_provider));
     media_renderer_factory.reset(new media::MojoRendererFactory(make_scoped_ptr(
         new RendererServiceProvider(media_renderer_service_provider.Pass()))));
   } else {
     media_renderer_factory.reset(
         new media::DefaultRendererFactory(media_log,
                                           nullptr,  // No GPU factory.
                                           GetAudioHardwareConfig()));
   }
 
-  media::WebMediaPlayerParams params(
-      media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(),
-      media_log, GetMediaThreadTaskRunner(), compositor_task_runner_, nullptr);
+  media::WebMediaPlayerParams params(media::WebMediaPlayerParams::DeferLoadCB(),
+                                     CreateAudioRendererSink(), media_log,
+                                     GetMediaThreadTaskRunner(),
+                                     compositor_task_runner_, initial_cdm);
   base::WeakPtr<media::WebMediaPlayerDelegate> delegate;
 
   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
 }
 
@@ skipping 11 matching lines @@
 
 scoped_refptr<base::SingleThreadTaskRunner>
 WebMediaPlayerFactory::GetMediaThreadTaskRunner() {
   if (!media_thread_.IsRunning())
     media_thread_.Start();
 
   return media_thread_.message_loop_proxy();
 }
 
 }  // namespace html_viewer