Encrypted Media: Replace DecryptorClient with key event callbacks.

webkit/media/crypto/ppapi/clear_key_cdm.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_CLEAR_KEY_CDM_H_
 #define WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "media/base/decryptor_client.h"
 #include "media/crypto/aes_decryptor.h"
 #include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
 
 // Enable this to use the fake decoder for testing.
 // TODO(tomfinegan): Move fake audio decoder into a separate class.
 #if 0
 #define CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 #endif
 
 namespace media {
@@ skipping 30 matching lines @@
   virtual void DeinitializeDecoder(cdm::StreamType decoder_type) OVERRIDE;
   virtual void ResetDecoder(cdm::StreamType decoder_type) OVERRIDE;
   virtual cdm::Status DecryptAndDecodeFrame(
       const cdm::InputBuffer& encrypted_buffer,
       cdm::VideoFrame* video_frame) OVERRIDE;
   virtual cdm::Status DecryptAndDecodeSamples(
       const cdm::InputBuffer& encrypted_buffer,
       cdm::AudioFrames* audio_frames) OVERRIDE;
 
  private:
-  class Client : public media::DecryptorClient {
+  // TODO(xhwang): After we removed DecryptorClient. We probably can also remove
+  // this Client class as well. Investigate this possibility.
+  class Client {
    public:
     enum Status {
       kKeyAdded,
       kKeyError,
       kKeyMessage,
       kNeedKey
     };
 
     Client();
     virtual ~Client();
 
     Status status() { return status_; }
     const std::string& session_id() { return session_id_; }
     const std::string& key_message() { return key_message_; }
     const std::string& default_url() { return default_url_; }
 
     // Resets the Client to a clean state.
     void Reset();
 
-    // media::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,
-                            const std::string& message,
-                            const std::string& default_url) OVERRIDE;
-    virtual void NeedKey(const std::string& key_system,
-                         const std::string& session_id,
-                         const std::string& type,
-                         scoped_array<uint8> init_data,
-                         int init_data_length) OVERRIDE;
+    void KeyAdded(const std::string& key_system, const std::string& session_id);
+    void KeyError(const std::string& key_system,
+                  const std::string& session_id,
+                  media::Decryptor::KeyError error_code,
+                  int system_code);
+    void KeyMessage(const std::string& key_system,
+                    const std::string& session_id,
+                    const std::string& message,
+                    const std::string& default_url);
+    void NeedKey(const std::string& key_system,
+                 const std::string& session_id,
+                 const std::string& type,
+                 scoped_array<uint8> init_data, int init_data_length);
 
    private:
     Status status_;
     std::string session_id_;
     std::string key_message_;
     std::string default_url_;
   };
 
   // Prepares next heartbeat message and sets a timer for it.
   void ScheduleNextHeartBeat();
@@ skipping 57 matching lines @@
 #endif  // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
 
   scoped_ptr<CdmVideoDecoder> video_decoder_;
 
   DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_