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

webkit/media/crypto/ppapi/clear_key_cdm.cc

 // 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.
 
 #include "webkit/media/crypto/ppapi/clear_key_cdm.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 150 matching lines @@
                                      int message_length,
                                      const std::string& default_url) {
   status_ = kKeyMessage;
   session_id_ = session_id;
   key_message_ = message.Pass();
   key_message_length_ = message_length;
 }
 
 void ClearKeyCdm::Client::NeedKey(const std::string& key_system,
                                   const std::string& session_id,
+                                  const std::string& type,
                                   scoped_array<uint8> init_data,
                                   int init_data_length) {
   // In the current implementation of AesDecryptor, NeedKey is not used.
   // If no key is available to decrypt an input buffer, it returns kNoKey to
   // the caller instead of firing NeedKey.
   NOTREACHED();
 }
 
 ClearKeyCdm::ClearKeyCdm(cdm::Allocator* allocator, cdm::CdmHost*)
     : decryptor_(&client_),
       allocator_(allocator) {
   DCHECK(allocator_);
 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
   channel_count_ = 0;
   bits_per_channel_ = 0;
   samples_per_second_ = 0;
   last_timestamp_ = media::kNoTimestamp();
   last_duration_ = media::kInfiniteDuration();
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 }
 
 ClearKeyCdm::~ClearKeyCdm() {}
 
 cdm::Status ClearKeyCdm::GenerateKeyRequest(const uint8_t* init_data,
                                             int init_data_size,
                                             cdm::KeyMessage* key_request) {
   DVLOG(1) << "GenerateKeyRequest()";
   base::AutoLock auto_lock(client_lock_);
   ScopedResetter<Client> auto_resetter(&client_);
-  decryptor_.GenerateKeyRequest("", init_data, init_data_size);
+  // TODO(tomfinegan): Pass "type" here once ContentDecryptionModule is updated.
+  decryptor_.GenerateKeyRequest("", "", init_data, init_data_size);
 
   if (client_.status() != Client::kKeyMessage)
     return cdm::kSessionError;
 
   DCHECK(key_request);
   key_request->set_session_id(client_.session_id().data(),
                               client_.session_id().size());
 
   // TODO(tomfinegan): Get rid of this copy.
   key_request->set_message(allocator_->Allocate(client_.key_message_length()));
@@ skipping 328 matching lines @@
 
   static unsigned char color = 0;
   color += 10;
 
   memset(reinterpret_cast<void*>(video_frame->frame_buffer()->data()),
          color, frame_size);
 }
 #endif  // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
 
 }  // namespace webkit_media