Eliminate MediaPlayer & MediaPlayerClient abstractions

components/html_viewer/frame.h

 // Copyright 2015 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_FRAME_H_
 #define COMPONENTS_HTML_VIEWER_FRAME_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 115 matching lines @@
   void OnViewInputEvent(mojo::View* view, const mojo::EventPtr& event) override;
   void OnViewFocusChanged(mojo::View* gained_focus,
                           mojo::View* lost_focus) override;
 
   // WebViewClient methods:
   virtual void initializeLayerTreeView() override;
   virtual blink::WebLayerTreeView* layerTreeView() override;
   virtual blink::WebStorageNamespace* createSessionStorageNamespace();
 
   // WebFrameClient methods:
+  // TODO(srirama): Remove this method once blink updated.
   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,
       blink::WebTreeScopeType scope,
       const blink::WebString& frame_ame,
       blink::WebSandboxFlags sandbox_flags);
   virtual void frameDetached(blink::WebFrame* frame,
                              blink::WebFrameClient::DetachType type);
   virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
   virtual blink::WebNavigationPolicy decidePolicyForNavigation(
       const NavigationPolicyInfo& info);
@@ skipping 36 matching lines @@
   blink::WebTreeScopeType scope_;
 
   base::WeakPtrFactory<Frame> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Frame);
 };
 
 }  // namespace html_viewer
 
 #endif  // COMPONENTS_HTML_VIEWER_FRAME_H_