Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

webkit/plugins/ppapi/content_decryptor_delegate.h

 // Copyright (c) 2012 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 WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_
 #define WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_
 
 #include <queue>
 #include <string>
 
@@ skipping 21 matching lines @@
 
 class WEBKIT_PLUGINS_EXPORT ContentDecryptorDelegate {
  public:
   // ContentDecryptorDelegate does not take ownership of
   // |plugin_decryption_interface|. Therefore |plugin_decryption_interface|
   // must outlive this object.
   ContentDecryptorDelegate(
       PP_Instance pp_instance,
       const PPP_ContentDecryptor_Private* plugin_decryption_interface);
 
+  void Initialize(const std::string& key_system);
+
   void SetKeyEventCallbacks(const media::KeyAddedCB& key_added_cb,
                             const media::KeyErrorCB& key_error_cb,
                             const media::KeyMessageCB& key_message_cb,
                             const media::NeedKeyCB& need_key_cb);
 
   // Provides access to PPP_ContentDecryptor_Private.
-  bool GenerateKeyRequest(const std::string& key_system,
-                          const std::string& type,
+  bool GenerateKeyRequest(const std::string& type,
                           const uint8* init_data,
                           int init_data_length);
   bool AddKey(const std::string& session_id,
               const uint8* key,
               int key_length,
               const uint8* init_data,
               int init_data_length);
   bool CancelKeyRequest(const std::string& session_id);
   bool Decrypt(media::Decryptor::StreamType stream_type,
                const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
@@ skipping 11 matching lines @@
   bool ResetDecoder(media::Decryptor::StreamType stream_type);
   // Note: These methods can be used with unencrypted data.
   bool DecryptAndDecodeAudio(
       const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
       const media::Decryptor::AudioDecodeCB& audio_decode_cb);
   bool DecryptAndDecodeVideo(
       const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
       const media::Decryptor::VideoDecodeCB& video_decode_cb);
 
   // PPB_ContentDecryptor_Private dispatching methods.
+  // TODO(ddorwin): Remove this method.
   void NeedKey(PP_Var key_system, PP_Var session_id, PP_Var init_data);
+  // TODO(ddorwin): Remove key_system_var parameter from these methods.
   void KeyAdded(PP_Var key_system, PP_Var session_id);
   void KeyMessage(PP_Var key_system,
                   PP_Var session_id,
                   PP_Var message,
                   PP_Var default_url);
   void KeyError(PP_Var key_system,
                 PP_Var session_id,
                 int32_t media_error,
                 int32_t system_code);
   void DeliverBlock(PP_Resource decrypted_block,
@@ skipping 29 matching lines @@
       const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
       scoped_refptr<PPB_Buffer_Impl>* resource);
 
   void FreeBuffer(uint32_t buffer_id);
 
   void SetBufferToFreeInTrackingInfo(PP_DecryptTrackingInfo* tracking_info);
 
   const PP_Instance pp_instance_;
   const PPP_ContentDecryptor_Private* const plugin_decryption_interface_;
 
+  // TODO(ddorwin): Remove after updating the Pepper API to not use key system.
+  std::string key_system_;
+
   // Callbacks for firing key events.
   media::KeyAddedCB key_added_cb_;
   media::KeyErrorCB key_error_cb_;
   media::KeyMessageCB key_message_cb_;
   media::NeedKeyCB need_key_cb_;
 
   gfx::Size natural_size_;
 
   // Request ID for tracking pending content decryption callbacks.
   // Note that zero indicates an invalid request ID.
@@ skipping 28 matching lines @@
   base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_;
   base::WeakPtr<ContentDecryptorDelegate> weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_