Encrypted Media: Replace DecryptorClient with key event callbacks.

media/base/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 MEDIA_BASE_DECRYPTOR_H_
 #define MEDIA_BASE_DECRYPTOR_H_
 
 #include <list>
 #include <string>
 
@@ skipping 100 matching lines @@
   // same |stream_type| is fired.
   virtual void CancelDecrypt(StreamType stream_type) = 0;
 
   // Indicates completion of audio/video decoder initialization.
   //
   // First Parameter: Indicates initialization success.
   // - Set to true if initialization was successful. False if an error occurred.
   typedef base::Callback<void(bool)> DecoderInitCB;
 
   // Indicates that a key has been added to the Decryptor.
-  typedef base::Callback<void()> KeyAddedCB;
+  typedef base::Callback<void()> OnKeyAddedCB;
 
   // Initializes a decoder with the given |config|, executing the |init_cb|
   // upon completion.
   // |key_added_cb| should be called when a key is added to the decryptor.
   virtual void InitializeAudioDecoder(scoped_ptr<AudioDecoderConfig> config,
                                       const DecoderInitCB& init_cb,
-                                      const KeyAddedCB& key_added_cb) = 0;
+                                      const OnKeyAddedCB& key_added_cb) = 0;
   virtual void InitializeVideoDecoder(scoped_ptr<VideoDecoderConfig> config,
                                       const DecoderInitCB& init_cb,
-                                      const KeyAddedCB& key_added_cb) = 0;
+                                      const OnKeyAddedCB& key_added_cb) = 0;
 
   // Helper structure for managing multiple decoded audio buffers per input.
   typedef std::list<scoped_refptr<Buffer> > AudioBuffers;
 
   // Indicates completion of audio/video decrypt-and-decode operation.
   //
   // First parameter: The status of the decrypt-and-decode operation.
   // - Set to kSuccess if the encrypted buffer is successfully decrypted and
   //   decoded. In this case, the decoded frame/buffers can be/contain:
   //   1) NULL, which means the operation has been aborted.
@@ skipping 43 matching lines @@
   // The decoder can be reinitialized after it is uninitialized.
   virtual void DeinitializeDecoder(StreamType stream_type) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Decryptor);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DECRYPTOR_H_