Change NeedKeyCB to use std::vector.

media/filters/pipeline_integration_test.cc

Index: media/filters/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index fe5ab5c5fc909e8a721583bd241c0251d725d7bb..41e0bb27cf349aa0750709776ebd39adcd5d5f9c 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -86,7 +86,7 @@ class FakeEncryptedMedia {
 
     virtual void NeedKey(const std::string& session_id,
                          const std::string& type,
-                         scoped_ptr<uint8[]> init_data, int init_data_length,
+                         const std::vector<uint8>& init_data,
                          AesDecryptor* decryptor) = 0;
   };
 
@@ -123,9 +123,8 @@ class FakeEncryptedMedia {
 
   void NeedKey(const std::string& session_id,
                const std::string& type,
-               scoped_ptr<uint8[]> init_data, int init_data_length) {
-    app_->NeedKey(session_id, type, init_data.Pass(), init_data_length,
-                  &decryptor_);
+               const std::vector<uint8>& init_data) {
+    app_->NeedKey(session_id, type, init_data, &decryptor_);
   }
 
  private:
@@ -151,7 +150,7 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase {
 
   virtual void NeedKey(const std::string& session_id,
                        const std::string& type,
-                       scoped_ptr<uint8[]> init_data, int init_data_length,
+                       const std::vector<uint8>& init_data,
                        AesDecryptor* decryptor) OVERRIDE {
     current_session_id_ = session_id;
 
@@ -165,8 +164,8 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase {
     // Clear Key really needs the key ID in |init_data|. For WebM, they are the
     // same, but this is not the case for ISO CENC. Therefore, provide the
     // correct key ID.
-    const uint8* key_id = init_data.get();
-    int key_id_length = init_data_length;
+    const uint8* key_id = &init_data[0];

[xhwang, 2013/08/23 17:24:37]

ditto

[acolwell GONE FROM CHROMIUM, 2013/08/23 19:55:28]

Done.

+    size_t key_id_length = init_data.size();
     if (type == kMP4AudioType || type == kMP4VideoType) {
       key_id = kKeyId;
       key_id_length = arraysize(kKeyId);
@@ -197,7 +196,7 @@ class NoResponseApp : public FakeEncryptedMedia::AppBase {
 
   virtual void NeedKey(const std::string& session_id,
                        const std::string& type,
-                       scoped_ptr<uint8[]> init_data, int init_data_length,
+                       const std::vector<uint8>& init_data,
                        AesDecryptor* decryptor) OVERRIDE {
   }
 };
@@ -298,11 +297,11 @@ class MockMediaSource {
   }
 
   void DemuxerNeedKey(const std::string& type,
-                      scoped_ptr<uint8[]> init_data, int init_data_size) {
-    DCHECK(init_data.get());
-    DCHECK_GT(init_data_size, 0);
+                      const std::vector<uint8>& init_data) {
+    DCHECK_GT(init_data.size(), 0u);

[xhwang, 2013/08/23 17:24:37]

DCHECK(!init_data.empty());

[acolwell GONE FROM CHROMIUM, 2013/08/23 19:55:28]

Done.

+    DCHECK(&init_data[0]);

[xhwang, 2013/08/23 17:24:37]

drop this?

[acolwell GONE FROM CHROMIUM, 2013/08/23 19:55:28]

Done.

     CHECK(!need_key_cb_.is_null());
-    need_key_cb_.Run(std::string(), type, init_data.Pass(), init_data_size);
+    need_key_cb_.Run(std::string(), type, init_data);
   }
 
   scoped_ptr<TextTrack> OnTextTrack(TextKind kind,