Encrypted Media: Rename NeedKey to EncryptedMediaInitData.

media/filters/ffmpeg_demuxer.h

Index: media/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index 76d0fbb0fd5c7014e083b086c52bfa6a0d183713..bcb7c316f9296f21f2fbb81edd7eadff5839283c 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -164,7 +164,7 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
  public:
   FFmpegDemuxer(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
                 DataSource* data_source,
-                const NeedKeyCB& need_key_cb,
+                const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
                 const scoped_refptr<MediaLog>& media_log);
   ~FFmpegDemuxer() override;
 
@@ -178,9 +178,10 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
   DemuxerStream* GetStream(DemuxerStream::Type type) override;
   base::TimeDelta GetStartTime() const override;
 
-  // Calls |need_key_cb_| with the initialization data encountered in the file.
-  void FireNeedKey(const std::string& init_data_type,
-                   const std::string& encryption_key_id);
+  // Calls |encrypted_media_init_data_cb_| with the initialization data
+  // encountered in the file.
+  void OnEncryptedMediaInitData(const std::string& init_data_type,
+                                const std::string& encryption_key_id);
 
   // Allow FFmpegDemuxerStream to notify us when there is updated information
   // about capacity and what buffered data is available.
@@ -299,7 +300,7 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
   scoped_ptr<BlockingUrlProtocol> url_protocol_;
   scoped_ptr<FFmpegGlue> glue_;
 
-  const NeedKeyCB need_key_cb_;
+  const EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<FFmpegDemuxer> weak_factory_;