Encrypted Media: Rename NeedKey to EncryptedMediaInitData.

media/formats/webm/webm_stream_parser.cc

Index: media/formats/webm/webm_stream_parser.cc
diff --git a/media/formats/webm/webm_stream_parser.cc b/media/formats/webm/webm_stream_parser.cc
index ceda1a20736f697b4a003e86b1b8f5598f449e57..732e9afc5e9f81b836e3c913d1aebb94e483dec3 100644
--- a/media/formats/webm/webm_stream_parser.cc
+++ b/media/formats/webm/webm_stream_parser.cc
@@ -26,20 +26,21 @@ WebMStreamParser::WebMStreamParser()
 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());
 
@@ -48,7 +49,7 @@ void WebMStreamParser::Init(const InitCB& 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;
@@ -216,11 +217,11 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
 
   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,
@@ -275,9 +276,9 @@ int WebMStreamParser::ParseCluster(const uint8* data, int size) {
   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