Encrypted Media: Rename NeedKey to EncryptedMediaInitData.

content/renderer/media/android/media_source_delegate.cc

 // Copyright 2013 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 "content/renderer/media/android/media_source_delegate.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 130 matching lines @@
   chunk_demuxer_->Stop();
   chunk_demuxer_.reset();
 
   // |this| may be destroyed at this point in time as a result of running
   // |stop_cb|.
   stop_cb.Run();
 }
 
 void MediaSourceDelegate::InitializeMediaSource(
     const MediaSourceOpenedCB& media_source_opened_cb,
-    const media::Demuxer::NeedKeyCB& need_key_cb,
+    const media::Demuxer::EncryptedMediaInitDataCB&
+        encrypted_media_init_data_cb,
     const media::SetDecryptorReadyCB& set_decryptor_ready_cb,
     const UpdateNetworkStateCB& update_network_state_cb,
     const DurationChangeCB& duration_change_cb) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   DCHECK(!media_source_opened_cb.is_null());
   media_source_opened_cb_ = media_source_opened_cb;
-  need_key_cb_ = need_key_cb;
+  encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
   set_decryptor_ready_cb_ = set_decryptor_ready_cb;
   update_network_state_cb_ = media::BindToCurrentLoop(update_network_state_cb);
   duration_change_cb_ = duration_change_cb;
   access_unit_size_ = kAccessUnitSizeForMediaSource;
 
   chunk_demuxer_.reset(new media::ChunkDemuxer(
       media::BindToCurrentLoop(
           base::Bind(&MediaSourceDelegate::OnDemuxerOpened, main_weak_this_)),
-      media::BindToCurrentLoop(
-          base::Bind(&MediaSourceDelegate::OnNeedKey, main_weak_this_)),
-      base::Bind(&LogMediaSourceError, media_log_),
-      media_log_,
-      false));
+      media::BindToCurrentLoop(base::Bind(
+          &MediaSourceDelegate::OnEncryptedMediaInitData, main_weak_this_)),
+      base::Bind(&LogMediaSourceError, media_log_), media_log_, false));
 
   // |this| will be retained until StopDemuxer() is posted, so Unretained() is
   // safe here.
   media_task_runner_->PostTask(FROM_HERE,
                         base::Bind(&MediaSourceDelegate::InitializeDemuxer,
                         base::Unretained(this)));
 }
 
 void MediaSourceDelegate::InitializeDemuxer() {
   DCHECK(media_task_runner_->BelongsToCurrentThread());
@@ skipping 478 matching lines @@
 
 void MediaSourceDelegate::OnDemuxerOpened() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   if (media_source_opened_cb_.is_null())
     return;
 
   media_source_opened_cb_.Run(new media::WebMediaSourceImpl(
       chunk_demuxer_.get(), base::Bind(&LogMediaSourceError, media_log_)));
 }
 
-void MediaSourceDelegate::OnNeedKey(const std::string& init_data_type,
-                                    const std::vector<uint8>& init_data) {
+void MediaSourceDelegate::OnEncryptedMediaInitData(
+    const std::string& init_data_type,
+    const std::vector<uint8>& init_data) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
-  if (need_key_cb_.is_null())
+  if (encrypted_media_init_data_cb_.is_null())
     return;
 
-  need_key_cb_.Run(init_data_type, init_data);
+  encrypted_media_init_data_cb_.Run(init_data_type, init_data);
 }
 
 bool MediaSourceDelegate::IsSeeking() const {
   base::AutoLock auto_lock(seeking_lock_);
   return seeking_;
 }
 
 base::TimeDelta MediaSourceDelegate::FindBufferedBrowserSeekTime_Locked(
     const base::TimeDelta& seek_time) const {
   seeking_lock_.AssertAcquired();
@@ skipping 57 matching lines @@
     configs->video_size = config.natural_size();
     configs->is_video_encrypted = config.is_encrypted();
     configs->video_extra_data = std::vector<uint8>(
         config.extra_data(), config.extra_data() + config.extra_data_size());
     return true;
   }
   return false;
 }
 
 }  // namespace content