Encrypted Media: Replace DecryptorClient with key event callbacks.

media/base/decryptor.h

Index: media/base/decryptor.h
diff --git a/media/base/decryptor.h b/media/base/decryptor.h
index 92a3a090f09d4dc32305e50e08e1fbf54e190b76..c4f934a649385b5daa362dda47577f92bac3fd23 100644
--- a/media/base/decryptor.h
+++ b/media/base/decryptor.h
@@ -118,17 +118,17 @@ class MEDIA_EXPORT Decryptor {
   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;