Encrypted Media: Rename NeedKey to EncryptedMediaInitData.

media/base/demuxer_perftest.cc

Index: media/base/demuxer_perftest.cc
diff --git a/media/base/demuxer_perftest.cc b/media/base/demuxer_perftest.cc
index 339cfe136a26f0accbfc8853fe3147db6cf864b1..454f478f6610de6f7e64bbbbdb4c973ca275ef9d 100644
--- a/media/base/demuxer_perftest.cc
+++ b/media/base/demuxer_perftest.cc
@@ -43,8 +43,8 @@ static void QuitLoopWithStatus(base::MessageLoop* message_loop,
   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.";
 }
 
@@ -175,11 +175,10 @@ static void RunDemuxerBenchmark(const std::string& filename) {
     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),