Eliminate MediaPlayer & MediaPlayerClient abstractions

media/blink/webmediaplayer_impl.h

Index: media/blink/webmediaplayer_impl.h
diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
index 427357b1f615fb8388c87522829dfb97085f8b09..1ef4435d791c3316d0c7f7f055ab1249c85873be 100644
--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
@@ -29,6 +29,7 @@
 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
+#include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient.h"
 #include "url/gurl.h"
 
 namespace blink {
@@ -62,17 +63,26 @@ class MEDIA_EXPORT WebMediaPlayerImpl
     : public NON_EXPORTED_BASE(blink::WebMediaPlayer),
       public base::SupportsWeakPtr<WebMediaPlayerImpl> {
  public:
-  // Constructs a WebMediaPlayer implementation using Chromium's media stack.
-  // |delegate| may be null. |renderer| may also be null, in which case an
-  // internal renderer will be created.
-  // TODO(xhwang): Drop the internal renderer path and always pass in a renderer
-  // here.
+  // TODO(srirama): Remove this once blink updated.
   WebMediaPlayerImpl(blink::WebLocalFrame* frame,
                      blink::WebMediaPlayerClient* client,
                      base::WeakPtr<WebMediaPlayerDelegate> delegate,
                      scoped_ptr<RendererFactory> renderer_factory,
                      CdmFactory* cdm_factory,
                      const WebMediaPlayerParams& params);
+  // Constructs a WebMediaPlayer implementation using Chromium's media stack.
+  // |delegate| may be null. |renderer| may also be null, in which case an
+  // internal renderer will be created.
+  // TODO(xhwang): Drop the internal renderer path and always pass in a renderer
+  // here.
+  WebMediaPlayerImpl(
+      blink::WebLocalFrame* frame,
+      blink::WebMediaPlayerClient* client,
+      blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
+      base::WeakPtr<WebMediaPlayerDelegate> delegate,
+      scoped_ptr<RendererFactory> renderer_factory,
+      CdmFactory* cdm_factory,
+      const WebMediaPlayerParams& params);
   virtual ~WebMediaPlayerImpl();
 
   virtual void load(LoadType load_type,
@@ -293,6 +303,7 @@ class MEDIA_EXPORT WebMediaPlayerImpl
   bool should_notify_time_changed_;
 
   blink::WebMediaPlayerClient* client_;
+  blink::WebMediaPlayerEncryptedMediaClient* encrypted_client_;
 
   base::WeakPtr<WebMediaPlayerDelegate> delegate_;