Generalize AesDecryptor to make it more spec compliant.

webkit/media/webmediaplayer_proxy.cc

 // Copyright (c) 2012 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/media/webmediaplayer_proxy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "media/base/pipeline_status.h"
@@ skipping 171 matching lines @@
   render_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerProxy::DemuxerOpenedTask, this,
       scoped_refptr<media::ChunkDemuxer>(demuxer)));
 }
 
 void WebMediaPlayerProxy::DemuxerClosed() {
   render_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerProxy::DemuxerClosedTask, this));
 }
 
-void WebMediaPlayerProxy::KeyNeeded(scoped_array<uint8> init_data,
-                                    int init_data_size) {
+void WebMediaPlayerProxy::DemuxerKeyNeeded(scoped_array<uint8> init_data,
+                                           int init_data_size) {
   render_loop_->PostTask(FROM_HERE, base::Bind(
-      &WebMediaPlayerProxy::KeyNeededTask, this,
+      &WebMediaPlayerProxy::KeyNeededTask, this, "", "",
       base::Passed(&init_data), init_data_size));
 }
 
 void WebMediaPlayerProxy::DemuxerStartWaitingForSeek() {
   if (chunk_demuxer_.get())
     chunk_demuxer_->StartWaitingForSeek();
 }
 
 media::ChunkDemuxer::Status WebMediaPlayerProxy::DemuxerAddId(
     const std::string& id,
@@ skipping 36 matching lines @@
   DCHECK(render_loop_->BelongsToCurrentThread());
   chunk_demuxer_ = demuxer;
   if (webmediaplayer_)
     webmediaplayer_->OnDemuxerOpened();
 }
 
 void WebMediaPlayerProxy::DemuxerClosedTask() {
   chunk_demuxer_ = NULL;
 }
 
-void WebMediaPlayerProxy::KeyNeededTask(scoped_array<uint8> init_data,
+void WebMediaPlayerProxy::KeyAdded(const std::string& key_system,
+                                   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::AesDecryptor::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::KeyNeeded(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::KeyNeededTask, 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::AesDecryptor::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::KeyNeededTask(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_->OnKeyNeeded(init_data.Pass(), init_data_size);
+    webmediaplayer_->OnKeyNeeded(key_system, session_id,
+                                 init_data.Pass(), init_data_size);
 }
 
 }  // namespace webkit_media