Encrypted Media: Rename NeedKey to EncryptedMediaInitData.

media/base/demuxer_perftest.cc

 // Copyright 2013 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.
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "media/base/media.h"
@@ skipping 25 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(DemuxerHostImpl);
 };
 
 static 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,
-                    const std::vector<uint8>& init_data) {
+static void OnEncryptedMediaInitData(const std::string& init_data_type,
+                                     const std::vector<uint8>& init_data) {
   VLOG(0) << "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 110 matching lines @@
 static void RunDemuxerBenchmark(const std::string& filename) {
   base::FilePath file_path(GetTestDataFilePath(filename));
   double total_time = 0.0;
   for (int i = 0; i < kBenchmarkIterations; ++i) {
     // Setup.
     base::MessageLoop message_loop;
     DemuxerHostImpl demuxer_host;
     FileDataSource data_source;
     ASSERT_TRUE(data_source.Initialize(file_path));
 
-    Demuxer::NeedKeyCB need_key_cb = base::Bind(&NeedKey);
-    FFmpegDemuxer demuxer(message_loop.message_loop_proxy(),
-                          &data_source,
-                          need_key_cb,
-                          new MediaLog());
+    Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb =
+        base::Bind(&OnEncryptedMediaInitData);
+    FFmpegDemuxer demuxer(message_loop.message_loop_proxy(), &data_source,
+                          encrypted_media_init_data_cb, new MediaLog());
 
     demuxer.Initialize(&demuxer_host,
                        base::Bind(&QuitLoopWithStatus, &message_loop),
                        false);
     message_loop.Run();
     StreamReader stream_reader(&demuxer, false);
 
     // Benchmark.
     base::TimeTicks start = base::TimeTicks::HighResNow();
     while (!stream_reader.IsDone()) {
@@ skipping 30 matching lines @@
 #endif
 #if defined(OS_CHROMEOS)
   RunDemuxerBenchmark("bear.flac");
 #endif
 #if defined(USE_PROPRIETARY_CODECS) && defined(OS_CHROMEOS)
   RunDemuxerBenchmark("bear.avi");
 #endif
 }
 
 }  // namespace media