Encrypted Media: Rename NeedKey to EncryptedMediaInitData.

content/renderer/media/android/media_source_delegate.h

Index: content/renderer/media/android/media_source_delegate.h
diff --git a/content/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h
index e4d9e85efb208464a6fe765fa85fe3762bb927a8..963237a93d0c5d1f2349b2dfd49baf771b386b02 100644
--- a/content/renderer/media/android/media_source_delegate.h
+++ b/content/renderer/media/android/media_source_delegate.h
@@ -58,7 +58,8 @@ class MediaSourceDelegate : public media::DemuxerHost {
   // this object after this call.
   void 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);
@@ -136,8 +137,8 @@ class MediaSourceDelegate : public media::DemuxerHost {
   void FinishResettingDecryptingDemuxerStreams();
 
   void OnDemuxerOpened();
-  void OnNeedKey(const std::string& init_data_type,
-                 const std::vector<uint8>& init_data);
+  void OnEncryptedMediaInitData(const std::string& init_data_type,
+                                const std::vector<uint8>& init_data);
   void NotifyDemuxerReady();
 
   // Stops and clears objects on the media thread.
@@ -196,7 +197,7 @@ class MediaSourceDelegate : public media::DemuxerHost {
   media::Ranges<base::TimeDelta> buffered_time_ranges_;
 
   MediaSourceOpenedCB media_source_opened_cb_;
-  media::Demuxer::NeedKeyCB need_key_cb_;
+  media::Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
 
   // Temporary for EME v0.1. In the future the init data type should be passed
   // through GenerateKeyRequest() directly from WebKit.