Move OnNeedKey() to WebMediaPlayerImpl.

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>
 
@@ skipping 13 matching lines @@
 class WebMediaPlayerClient;
 class WebString;
 }
 
 namespace media {
 
 class WebContentDecryptionModuleImpl;
 
 // Provides support to prefixed EME implementation.
 // Do NOT add unprefixed EME functionality to this class!
-// TODO(xhwang): Move CreateNeedKeyCB() outside this class. Then when we
-// deprecate prefixed EME support, drop this whole file.
-
+// TODO(xhwang): When deprecating prefixed EME support, drop this whole file.
 class EncryptedMediaPlayerSupport
     : public base::SupportsWeakPtr<EncryptedMediaPlayerSupport> {
  public:
   typedef base::Callback<void(CdmContext*, const CdmAttachedCB&)>
       SetCdmContextCB;
 
   EncryptedMediaPlayerSupport(scoped_ptr<CdmFactory> cdm_factory,
                               blink::WebMediaPlayerClient* client,
                               const SetCdmContextCB& set_cdm_context_cb);
   ~EncryptedMediaPlayerSupport();
 
   blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest(
       blink::WebLocalFrame* frame,
       const blink::WebString& key_system,
+      const std::string& init_data_type,
       const unsigned char* init_data,
       unsigned init_data_length);
 
   blink::WebMediaPlayer::MediaKeyException AddKey(
       const blink::WebString& key_system,
       const unsigned char* key,
       unsigned key_length,
       const unsigned char* init_data,
       unsigned init_data_length,
       const blink::WebString& session_id);
 
   blink::WebMediaPlayer::MediaKeyException CancelKeyRequest(
       const blink::WebString& key_system,
       const blink::WebString& session_id);
 
-  Demuxer::NeedKeyCB CreateNeedKeyCB();
-
   void OnPipelineDecryptError();
 
  private:
   blink::WebMediaPlayer::MediaKeyException GenerateKeyRequestInternal(
       blink::WebLocalFrame* frame,
       const std::string& key_system,
+      const std::string& init_data_type,
       const unsigned char* init_data,
       unsigned init_data_length);
 
   blink::WebMediaPlayer::MediaKeyException AddKeyInternal(
       const std::string& key_system,
       const unsigned char* key,
       unsigned key_length,
       const unsigned char* init_data,
       unsigned init_data_length,
       const std::string& session_id);
 
   blink::WebMediaPlayer::MediaKeyException CancelKeyRequestInternal(
     const std::string& key_system,
     const std::string& session_id);
 
-  void OnNeedKey(const std::string& type,
-                 const std::vector<uint8>& init_data);
-
   void OnKeyAdded(const std::string& session_id);
   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);
 
   scoped_ptr<CdmFactory> cdm_factory_;
 
   blink::WebMediaPlayerClient* client_;
 
   // The currently selected key system. Empty string means that no key system
   // has been selected.
   std::string current_key_system_;
 
-  // Temporary for EME v0.1. In the future the init data type should be passed
-  // through GenerateKeyRequest() directly from WebKit.
-  std::string init_data_type_;
-
   SetCdmContextCB set_cdm_context_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_