Encrypted Media: Replace DecryptorClient with key event callbacks.

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 99 matching lines @@
 }
 
 void PpapiDecryptor::CancelDecrypt(StreamType stream_type) {
   DVLOG(1) << "CancelDecrypt() - stream_type: " << stream_type;
   // TODO(xhwang): Implement CancelDecrypt() in PluginInstance and call it here.
 }
 
 void PpapiDecryptor::InitializeAudioDecoder(
       scoped_ptr<media::AudioDecoderConfig> config,
       const DecoderInitCB& init_cb,
-      const KeyAddedCB& key_added_cb) {
+      const OnKeyAddedCB& key_added_cb) {
   if (!render_loop_proxy_->BelongsToCurrentThread()) {
     render_loop_proxy_->PostTask(FROM_HERE, base::Bind(
         &PpapiDecryptor::InitializeAudioDecoder, weak_this_,
         base::Passed(&config), init_cb, key_added_cb));
     return;
   }
 
   DVLOG(2) << "InitializeAudioDecoder()";
   DCHECK(config->is_encrypted());
   DCHECK(config->IsValidConfig());
@@ skipping 10 matching lines @@
     base::ResetAndReturn(&audio_decoder_init_cb_).Run(false);
 #if 0
     return;
   }
 #endif
 }
 
 void PpapiDecryptor::InitializeVideoDecoder(
     scoped_ptr<media::VideoDecoderConfig> config,
     const DecoderInitCB& init_cb,
-    const KeyAddedCB& key_added_cb) {
+    const OnKeyAddedCB& key_added_cb) {
   if (!render_loop_proxy_->BelongsToCurrentThread()) {
     render_loop_proxy_->PostTask(FROM_HERE, base::Bind(
         &PpapiDecryptor::InitializeVideoDecoder, weak_this_,
         base::Passed(&config), init_cb, key_added_cb));
     return;
   }
 
   DVLOG(2) << "InitializeVideoDecoder()";
   DCHECK(config->is_encrypted());
   DCHECK(config->IsValidConfig());
@@ skipping 64 matching lines @@
   cdm_plugin_->DeinitializeDecoder();
 }
 
 void PpapiDecryptor::ReportFailureToCallPlugin(const std::string& key_system,
                                                const std::string& session_id) {
   DVLOG(1) << "Failed to call plugin.";
   client_->KeyError(key_system, session_id, kUnknownError, 0);
 }
 
 void PpapiDecryptor::OnDecoderInitialized(StreamType stream_type,
-                                          const KeyAddedCB& key_added_cb,
+                                          const OnKeyAddedCB& key_added_cb,
                                           bool success) {
   DCHECK(!key_added_cb.is_null());
 
   switch (stream_type) {
     case kAudio:
       DCHECK(audio_key_added_cb_.is_null());
       DCHECK(!audio_decoder_init_cb_.is_null());
       if (success)
         audio_key_added_cb_ = key_added_cb;
       base::ResetAndReturn(&audio_decoder_init_cb_).Run(success);
       break;
 
     case kVideo:
       DCHECK(video_key_added_cb_.is_null());
       DCHECK(!video_decoder_init_cb_.is_null());
       if (success)
         video_key_added_cb_ = key_added_cb;
       base::ResetAndReturn(&video_decoder_init_cb_).Run(success);
       break;
 
     default:
       NOTREACHED();
   }
 }
 
 }  // namespace webkit_media