Encrypted Media: Rename NeedKey to EncryptedMediaInitData.

media/formats/webm/webm_stream_parser.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/webm/webm_stream_parser.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "media/formats/webm/webm_cluster_parser.h"
 #include "media/formats/webm/webm_constants.h"
 #include "media/formats/webm/webm_content_encodings.h"
 #include "media/formats/webm/webm_crypto_helpers.h"
 #include "media/formats/webm/webm_info_parser.h"
 #include "media/formats/webm/webm_tracks_parser.h"
 
 namespace media {
 
 WebMStreamParser::WebMStreamParser()
     : state_(kWaitingForInit),
       unknown_segment_size_(false) {
 }
 
 WebMStreamParser::~WebMStreamParser() {
 }
 
-void WebMStreamParser::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 WebMStreamParser::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) {
   DCHECK_EQ(state_, kWaitingForInit);
   DCHECK(init_cb_.is_null());
   DCHECK(!init_cb.is_null());
   DCHECK(!config_cb.is_null());
   DCHECK(!new_buffers_cb.is_null());
-  DCHECK(!need_key_cb.is_null());
+  DCHECK(!encrypted_media_init_data_cb.is_null());
   DCHECK(!new_segment_cb.is_null());
   DCHECK(!end_of_segment_cb.is_null());
 
   ChangeState(kParsingHeaders);
   init_cb_ = init_cb;
   config_cb_ = config_cb;
   new_buffers_cb_ = new_buffers_cb;
   ignore_text_tracks_ = ignore_text_tracks;
-  need_key_cb_ = need_key_cb;
+  encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
   new_segment_cb_ = new_segment_cb;
   end_of_segment_cb_ = end_of_segment_cb;
   log_cb_ = log_cb;
 }
 
 void WebMStreamParser::Flush() {
   DCHECK_NE(state_, kWaitingForInit);
 
   byte_queue_.Reset();
   if (cluster_parser_)
@@ skipping 147 matching lines @@
       !info_parser.date_utc().is_null()) {
     params.liveness = DemuxerStream::LIVENESS_LIVE;
   } else if (info_parser.duration() >= 0) {
     params.liveness = DemuxerStream::LIVENESS_RECORDED;
   } else {
     params.liveness = DemuxerStream::LIVENESS_UNKNOWN;
   }
 
   const AudioDecoderConfig& audio_config = tracks_parser.audio_decoder_config();
   if (audio_config.is_encrypted())
-    FireNeedKey(tracks_parser.audio_encryption_key_id());
+    OnEncryptedMediaInitData(tracks_parser.audio_encryption_key_id());
 
   const VideoDecoderConfig& video_config = tracks_parser.video_decoder_config();
   if (video_config.is_encrypted())
-    FireNeedKey(tracks_parser.video_encryption_key_id());
+    OnEncryptedMediaInitData(tracks_parser.video_encryption_key_id());
 
   if (!config_cb_.Run(audio_config,
                       video_config,
                       tracks_parser.text_tracks())) {
     DVLOG(1) << "New config data isn't allowed.";
     return -1;
   }
 
   cluster_parser_.reset(new WebMClusterParser(
       info_parser.timecode_scale(),
@@ skipping 34 matching lines @@
   }
 
   if (cluster_ended) {
     ChangeState(kParsingHeaders);
     end_of_segment_cb_.Run();
   }
 
   return bytes_parsed;
 }
 
-void WebMStreamParser::FireNeedKey(const std::string& key_id) {
+void WebMStreamParser::OnEncryptedMediaInitData(const std::string& key_id) {
   std::vector<uint8> key_id_vector(key_id.begin(), key_id.end());
-  need_key_cb_.Run(kWebMInitDataType, key_id_vector);
+  encrypted_media_init_data_cb_.Run(kWebMInitDataType, key_id_vector);
 }
 
 }  // namespace media