Encrypted Media: Replace DecryptorClient with key event callbacks.

webkit/media/webmediaplayer_proxy.cc

Index: webkit/media/webmediaplayer_proxy.cc
diff --git a/webkit/media/webmediaplayer_proxy.cc b/webkit/media/webmediaplayer_proxy.cc
index 05fe0d059c758cc669f29d92760b37b56d5d85af..3f604b3bd7f9831b28be318ad843edf470b24891 100644
--- a/webkit/media/webmediaplayer_proxy.cc
+++ b/webkit/media/webmediaplayer_proxy.cc
@@ -107,77 +107,4 @@ void WebMediaPlayerProxy::PutCurrentFrame(
     frame_provider_->PutCurrentFrame(frame);
 }
 
-
-void WebMediaPlayerProxy::KeyAdded(const std::string& key_system,

[Ami GONE FROM CHROMIUM, 2012/10/23 06:52:22]

HELL YES

-                                   const std::string& session_id) {
-  render_loop_->PostTask(FROM_HERE, base::Bind(
-      &WebMediaPlayerProxy::KeyAddedTask, this, key_system, session_id));
-}
-
-void WebMediaPlayerProxy::KeyError(const std::string& key_system,
-                                   const std::string& session_id,
-                                   media::Decryptor::KeyError error_code,
-                                   int system_code) {
-  render_loop_->PostTask(FROM_HERE, base::Bind(
-      &WebMediaPlayerProxy::KeyErrorTask, this, key_system, session_id,
-      error_code, system_code));
-}
-
-void WebMediaPlayerProxy::KeyMessage(const std::string& key_system,
-                                     const std::string& session_id,
-                                     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,
-                                  scoped_array<uint8> init_data,
-                                  int init_data_size) {
-  render_loop_->PostTask(FROM_HERE, base::Bind(
-      &WebMediaPlayerProxy::NeedKeyTask, this, key_system, session_id,
-      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);
-}
-
-void WebMediaPlayerProxy::KeyErrorTask(const std::string& key_system,
-                                       const std::string& session_id,
-                                       media::Decryptor::KeyError error_code,
-                                       int system_code) {
-  DCHECK(render_loop_->BelongsToCurrentThread());
-  if (webmediaplayer_)
-    webmediaplayer_->OnKeyError(key_system, session_id,
-                                error_code, system_code);
-}
-
-void WebMediaPlayerProxy::KeyMessageTask(const std::string& key_system,
-                                         const std::string& session_id,
-                                         scoped_array<uint8> message,
-                                         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,
-                                      scoped_array<uint8> init_data,
-                                      int init_data_size) {
-  DCHECK(render_loop_->BelongsToCurrentThread());
-  if (webmediaplayer_)
-    webmediaplayer_->OnNeedKey(key_system, session_id,
-                               init_data.Pass(), init_data_size);
-}
-
 }  // namespace webkit_media