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/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 221 matching lines @@
       compositor_thread_, surface.Pass(), gpu_service.Pass()));
 }
 
 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) {
-  return createMediaPlayer(frame, url, client, nullptr);
+    blink::WebMediaPlayerClient* client,
+    blink::WebContentDecryptionModule* initial_cdm) {
+  return createMediaPlayer(frame, url, client, nullptr, nullptr);

[ddorwin, 2015/05/26 21:43:07]

need to pass initial_cdm

[Srirama, 2015/05/27 14:48:50]

Acknowledged.

 }
 
 blink::WebMediaPlayer* HTMLDocument::createMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client,
+    blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
     blink::WebContentDecryptionModule* initial_cdm) {
   blink::WebMediaPlayer* player =
       web_media_player_factory_
           ? web_media_player_factory_->CreateMediaPlayer(
                 frame, url, client, GetMediaPermission(), GetCdmFactory(),
                 initial_cdm, shell_)
           : nullptr;
   return player;
 }
 
@@ skipping 116 matching lines @@
   return media_permission_.get();
 }
 
 media::CdmFactory* HTMLDocument::GetCdmFactory() {
   if (!cdm_factory_)
     cdm_factory_.reset(new media::DefaultCdmFactory());
   return cdm_factory_.get();
 }
 
 }  // namespace html_viewer