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

webkit/media/webmediaplayer_proxy.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/webmediaplayer_proxy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "media/base/pipeline_status.h"
@@ skipping 117 matching lines @@
                                      scoped_array<uint8> message,
                                      int message_length,
                                      const std::string& default_url) {
   render_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerProxy::KeyMessageTask, this, key_system, session_id,
       base::Passed(&message), message_length, default_url));
 }
 
 void WebMediaPlayerProxy::NeedKey(const std::string& key_system,
                                   const std::string& session_id,
+                                  const std::string& type,
                                   scoped_array<uint8> init_data,
                                   int init_data_size) {
   render_loop_->PostTask(FROM_HERE, base::Bind(
-      &WebMediaPlayerProxy::NeedKeyTask, this, key_system, session_id,
+      &WebMediaPlayerProxy::NeedKeyTask, this, key_system, session_id, type,
       base::Passed(&init_data), init_data_size));
 }
 
 void WebMediaPlayerProxy::KeyAddedTask(const std::string& key_system,
                                        const std::string& session_id) {
   DCHECK(render_loop_->BelongsToCurrentThread());
   if (webmediaplayer_)
     webmediaplayer_->OnKeyAdded(key_system, session_id);
 }
 
@@ skipping 13 matching lines @@
                                          int message_length,
                                          const std::string& default_url) {
   DCHECK(render_loop_->BelongsToCurrentThread());
   if (webmediaplayer_)
     webmediaplayer_->OnKeyMessage(key_system, session_id,
                                   message.Pass(), message_length, default_url);
 }
 
 void WebMediaPlayerProxy::NeedKeyTask(const std::string& key_system,
                                       const std::string& session_id,
+                                      const std::string& type,
                                       scoped_array<uint8> init_data,
                                       int init_data_size) {
   DCHECK(render_loop_->BelongsToCurrentThread());
   if (webmediaplayer_)
-    webmediaplayer_->OnNeedKey(key_system, session_id,
+    webmediaplayer_->OnNeedKey(key_system, session_id, type,
                                init_data.Pass(), init_data_size);
 }
 
 }  // namespace webkit_media