Eliminate MediaPlayer & MediaPlayerClient abstractions

media/blink/encrypted_media_player_support.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 MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
 #define MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/cdm_context.h"
 #include "media/base/cdm_factory.h"
 #include "media/base/demuxer.h"
 #include "media/base/eme_constants.h"
 #include "media/cdm/proxy_decryptor.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
 
 namespace blink {
 class WebContentDecryptionModule;
 class WebLocalFrame;
 class WebMediaPlayerClient;
+class WebMediaPlayerEncryptedMediaClient;
 class WebString;
 }
 
 namespace media {
 
 class MediaPermission;
 class WebContentDecryptionModuleImpl;
 
 // Provides support to prefixed EME implementation.
 // Do NOT add unprefixed EME functionality to this class!
 // TODO(xhwang): When deprecating prefixed EME support, drop this whole file.
 class EncryptedMediaPlayerSupport
     : public base::SupportsWeakPtr<EncryptedMediaPlayerSupport> {
  public:
   using CdmContextReadyCB = ProxyDecryptor::CdmContextReadyCB;
 
   // |cdm_context_ready_cb| is called when the CDM instance creation completes.
-  EncryptedMediaPlayerSupport(CdmFactory* cdm_factory,
-                              blink::WebMediaPlayerClient* client,
-                              MediaPermission* media_permission,
-                              const CdmContextReadyCB& cdm_context_ready_cb);
+  EncryptedMediaPlayerSupport(
+      CdmFactory* cdm_factory,
+      blink::WebMediaPlayerClient* client,
+      blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
+      MediaPermission* media_permission,
+      const CdmContextReadyCB& cdm_context_ready_cb);
   ~EncryptedMediaPlayerSupport();
 
   blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest(
       blink::WebLocalFrame* frame,
       const blink::WebString& key_system,
       const unsigned char* init_data,
       unsigned init_data_length);
 
   blink::WebMediaPlayer::MediaKeyException AddKey(
       const blink::WebString& key_system,
@@ skipping 34 matching lines @@
   void OnKeyError(const std::string& session_id,
                   MediaKeys::KeyError error_code,
                   uint32 system_code);
   void OnKeyMessage(const std::string& session_id,
                     const std::vector<uint8>& message,
                     const GURL& destination_url);
 
   CdmFactory* cdm_factory_;
 
   blink::WebMediaPlayerClient* client_;
+  blink::WebMediaPlayerEncryptedMediaClient* encrypted_client_;
 
   MediaPermission* media_permission_;
 
   // The currently selected key system. Empty string means that no key system
   // has been selected.
   std::string current_key_system_;
 
   // We assume all streams are from the same container, thus have the same
   // init data type.
   EmeInitDataType init_data_type_;
 
   CdmContextReadyCB cdm_context_ready_cb_;
 
   // Manages decryption keys and decrypts encrypted frames.
   scoped_ptr<ProxyDecryptor> proxy_decryptor_;
 
   DISALLOW_COPY_AND_ASSIGN(EncryptedMediaPlayerSupport);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_