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 fd51c96f7fb623ccaf72d46e2ef952ae496547ec..57bd2b3360ad927f97c4d031273da6e567be2fd6 100644
--- a/media/base/decryptor.h
+++ b/media/base/decryptor.h
@@ -90,16 +90,16 @@ class MEDIA_EXPORT Decryptor {
   virtual void CancelKeyRequest(const std::string& key_system,
                                 const std::string& session_id) = 0;
 
-  // Indicates that a key has been added to the Decryptor.
-  typedef base::Callback<void()> KeyAddedCB;
+  // Indicates that a new key has been added to the Decryptor.
+  typedef base::Callback<void()> NewKeyCB;

[xhwang, 2012/12/20 00:06:01]

Rename this since we are using KeyAddedCB for the new callback to fire KeyAdded
events (see line 222). I am open to suggestions for a better name. A lot of
changes in this CL is due to this renaming (which should really be in a separate
CL). Sorry for the noise.

 
-  // Registers a KeyAddedCB which should be called when a key is added to the
-  // decryptor. Only one KeyAddedCB can be registered for one |stream_type|.
+  // Registers a NewKeyCB which should be called when a new key is added to the
+  // decryptor. Only one NewKeyCB can be registered for one |stream_type|.
   // If this function is called multiple times for the same |stream_type|, the
   // previously registered callback will be replaced. In other words,
   // registering a null callback cancels the originally registered callback.
-  virtual void RegisterKeyAddedCB(StreamType stream_type,
-                                  const KeyAddedCB& key_added_cb) = 0;
+  virtual void RegisterNewKeyCB(StreamType stream_type,
+                                const NewKeyCB& key_added_cb) = 0;
 
   // Indicates completion of a decryption operation.
   //
@@ -216,6 +216,27 @@ typedef base::Callback<void(Decryptor*)> DecryptorReadyCB;
 // fired immediately with NULL.
 typedef base::Callback<void(const DecryptorReadyCB&)> SetDecryptorReadyCB;
 
+
+// Key event callbacks.
+typedef base::Callback<void(const std::string& key_system,
+                            const std::string& session_id)> KeyAddedCB;
+
+typedef base::Callback<void(const std::string& key_system,
+                            const std::string& session_id,
+                            media::Decryptor::KeyError error_code,
+                            int system_code)> KeyErrorCB;
+
+typedef base::Callback<void(const std::string& key_system,
+                            const std::string& session_id,
+                            const std::string& message,
+                            const std::string& default_url)> KeyMessageCB;
+
+typedef base::Callback<void(const std::string& key_system,
+                            const std::string& session_id,
+                            const std::string& type,
+                            scoped_array<uint8> init_data,
+                            int init_data_size)> NeedKeyCB;
+
 }  // namespace media
 
 #endif  // MEDIA_BASE_DECRYPTOR_H_