Add "type" in GenerateKeyRequest() and OnNeedKey().

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 27 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,
       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;
@@ skipping 44 matching lines @@
                           const std::string& session_id,
                           media::Decryptor::KeyError error_code,
                           int system_code) OVERRIDE;
     virtual void KeyMessage(const std::string& key_system,
                             const std::string& session_id,
                             scoped_array<uint8> message,
                             int message_length,
                             const std::string& default_url) OVERRIDE;
     virtual void NeedKey(const std::string& key_system,
                          const std::string& session_id,
+                         const std::string& type,
                          scoped_array<uint8> init_data,
                          int init_data_length) OVERRIDE;
 
    private:
     Status status_;
     std::string session_id_;
     scoped_array<uint8> key_message_;
     int key_message_length_;
     std::string default_url_;
   };
@@ skipping 44 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_