Eliminate MediaPlayer & MediaPlayerClient abstractions

components/html_viewer/html_document.h

 // 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.
 
 #ifndef COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
 
 #include <set>
 
 #include "base/callback.h"
@@ skipping 65 matching lines @@
   void UpdateWebviewSizeFromViewSize();
 
   // WebViewClient methods:
   virtual blink::WebStorageNamespace* createSessionStorageNamespace();
 
   // WebWidgetClient methods:
   void initializeLayerTreeView() override;
   blink::WebLayerTreeView* layerTreeView() override;
 
   // WebFrameClient methods:
   virtual blink::WebMediaPlayer* createMediaPlayer(

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

// TODO(srirama): Remove this method once blink updated.

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

Acknowledged.

       blink::WebLocalFrame* frame,
       const blink::WebURL& url,
-      blink::WebMediaPlayerClient* client);
-  virtual blink::WebMediaPlayer* createMediaPlayer(
-      blink::WebLocalFrame* frame,
-      const blink::WebURL& url,
       blink::WebMediaPlayerClient* client,
       blink::WebContentDecryptionModule* initial_cdm);
+  virtual blink::WebMediaPlayer* createMediaPlayer(
+      blink::WebLocalFrame* frame,
+      const blink::WebURL& url,
+      blink::WebMediaPlayerClient* client,
+      blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
+      blink::WebContentDecryptionModule* initial_cdm);
   virtual blink::WebFrame* createChildFrame(
       blink::WebLocalFrame* parent,
       const blink::WebString& frameName,
       blink::WebSandboxFlags sandboxFlags);
   virtual void frameDetached(blink::WebFrame*);
   virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
   virtual blink::WebNavigationPolicy decidePolicyForNavigation(
       blink::WebLocalFrame* frame,
       blink::WebDataSource::ExtraData* data,
       const blink::WebURLRequest& request,
@@ skipping 63 matching lines @@
   scoped_ptr<TouchHandler> touch_handler_;
 
   float device_pixel_ratio_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLDocument);
 };
 
 }  // namespace html_viewer
 
 #endif  // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_