Eliminate MediaPlayer & MediaPlayerClient abstractions

components/html_viewer/frame.cc

Index: components/html_viewer/frame.cc
diff --git a/components/html_viewer/frame.cc b/components/html_viewer/frame.cc
index cc6c25005d094ebd7f0ff0fa03be8973751dfe9c..125f1c20951748b5d694018aa7edcdad20e90046 100644
--- a/components/html_viewer/frame.cc
+++ b/components/html_viewer/frame.cc
@@ -33,6 +33,7 @@
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
+#include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
@@ -384,8 +385,18 @@ blink::WebMediaPlayer* Frame::createMediaPlayer(
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client,
     blink::WebContentDecryptionModule* initial_cdm) {
+  return createMediaPlayer(frame, url, client, client, initial_cdm);
+}
+
+blink::WebMediaPlayer* Frame::createMediaPlayer(
+    blink::WebLocalFrame* frame,
+    const blink::WebURL& url,
+    blink::WebMediaPlayerClient* client,
+    blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
+    blink::WebContentDecryptionModule* initial_cdm) {
   return global_state()->media_factory()->CreateMediaPlayer(
-      frame, url, client, initial_cdm, frame_tree_manager_->app()->shell());
+      frame, url, client, encrypted_client, initial_cdm,
+      frame_tree_manager_->app()->shell());
 }
 
 blink::WebFrame* Frame::createChildFrame(blink::WebLocalFrame* parent,