Eliminate MediaPlayer & MediaPlayerClient abstractions

components/html_viewer/html_document.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 "components/html_viewer/html_document.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 15 matching lines @@
 #include "components/view_manager/public/cpp/view_manager.h"
 #include "components/view_manager/public/cpp/view_property.h"
 #include "components/view_manager/public/interfaces/surfaces.mojom.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/connect.h"
 #include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #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"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebRemoteFrame.h"
 #include "third_party/WebKit/public/web/WebRemoteFrameClient.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "third_party/WebKit/public/web/WebSettings.h"
@@ skipping 272 matching lines @@
 
 blink::WebLayerTreeView* HTMLDocument::layerTreeView() {
   return web_layer_tree_view_impl_.get();
 }
 
 blink::WebMediaPlayer* HTMLDocument::createMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client,
     blink::WebContentDecryptionModule* initial_cdm) {
+  return createMediaPlayer(frame, url, client, client, initial_cdm);
+}
+
+blink::WebMediaPlayer* HTMLDocument::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, html_document_app_->shell());
+      frame, url, client, encrypted_client, initial_cdm,
+      html_document_app_->shell());
 }
 
 blink::WebFrame* HTMLDocument::createChildFrame(
     blink::WebLocalFrame* parent,
     blink::WebTreeScopeType scope,
     const blink::WebString& frameName,
     blink::WebSandboxFlags sandboxFlags) {
   blink::WebLocalFrame* child_frame = blink::WebLocalFrame::create(scope, this);
   parent->appendChild(child_frame);
   return child_frame;
@@ skipping 126 matching lines @@
 
 void HTMLDocument::UpdateFocus() {
   if (!web_view_)
     return;
   bool is_focused = root_ && root_->HasFocus();
   web_view_->setFocus(is_focused);
   web_view_->setIsActive(is_focused);
 }
 
 }  // namespace html_viewer