Encrypted Media: Replace DecryptorClient with key event callbacks.

webkit/media/crypto/ppapi_decryptor.h

 // 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.
 
 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
 #define WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 39 matching lines @@
                       const std::string& session_id) OVERRIDE;
   virtual void CancelKeyRequest(const std::string& key_system,
                                 const std::string& session_id) OVERRIDE;
   virtual void Decrypt(StreamType stream_type,
                        const scoped_refptr<media::DecoderBuffer>& encrypted,
                        const DecryptCB& decrypt_cb) OVERRIDE;
   virtual void CancelDecrypt(StreamType stream_type) OVERRIDE;
   virtual void InitializeAudioDecoder(
       scoped_ptr<media::AudioDecoderConfig> config,
       const DecoderInitCB& init_cb,
-      const KeyAddedCB& key_added_cb) OVERRIDE;
+      const OnKeyAddedCB& key_added_cb) OVERRIDE;
   virtual void InitializeVideoDecoder(
       scoped_ptr<media::VideoDecoderConfig> config,
       const DecoderInitCB& init_cb,
-      const KeyAddedCB& key_added_cb) OVERRIDE;
+      const OnKeyAddedCB& key_added_cb) OVERRIDE;
   virtual void DecryptAndDecodeAudio(
       const scoped_refptr<media::DecoderBuffer>& encrypted,
       const AudioDecodeCB& audio_decode_cb) OVERRIDE;
   virtual void DecryptAndDecodeVideo(
       const scoped_refptr<media::DecoderBuffer>& encrypted,
       const VideoDecodeCB& video_decode_cb) OVERRIDE;
   virtual void ResetDecoder(StreamType stream_type) OVERRIDE;
   virtual void DeinitializeDecoder(StreamType stream_type) OVERRIDE;
 
  private:
   void ReportFailureToCallPlugin(const std::string& key_system,
                                  const std::string& session_id);
 
   void OnDecoderInitialized(StreamType stream_type,
-                            const KeyAddedCB& key_added_cb,
+                            const OnKeyAddedCB& key_added_cb,
                             bool success);
 
   media::DecryptorClient* client_;
   scoped_refptr<webkit::ppapi::PluginInstance> cdm_plugin_;
   scoped_refptr<base::MessageLoopProxy> render_loop_proxy_;
 
   DecoderInitCB audio_decoder_init_cb_;
   DecoderInitCB video_decoder_init_cb_;
-  KeyAddedCB audio_key_added_cb_;
-  KeyAddedCB video_key_added_cb_;
+  OnKeyAddedCB audio_key_added_cb_;
+  OnKeyAddedCB video_key_added_cb_;
 
   base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
   base::WeakPtr<PpapiDecryptor> weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_