| Index: webkit/renderer/media/crypto/proxy_decryptor.cc
|
| diff --git a/webkit/renderer/media/crypto/proxy_decryptor.cc b/webkit/renderer/media/crypto/proxy_decryptor.cc
|
| index 2aa0804860f2058c075b6e16fd91253525fae3d3..9163999cccc23cab7756422b54d26a6590f827ef 100644
|
| --- a/webkit/renderer/media/crypto/proxy_decryptor.cc
|
| +++ b/webkit/renderer/media/crypto/proxy_decryptor.cc
|
| @@ -55,14 +55,12 @@ ProxyDecryptor::ProxyDecryptor(
|
| 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) {
|
| }
|
|
|
| @@ -163,7 +161,6 @@ scoped_ptr<media::MediaKeys> ProxyDecryptor::CreatePpapiDecryptor(
|
| 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()));
|
|
|
| @@ -181,8 +178,8 @@ scoped_ptr<media::MediaKeys> ProxyDecryptor::CreateMediaKeys(
|
| 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)
|
| @@ -211,11 +208,4 @@ void ProxyDecryptor::KeyMessage(const std::string& session_id,
|
| 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
|
|
|