Add type argument to pepper content decryptor method GenerateKeyRequest().

webkit/media/crypto/ppapi/clear_key_cdm.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_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
 #define WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 28 matching lines @@
 class FFmpegCdmAudioDecoder;
 class FFmpegCdmVideoDecoder;
 
 // Clear key implementation of the cdm::ContentDecryptionModule interface.
 class ClearKeyCdm : public cdm::ContentDecryptionModule {
  public:
   explicit ClearKeyCdm(cdm::Allocator* allocator, cdm::CdmHost*);
   virtual ~ClearKeyCdm();
 
   // ContentDecryptionModule implementation.
-  // TODO(tomfinegan): Update ContentDecryptionModule to pass "type" through.
   virtual cdm::Status GenerateKeyRequest(
-      const uint8_t* init_data,
-      int init_data_size,
+      const char* type, int type_size,
+      const uint8_t* init_data, int init_data_size,
       cdm::KeyMessage* key_request) OVERRIDE;
-  virtual cdm::Status AddKey(const char* session_id,
-                             int session_id_size,
-                             const uint8_t* key,
-                             int key_size,
-                             const uint8_t* key_id,
-                             int key_id_size) OVERRIDE;
+  virtual cdm::Status AddKey(const char* session_id, int session_id_size,
+                             const uint8_t* key, int key_size,
+                             const uint8_t* key_id, int key_id_size) OVERRIDE;
   virtual cdm::Status CancelKeyRequest(const char* session_id,
                                        int session_id_size) OVERRIDE;
   virtual void TimerExpired(cdm::KeyMessage* msg, bool* populated) OVERRIDE;
   virtual cdm::Status Decrypt(const cdm::InputBuffer& encrypted_buffer,
                               cdm::DecryptedBlock* decrypted_block) OVERRIDE;
   virtual cdm::Status InitializeAudioDecoder(
       const cdm::AudioDecoderConfig& audio_decoder_config) OVERRIDE;
   virtual cdm::Status InitializeVideoDecoder(
       const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE;
   virtual void DeinitializeDecoder(cdm::StreamType decoder_type) OVERRIDE;
@@ skipping 108 matching lines @@
 #endif  // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
 
 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
   cdm::Size video_size_;
 #endif  // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_