commit f549b3d45ef6c93c41e101d1d0dbeebffbad7222
author xhwang <xhwang@chromium.org> Tue Dec 23 18:44:03 2014
committer Commit bot <commit-bot@chromium.org> Tue Dec 23 18:44:45 2014
tree 8d2253a5bfca106d497ccef19463e5a6411c7dad
parent 88572ab2a2a9b40238a1eaca9efbc0532e76fd7f

Support unprefixed EME in HTMLViewer.

Tested with:
out/GN/mojo_shell
http://<host>/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html
--args-for='mojo://html_viewer --v=3 --enable-encrypted-media'

TBR=jamesr@chromium.org
BUG=444205
TEST=See above.

Review URL: https://codereview.chromium.org/815293002

Cr-Commit-Position: refs/heads/master@{#309565}

mojo/services/html_viewer/webmediaplayer_factory.h

diff --git a/mojo/services/html_viewer/webmediaplayer_factory.h b/mojo/services/html_viewer/webmediaplayer_factory.h
index 964ffac..687011a 100644
--- a/mojo/services/html_viewer/webmediaplayer_factory.h
+++ b/mojo/services/html_viewer/webmediaplayer_factory.h
@@ -17,6 +17,7 @@
 }
 
 namespace blink {
+class WebContentDecryptionModule;
 class WebMediaPlayer;
 class WebLocalFrame;
 class WebURL;
@@ -44,10 +45,12 @@
       bool enable_mojo_media_renderer);
   ~WebMediaPlayerFactory();
 
-  blink::WebMediaPlayer* CreateMediaPlayer(blink::WebLocalFrame* frame,
-                                           const blink::WebURL& url,
-                                           blink::WebMediaPlayerClient* client,
-                                           mojo::Shell* shell);
+  blink::WebMediaPlayer* CreateMediaPlayer(
+      blink::WebLocalFrame* frame,
+      const blink::WebURL& url,
+      blink::WebMediaPlayerClient* client,
+      blink::WebContentDecryptionModule* initial_cdm,
+      mojo::Shell* shell);
 
  private:
   const media::AudioHardwareConfig& GetAudioHardwareConfig();