Encrypted Media: Rename NeedKey to EncryptedMediaInitData.

media/formats/mpeg/mpeg_audio_stream_parser_base.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 "media/formats/mpeg/mpeg_audio_stream_parser_base.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "media/base/buffers.h"
@@ skipping 36 matching lines @@
                                                      AudioCodec audio_codec,
                                                      int codec_delay)
     : state_(UNINITIALIZED),
       in_media_segment_(false),
       start_code_mask_(start_code_mask),
       audio_codec_(audio_codec),
       codec_delay_(codec_delay) {}
 
 MPEGAudioStreamParserBase::~MPEGAudioStreamParserBase() {}
 
-void MPEGAudioStreamParserBase::Init(const InitCB& init_cb,
-                                     const NewConfigCB& config_cb,
-                                     const NewBuffersCB& new_buffers_cb,
-                                     bool ignore_text_tracks,
-                                     const NeedKeyCB& need_key_cb,
-                                     const NewMediaSegmentCB& new_segment_cb,
-                                     const base::Closure& end_of_segment_cb,
-                                     const LogCB& log_cb) {
+void MPEGAudioStreamParserBase::Init(
+    const InitCB& init_cb,
+    const NewConfigCB& config_cb,
+    const NewBuffersCB& new_buffers_cb,
+    bool ignore_text_tracks,
+    const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
+    const NewMediaSegmentCB& new_segment_cb,
+    const base::Closure& end_of_segment_cb,
+    const LogCB& log_cb) {
   DVLOG(1) << __FUNCTION__;
   DCHECK_EQ(state_, UNINITIALIZED);
   init_cb_ = init_cb;
   config_cb_ = config_cb;
   new_buffers_cb_ = new_buffers_cb;
   new_segment_cb_ = new_segment_cb;
   end_of_segment_cb_ = end_of_segment_cb;
   log_cb_ = log_cb;
 
   ChangeState(INITIALIZED);
@@ skipping 337 matching lines @@
   if (end_of_segment) {
     in_media_segment_ = false;
     end_of_segment_cb_.Run();
   }
 
   timestamp_helper_->SetBaseTimestamp(base::TimeDelta());
   return true;
 }
 
 }  // namespace media