Removed unused NeedKey callback from Decryptors.

webkit/renderer/media/crypto/proxy_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/proxy_decryptor.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "media/crypto/aes_decryptor.h"
@@ skipping 37 matching lines @@
   web_media_player_client_->closeHelperPlugin();
 }
 
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 ProxyDecryptor::ProxyDecryptor(
     WebKit::WebMediaPlayerClient* web_media_player_client,
     WebKit::WebFrame* web_frame,
     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 media::KeyMessageCB& key_message_cb)
     : web_media_player_client_(web_media_player_client),
       web_frame_(web_frame),
       key_added_cb_(key_added_cb),
       key_error_cb_(key_error_cb),
       key_message_cb_(key_message_cb),
-      need_key_cb_(need_key_cb),
       weak_ptr_factory_(this) {
 }
 
 ProxyDecryptor::~ProxyDecryptor() {
   // Destroy the decryptor explicitly before destroying the plugin.
   {
     base::AutoLock auto_lock(lock_);
     media_keys_.reset();
   }
 }
@@ skipping 80 matching lines @@
     DVLOG(1) << "ProxyDecryptor: plugin instance creation failed.";
     return scoped_ptr<media::MediaKeys>();
   }
 
   scoped_ptr<webkit_media::PpapiDecryptor> decryptor = PpapiDecryptor::Create(
       key_system,
       plugin_instance,
       base::Bind(&ProxyDecryptor::KeyAdded, weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&ProxyDecryptor::KeyError, weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&ProxyDecryptor::KeyMessage, weak_ptr_factory_.GetWeakPtr()),
-      base::Bind(&ProxyDecryptor::NeedKey, weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&ProxyDecryptor::DestroyHelperPlugin,
                  weak_ptr_factory_.GetWeakPtr()));
 
   if (!decryptor)
     DestroyHelperPlugin();
   // Else the new object will call destroy_plugin_cb to destroy Helper Plugin.
 
   return scoped_ptr<media::MediaKeys>(decryptor.Pass());
 }
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 scoped_ptr<media::MediaKeys> ProxyDecryptor::CreateMediaKeys(
     const std::string& key_system) {
   if (CanUseAesDecryptor(key_system)) {
     return scoped_ptr<media::MediaKeys>(new media::AesDecryptor(
         base::Bind(&ProxyDecryptor::KeyAdded, weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&ProxyDecryptor::KeyError, weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(&ProxyDecryptor::KeyMessage, weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(&ProxyDecryptor::NeedKey, weak_ptr_factory_.GetWeakPtr())));
+        base::Bind(&ProxyDecryptor::KeyMessage, weak_ptr_factory_.GetWeakPtr())
+        ));
   }
 
 #if defined(ENABLE_PEPPER_CDMS)
   // We only support AesDecryptor and PpapiDecryptor. So if we cannot
   // use the AesDecryptor, then we'll try to create a PpapiDecryptor for given
   // |key_system|.
   return CreatePpapiDecryptor(key_system);
 #else
   return scoped_ptr<media::MediaKeys>();
 #endif  // defined(ENABLE_PEPPER_CDMS)
 }
 
 void ProxyDecryptor::KeyAdded(const std::string& session_id) {
   key_added_cb_.Run(session_id);
 }
 
 void ProxyDecryptor::KeyError(const std::string& session_id,
                               media::MediaKeys::KeyError error_code,
                               int system_code) {
   key_error_cb_.Run(session_id, error_code, system_code);
 }
 
 void ProxyDecryptor::KeyMessage(const std::string& session_id,
                                 const std::string& message,
                                 const std::string& default_url) {
   key_message_cb_.Run(session_id, message, default_url);
 }
 
-void ProxyDecryptor::NeedKey(const std::string& session_id,
-                             const std::string& type,
-                             scoped_ptr<uint8[]> init_data,
-                             int init_data_size) {
-  need_key_cb_.Run(session_id, type, init_data.Pass(), init_data_size);
-}
-
 }  // namespace webkit_media