Encrypted Media: Replace DecryptorClient with key event callbacks.

webkit/media/webmediaplayer_proxy.h

Index: webkit/media/webmediaplayer_proxy.h
diff --git a/webkit/media/webmediaplayer_proxy.h b/webkit/media/webmediaplayer_proxy.h
index b80a4a0468e0ff12f16542365c4d9e1ee60dd177..d2744da1f4f34cf56a2837a1d3fd8ff80ac11efa 100644
--- a/webkit/media/webmediaplayer_proxy.h
+++ b/webkit/media/webmediaplayer_proxy.h
@@ -5,13 +5,8 @@
 #ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
 
-#include <list>
-#include <string>
-#include <vector>
-
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
-#include "media/base/decryptor_client.h"
 #include "media/base/pipeline.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
@@ -40,8 +35,7 @@ class WebMediaPlayerImpl;
 // Acts as a thread proxy between the various threads used for multimedia and
 // the render thread that WebMediaPlayerImpl is running on.
 class WebMediaPlayerProxy
-    : public base::RefCountedThreadSafe<WebMediaPlayerProxy>,
-      public media::DecryptorClient {

[Ami GONE FROM CHROMIUM, 2012/10/23 06:52:22]

I <3 THIS SO HARD!

[scherkus (not reviewing), 2012/10/23 21:10:40]

+1

+    : public base::RefCountedThreadSafe<WebMediaPlayerProxy> {
  public:
   WebMediaPlayerProxy(const scoped_refptr<base::MessageLoopProxy>& render_loop,
                       WebMediaPlayerImpl* webmediaplayer);
@@ -71,23 +65,6 @@ class WebMediaPlayerProxy
 
   void AbortDataSource();
 
-  // DecryptorClient implementation.
-  virtual void KeyAdded(const std::string& key_system,
-                        const std::string& session_id) OVERRIDE;
-  virtual void KeyError(const std::string& key_system,
-                        const std::string& session_id,
-                        media::Decryptor::KeyError error_code,
-                        int system_code) OVERRIDE;
-  virtual void KeyMessage(const std::string& key_system,
-                          const std::string& session_id,
-                          scoped_array<uint8> message,
-                          int message_length,
-                          const std::string& default_url) OVERRIDE;
-  virtual void NeedKey(const std::string& key_system,
-                       const std::string& session_id,
-                       scoped_array<uint8> init_data,
-                       int init_data_size) OVERRIDE;
-
  private:
   friend class base::RefCountedThreadSafe<WebMediaPlayerProxy>;
   virtual ~WebMediaPlayerProxy();
@@ -95,29 +72,6 @@ class WebMediaPlayerProxy
   // Invoke |webmediaplayer_| to perform a repaint.
   void RepaintTask();
 
-  // Notify |webmediaplayer_| that a key has been added.
-  void KeyAddedTask(const std::string& key_system,
-                    const std::string& session_id);
-
-  // Notify |webmediaplayer_| that a key error occurred.
-  void KeyErrorTask(const std::string& key_system,
-                    const std::string& session_id,
-                    media::Decryptor::KeyError error_code,
-                    int system_code);
-
-  // Notify |webmediaplayer_| that a key message has been generated.
-  void KeyMessageTask(const std::string& key_system,
-                      const std::string& session_id,
-                      scoped_array<uint8> message,
-                      int message_length,
-                      const std::string& default_url);
-
-  // Notify |webmediaplayer_| that a key is needed for decryption.
-  void NeedKeyTask(const std::string& key_system,
-                   const std::string& session_id,
-                   scoped_array<uint8> init_data,
-                   int init_data_size);
-
   // The render message loop where WebKit lives.
   scoped_refptr<base::MessageLoopProxy> render_loop_;
   WebMediaPlayerImpl* webmediaplayer_;