Separate MediaKeys interface from Decryptor interface.

webkit/media/crypto/ppapi_decryptor.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/crypto/ppapi_decryptor.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 87 matching lines @@
 
 void PpapiDecryptor::CancelKeyRequest(const std::string& key_system,
                                       const std::string& session_id) {
   DVLOG(2) << "CancelKeyRequest()";
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
 
   if (!plugin_cdm_delegate_->CancelKeyRequest(session_id))
     ReportFailureToCallPlugin(key_system, session_id);
 }
 
+media::MediaKeys* PpapiDecryptor::GetMediaKeys() {
+  return this;
+}
+
 void PpapiDecryptor::RegisterNewKeyCB(StreamType stream_type,
                                       const NewKeyCB& new_key_cb) {
   switch (stream_type) {
     case kAudio:
       new_audio_key_cb_ = new_key_cb;
       break;
     case kVideo:
       new_video_key_cb_ = new_key_cb;
       break;
     default:
@@ skipping 139 matching lines @@
 }
 
 void PpapiDecryptor::KeyAdded(const std::string& key_system,
                               const std::string& session_id) {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   key_added_cb_.Run(key_system, session_id);
 }
 
 void PpapiDecryptor::KeyError(const std::string& key_system,
                               const std::string& session_id,
-                              media::Decryptor::KeyError error_code,
+                              media::MediaKeys::KeyError error_code,
                               int system_code) {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   key_error_cb_.Run(key_system, session_id, error_code, system_code);
 }
 
 void PpapiDecryptor::KeyMessage(const std::string& key_system,
                                 const std::string& session_id,
                                 const std::string& message,
                                 const std::string& default_url) {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   key_message_cb_.Run(key_system, session_id, message, default_url);
 }
 
 void PpapiDecryptor::NeedKey(const std::string& key_system,
                              const std::string& session_id,
                              const std::string& type,
                              scoped_ptr<uint8[]> init_data,
                              int init_data_size) {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   need_key_cb_.Run(key_system, session_id, type,
                    init_data.Pass(), init_data_size);
 }
 
 }  // namespace webkit_media