Change NeedKeyCB to use std::vector.

media/filters/pipeline_integration_test_base.cc

Index: media/filters/pipeline_integration_test_base.cc
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index 31ae8ad827fea361ff8f3ddd72d0d645e2b54330..66e8d43fd96b93d4e958daf9ee87cc4490db3a64 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -65,12 +65,11 @@ PipelineStatusCB PipelineIntegrationTestBase::QuitOnStatusCB(
 
 void PipelineIntegrationTestBase::DemuxerNeedKeyCB(
     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);
+  DCHECK(&init_data[0]);

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

ditto

[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);
 }
 
 void PipelineIntegrationTestBase::OnEnded() {
@@ -212,7 +211,7 @@ PipelineIntegrationTestBase::CreateFilterCollection(
   CHECK(file_data_source->Initialize(file_path));
   data_source_.reset(file_data_source);
 
-  media::FFmpegNeedKeyCB need_key_cb = base::Bind(
+  media::Demuxer::NeedKeyCB need_key_cb = base::Bind(

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

drop "media::"

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

Done.

       &PipelineIntegrationTestBase::DemuxerNeedKeyCB, base::Unretained(this));
   scoped_ptr<Demuxer> demuxer(
       new FFmpegDemuxer(message_loop_.message_loop_proxy(),