Add CDM allocator interface.

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/synchronization/lock.h"
 #include "media/base/decryptor_client.h"
 #include "media/crypto/aes_decryptor.h"
 #include "webkit/media/crypto/ppapi/content_decryption_module.h"
 
 namespace media {
 class DecoderBuffer;
 }
 
 namespace webkit_media {
 
 // Clear key implementation of the cdm::ContentDecryptionModule interface.
 class ClearKeyCdm : public cdm::ContentDecryptionModule {
  public:
-  ClearKeyCdm();
+  explicit ClearKeyCdm(cdm::CdmAllocator* allocator);
   virtual ~ClearKeyCdm();
 
   // ContentDecryptionModule implementation.
   virtual cdm::Status GenerateKeyRequest(const uint8_t* init_data,
                                          int init_data_size,
                                          cdm::KeyMessage* key_request) OVERRIDE;
   virtual cdm::Status AddKey(const char* session_id,
                              int session_id_size,
                              const uint8_t* key,
                              int key_size,
@@ skipping 51 matching lines @@
                          int init_data_length) OVERRIDE;
 
    private:
     Status status_;
     std::string session_id_;
     scoped_array<uint8> key_message_;
     int key_message_length_;
     std::string default_url_;
   };
 
+  ClearKeyCdm();

[ddorwin, 2012/09/07 09:48:48]

Remove

[Tom Finegan, 2012/09/08 01:02:47]

Done.

+
   Client client_;
   media::AesDecryptor decryptor_;
   // Protects the |client_| from being accessed by the |decryptor_|
   // simultaneously.
   base::Lock client_lock_;
+  // Allocates buffers using the CDM wrapper.
+  cdm::CdmAllocator* allocator_;
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_