Change NeedKeyCB to use std::vector.

Changes various NeedKeyCB instances to use std::vector<uint8> instead
of a scoped_ptr<uint8[]> and a size parameter.

TEST=All tests still pass.

Review URL: https://chromiumcodereview.appspot.com/23072043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219575 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 8 insertions, 8 deletions

diff --git a/media/tools/demuxer_bench/demuxer_bench.cc b/media/tools/demuxer_bench/demuxer_bench.cc
index d38e587..ab8b313 100644
--- a/media/tools/demuxer_bench/demuxer_bench.cc
+++ b/media/tools/demuxer_bench/demuxer_bench.cc
@@ -48,8 +48,8 @@ void QuitLoopWithStatus(base::MessageLoop* message_loop,
   message_loop->PostTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
 }
 
-static void NeedKey(const std::string& type, scoped_ptr<uint8[]> init_data,
-             int init_data_size) {
+static void NeedKey(const std::string& type,
+                    const std::vector<uint8>& init_data) {
   LOG(INFO) << "File is encrypted.";
 }
 
@@ -194,7 +194,7 @@ int main(int argc, char** argv) {
   media::FileDataSource data_source;
   CHECK(data_source.Initialize(file_path));
 
-  media::FFmpegNeedKeyCB need_key_cb = base::Bind(&NeedKey);
+  media::Demuxer::NeedKeyCB need_key_cb = base::Bind(&NeedKey);
   media::FFmpegDemuxer demuxer(message_loop.message_loop_proxy(),
                                &data_source,
                                need_key_cb,
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index cef8912..c154e693 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -95,8 +95,8 @@ void Paint(base::MessageLoop* message_loop, const PaintCB& paint_cb,
 
 static void OnBufferingState(media::Pipeline::BufferingState buffering_state) {}
 
-static void NeedKey(const std::string& type, scoped_ptr<uint8[]> init_data,
-             int init_data_size) {
+static void NeedKey(const std::string& type,
+                    const std::vector<uint8>& init_data) {
   std::cout << "File is encrypted." << std::endl;
 }
 
diff --git a/media/tools/seek_tester/seek_tester.cc b/media/tools/seek_tester/seek_tester.cc
index d3f6a35..ca54aa8 100644
--- a/media/tools/seek_tester/seek_tester.cc
+++ b/media/tools/seek_tester/seek_tester.cc
@@ -54,8 +54,8 @@ void TimestampExtractor(uint64* timestamp_ms,
   loop->PostTask(FROM_HERE, base::MessageLoop::QuitClosure());
 }
 
-static void NeedKey(const std::string& type, scoped_ptr<uint8[]> init_data,
-             int init_data_size) {
+static void NeedKey(const std::string& type,
+                    const std::vector<uint8>& init_data) {
   LOG(INFO) << "File is encrypted.";
 }
 
@@ -73,7 +73,7 @@ int main(int argc, char** argv) {
   DemuxerHostImpl host;
   base::MessageLoop loop;
   media::PipelineStatusCB quitter = base::Bind(&QuitMessageLoop, &loop);
-  media::FFmpegNeedKeyCB need_key_cb = base::Bind(&NeedKey);
+  media::Demuxer::NeedKeyCB need_key_cb = base::Bind(&NeedKey);
   scoped_ptr<media::FFmpegDemuxer> demuxer(
       new media::FFmpegDemuxer(loop.message_loop_proxy(),
                                file_data_source.get(),