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

webkit/media/crypto/proxy_decryptor.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/proxy_decryptor.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 40 matching lines @@
 // TODO(xhwang): Simplify this function. This is mostly caused by the fact that
 // we need to copy a scoped_array<uint8>.
 static void FireNeedKey(media::DecryptorClient* client,
                         const scoped_refptr<media::DecoderBuffer>& encrypted) {
   DCHECK(client);
   DCHECK(encrypted);
   DCHECK(encrypted->GetDecryptConfig());
   std::string key_id = encrypted->GetDecryptConfig()->key_id();
   scoped_array<uint8> key_id_array(new uint8[key_id.size()]);
   memcpy(key_id_array.get(), key_id.data(), key_id.size());
-  client->NeedKey("", "", key_id_array.Pass(), key_id.size());
+  client->NeedKey("", "", "", key_id_array.Pass(), key_id.size());
 }
 
 ProxyDecryptor::ProxyDecryptor(
     const scoped_refptr<base::MessageLoopProxy>& message_loop,
     media::DecryptorClient* decryptor_client,
     WebKit::WebMediaPlayerClient* web_media_player_client,
     WebKit::WebFrame* web_frame)
     : decryption_message_loop_(message_loop),
       client_(decryptor_client),
       web_media_player_client_(web_media_player_client),
@@ skipping 22 matching lines @@
   // Normal decryptor request.
   DCHECK(decryptor_notification_cb_.is_null());
   if (decryptor_) {
     decryptor_notification_cb.Run(decryptor_.get());
     return;
   }
   decryptor_notification_cb_ = decryptor_notification_cb;
 }
 
 bool ProxyDecryptor::GenerateKeyRequest(const std::string& key_system,
+                                        const std::string& type,
                                         const uint8* init_data,
                                         int init_data_length) {
   // We do not support run-time switching of decryptors. GenerateKeyRequest()
   // only creates a new decryptor when |decryptor_| is not initialized.
   DVLOG(1) << "GenerateKeyRequest: key_system = " << key_system;
 
   base::AutoLock auto_lock(lock_);
 
   if (!decryptor_) {
     decryptor_ = CreateDecryptor(key_system);
     if (!decryptor_) {
       client_->KeyError(key_system, "", media::Decryptor::kUnknownError, 0);
       return false;
     }
   }
 
-  if (!decryptor_->GenerateKeyRequest(key_system,
+  if (!decryptor_->GenerateKeyRequest(key_system, type,
                                       init_data, init_data_length)) {
     decryptor_.reset();
     return false;
   }
 
   if (!decryptor_notification_cb_.is_null())
     base::ResetAndReturn(&decryptor_notification_cb_).Run(decryptor_.get());
 
   return true;
 }
@@ skipping 221 matching lines @@
     return;
   }
 
   // TODO(xhwang): The same NeedKey may be fired multiple times here and also
   // in Decrypt(). While the spec says only one NeedKey should be fired. Leave
   // them as is since the spec about this may change.
   FireNeedKey(client_, pending_buffer_to_decrypt_);
 }
 
 }  // namespace webkit_media