Change NeedKeyCB to use std::vector.

media/tools/seek_tester/seek_tester.cc

 // 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.
 //
 // This standalone binary is a helper for diagnosing seek behavior of the
 // demuxer setup in media/ code.  It answers the question: "if I ask the demuxer
 // to Seek to X ms, where will it actually seek to? (necessitating
 // frame-dropping until the original seek target is reached)".  Sample run:
 //
 // $ ./out/Debug/seek_tester .../LayoutTests/media/content/test.ogv 6300
@@ skipping 36 matching lines @@
                         media::DemuxerStream::Status status,
                         const scoped_refptr<media::DecoderBuffer>& buffer) {
   CHECK_EQ(status, media::DemuxerStream::kOk);
   if (buffer->timestamp() == media::kNoTimestamp())
     *timestamp_ms = -1;
   else
     *timestamp_ms = buffer->timestamp().InMillisecondsF();
   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.";
 }
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
   media::InitializeMediaLibraryForTesting();
 
   CHECK_EQ(argc, 3) << "\nUsage: " << argv[0] << " <file> <seekTimeInMs>";
   uint64 seek_target_ms;
   CHECK(base::StringToUint64(argv[2], &seek_target_ms));
   scoped_ptr<media::FileDataSource> file_data_source(
       new media::FileDataSource());
   CHECK(file_data_source->Initialize(base::FilePath::FromUTF8Unsafe(argv[1])));
 
   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(),
                                need_key_cb,
                                new media::MediaLog()));
   demuxer->Initialize(&host, quitter);
   loop.Run();
 
   demuxer->Seek(base::TimeDelta::FromMilliseconds(seek_target_ms), quitter);
   loop.Run();
@@ skipping 16 matching lines @@
         base::Bind(&TimestampExtractor, &video_seeked_to_ms, &loop));
     loop.Run();
     LOG(INFO) << "  video seeked to: " << video_seeked_to_ms << "ms";
   }
 
   demuxer->Stop(base::Bind(&base::MessageLoop::Quit, base::Unretained(&loop)));
   loop.Run();
 
   return 0;
 }