Removed unused NeedKey callback from Decryptors.

Removed unused NeedKey callback from Decryptors.

The needkey event comes from the demuxers only.

BUG=249976
R=dmichael@chromium.org, xhwang@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=207580

[xhwang, 2013-06-17 22:34:37]

Yay! LGTM!

[ddorwin, 2013-06-19 02:05:03]

dmichael, please review content_decryptor_delegate.*

[commit-bot: I haz the power, 2013-06-19 02:06:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ddorwin@chromium.org/17309003/12001

[dmichael (off chromium), 2013-06-19 17:35:28]

lgtm, thanks

[commit-bot: I haz the power, 2013-06-20 10:36:38]

Failed to apply patch for webkit/renderer/media/crypto/proxy_decryptor.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file webkit/renderer/media/crypto/proxy_decryptor.cc
  Hunk #2 succeeded at 161 (offset -5 lines).
  Hunk #3 FAILED at 183.
  Hunk #4 succeeded at 208 (offset -4 lines).
  1 out of 4 hunks FAILED -- saving rejects to file
webkit/renderer/media/crypto/proxy_decryptor.cc.rej

Patch:       webkit/renderer/media/crypto/proxy_decryptor.cc
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
0c1f6bf964483ed84cd3567eecc55bd8e799f618..6559c2bdd9450154c994cf8e72dbae3f6fac38b5
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) {
 }
 
@@ -168,7 +166,6 @@ scoped_ptr<media::Decryptor>
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()));
 
@@ -186,8 +183,8 @@ scoped_ptr<media::Decryptor>
ProxyDecryptor::CreateDecryptor(
     return scoped_ptr<media::Decryptor>(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
@@ -215,11 +212,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

[commit-bot: I haz the power, 2013-06-20 15:06:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ddorwin@chromium.org/17309003/49002

[commit-bot: I haz the power, 2013-06-20 21:24:45]

Failed to apply patch for webkit/renderer/media/crypto/proxy_decryptor.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file webkit/renderer/media/crypto/proxy_decryptor.cc
  Hunk #1 FAILED at 55.
  Hunk #2 succeeded at 180 (offset 17 lines).
  Hunk #3 succeeded at 197 (offset 17 lines).
  Hunk #4 succeeded at 227 (offset 17 lines).
  1 out of 4 hunks FAILED -- saving rejects to file
webkit/renderer/media/crypto/proxy_decryptor.cc.rej

Patch:       webkit/renderer/media/crypto/proxy_decryptor.cc
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

[ddorwin, 2013-06-20 21:34:25]

Committed patchset #4 manually as r207580 (presubmit successful).