Change NeedKeyCB to use std::vector.

media/tools/demuxer_bench/demuxer_bench.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.
 //
 // demuxer_bench is a standalone benchmarking tool for FFmpegDemuxer. It
 // simulates the reading requirements for playback by reading from the stream
 // that has the earliest timestamp.
 
 #include <iostream>
 
@@ skipping 30 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(DemuxerHostImpl);
 };
 
 void QuitLoopWithStatus(base::MessageLoop* message_loop,
                         media::PipelineStatus status) {
   CHECK_EQ(status, media::PIPELINE_OK);
   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.";
 }
 
 typedef std::vector<media::DemuxerStream* > Streams;
 
 // Simulates playback reading requirements by reading from each stream
 // present in |demuxer| in as-close-to-monotonically-increasing timestamp order.
 class StreamReader {
  public:
   StreamReader(media::Demuxer* demuxer, bool enable_bitstream_converter);
@@ skipping 124 matching lines @@
   }
 
   base::MessageLoop message_loop;
   DemuxerHostImpl demuxer_host;
   base::FilePath file_path(cmd_line->GetArgs()[0]);
 
   // Setup.
   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,
                                new media::MediaLog());
 
   demuxer.Initialize(&demuxer_host, base::Bind(
       &QuitLoopWithStatus, &message_loop));
   message_loop.Run();
 
   StreamReader stream_reader(
@@ skipping 23 matching lines @@
     std::cout << ", " << stream_reader.counts()[i] << " packets" << std::endl;
   }
 
   // Teardown.
   demuxer.Stop(base::Bind(
       &QuitLoopWithStatus, &message_loop, media::PIPELINE_OK));
   message_loop.Run();
 
   return 0;
 }