Encrypted Media: Rename NeedKey to EncryptedMediaInitData.

chromecast/media/cma/test/frame_segmenter_for_test.cc

 // Copyright 2014 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 "chromecast/media/cma/test/frame_segmenter_for_test.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/port.h"
@@ skipping 245 matching lines @@
     scoped_refptr< ::media::DecoderBuffer> buffer(
         ::media::DecoderBuffer::CopyFrom(&data[it->offset], it->size));
     buffer->set_timestamp(it->poc * poc_duration);
     video_frames.push_back(
         scoped_refptr<DecoderBufferBase>(new DecoderBufferAdapter(buffer)));
   }
 
   return video_frames;
 }
 
-void OnDemuxerNeedKey(const std::string& type,
-                      const std::vector<uint8>& init_data) {
+void OnEncryptedMediaInitData(const std::string& init_data_type,
+                              const std::vector<uint8>& init_data) {
   LOG(FATAL) << "Unexpected test failure: file is encrypted.";
 }
 
 void OnNewBuffer(BufferList* buffer_list,
                  const base::Closure& finished_cb,
                  ::media::DemuxerStream::Status status,
                  const scoped_refptr< ::media::DecoderBuffer>& buffer) {
   CHECK_EQ(status, ::media::DemuxerStream::kOk);
   CHECK(buffer.get());
   CHECK(buffer_list);
@@ skipping 22 matching lines @@
 
 DemuxResult::~DemuxResult() {
 }
 
 DemuxResult FFmpegDemuxForTest(const base::FilePath& filepath,
                                bool audio) {
   FakeDemuxerHost fake_demuxer_host;
   ::media::FileDataSource data_source;
   CHECK(data_source.Initialize(filepath));
 
-  ::media::FFmpegDemuxer demuxer(base::MessageLoopProxy::current(),
-                                 &data_source,
-                                 base::Bind(&OnDemuxerNeedKey),
-                                 new ::media::MediaLog());
+  ::media::FFmpegDemuxer demuxer(
+      base::MessageLoopProxy::current(), &data_source,
+      base::Bind(&OnEncryptedMediaInitData), new ::media::MediaLog());
   ::media::WaitableMessageLoopEvent init_event;
   demuxer.Initialize(&fake_demuxer_host,
                      init_event.GetPipelineStatusCB(),
                      false);
   init_event.RunAndWaitForStatus(::media::PIPELINE_OK);
 
   ::media::DemuxerStream* stream = demuxer.GetStream(
       audio ? ::media::DemuxerStream::AUDIO : ::media::DemuxerStream::VIDEO);
   CHECK(stream);
 
@@ skipping 14 matching lines @@
     CHECK(!demux_result.frames.empty());
     end_of_stream = demux_result.frames.back()->end_of_stream();
   }
 
   demuxer.Stop();
   return demux_result;
 }
 
 }  // namespace media
 }  // namespace chromecast