Removed unused NeedKey callback from Decryptors.

webkit/renderer/media/crypto/ppapi_decryptor.cc

 // Copyright 2013 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/renderer/media/crypto/ppapi_decryptor.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 10 matching lines @@
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 namespace webkit_media {
 
 scoped_ptr<webkit_media::PpapiDecryptor> PpapiDecryptor::Create(
     const std::string& key_system,
     const scoped_refptr<webkit::ppapi::PluginInstance>& plugin_instance,
     const media::KeyAddedCB& key_added_cb,
     const media::KeyErrorCB& key_error_cb,
     const media::KeyMessageCB& key_message_cb,
-    const media::NeedKeyCB& need_key_cb,
     const base::Closure& destroy_plugin_cb) {
   webkit::ppapi::ContentDecryptorDelegate* plugin_cdm_delegate =
       plugin_instance->GetContentDecryptorDelegate();
   if (!plugin_cdm_delegate) {
     DVLOG(1) << "PpapiDecryptor: plugin cdm delegate creation failed.";
     return scoped_ptr<webkit_media::PpapiDecryptor>();
   }
 
   plugin_cdm_delegate->Initialize(key_system);
 
   return scoped_ptr<webkit_media::PpapiDecryptor>(
       new PpapiDecryptor(plugin_instance,
                          plugin_cdm_delegate,
                          key_added_cb,
                          key_error_cb,
                          key_message_cb,
-                         need_key_cb,
                          destroy_plugin_cb));
 }
 
 PpapiDecryptor::PpapiDecryptor(
     const scoped_refptr<webkit::ppapi::PluginInstance>& plugin_instance,
     webkit::ppapi::ContentDecryptorDelegate* plugin_cdm_delegate,
     const media::KeyAddedCB& key_added_cb,
     const media::KeyErrorCB& key_error_cb,
     const media::KeyMessageCB& key_message_cb,
-    const media::NeedKeyCB& need_key_cb,
     const base::Closure& destroy_plugin_cb)
     : plugin_instance_(plugin_instance),
       plugin_cdm_delegate_(plugin_cdm_delegate),
       key_added_cb_(key_added_cb),
       key_error_cb_(key_error_cb),
       key_message_cb_(key_message_cb),
-      need_key_cb_(need_key_cb),
       destroy_plugin_cb_(destroy_plugin_cb),
       render_loop_proxy_(base::MessageLoopProxy::current()),
       weak_ptr_factory_(this),
       weak_this_(weak_ptr_factory_.GetWeakPtr()) {
   DCHECK(plugin_instance_.get());
 
   plugin_cdm_delegate_->SetKeyEventCallbacks(
       base::Bind(&PpapiDecryptor::KeyAdded, weak_this_),
       base::Bind(&PpapiDecryptor::KeyError, weak_this_),
-      base::Bind(&PpapiDecryptor::KeyMessage, weak_this_),
-      base::Bind(&PpapiDecryptor::NeedKey, weak_this_));
+      base::Bind(&PpapiDecryptor::KeyMessage, weak_this_));
 }
 
 PpapiDecryptor::~PpapiDecryptor() {
   plugin_cdm_delegate_ = NULL;
   plugin_instance_ = NULL;
   destroy_plugin_cb_.Run();
 }
 
 bool PpapiDecryptor::GenerateKeyRequest(const std::string& type,
                                         const uint8* init_data,
@@ skipping 205 matching lines @@
   key_error_cb_.Run(session_id, error_code, system_code);
 }
 
 void PpapiDecryptor::KeyMessage(const std::string& session_id,
                                 const std::string& message,
                                 const std::string& default_url) {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   key_message_cb_.Run(session_id, message, default_url);
 }
 
-void PpapiDecryptor::NeedKey(const std::string& session_id,
-                             const std::string& type,
-                             scoped_ptr<uint8[]> init_data,
-                             int init_data_size) {
-  DCHECK(render_loop_proxy_->BelongsToCurrentThread());
-  need_key_cb_.Run(session_id, type, init_data.Pass(), init_data_size);
-}
-
 }  // namespace webkit_media