Encrypted Media: Rename NeedKey to EncryptedMediaInitData.

content/renderer/media/android/media_source_delegate.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 40 matching lines @@
       RendererDemuxerAndroid* demuxer_client,
       int demuxer_client_id,
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
       const scoped_refptr<media::MediaLog> media_log);
   virtual ~MediaSourceDelegate();
 
   // Initialize the MediaSourceDelegate. |media_source| will be owned by
   // 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);
 
   blink::WebTimeRanges Buffered() const;
   size_t DecodedFrameCount() const;
   size_t DroppedFrameCount() const;
   size_t AudioDecodedByteCount() const;
   size_t VideoDecodedByteCount() const;
 
@@ skipping 57 matching lines @@
   // Callback for ChunkDemuxer::Seek() and callback chain for resetting
   // decrypted audio/video streams if present.
   //
   // Runs on the media thread.
   void OnDemuxerSeekDone(media::PipelineStatus status);
   void ResetAudioDecryptingDemuxerStream();
   void ResetVideoDecryptingDemuxerStream();
   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.
   void StopDemuxer(const base::Closure& stop_cb);
 
   void InitializeDemuxer();
   void SeekInternal(const base::TimeDelta& seek_time);
   // Reads an access unit from the demuxer stream |stream| and stores it in
   // the |index|th access unit in |params|.
   void ReadFromDemuxerStream(media::DemuxerStream::Type type,
@@ skipping 38 matching lines @@
   scoped_ptr<media::DecryptingDemuxerStream> audio_decrypting_demuxer_stream_;
   scoped_ptr<media::DecryptingDemuxerStream> video_decrypting_demuxer_stream_;
 
   media::DemuxerStream* audio_stream_;
   media::DemuxerStream* video_stream_;
 
   media::PipelineStatistics statistics_;
   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.
   std::string init_data_type_;
 
   // Lock used to serialize access for |seeking_|.
   mutable base::Lock seeking_lock_;
   bool seeking_;
 
   // Lock used to serialize access for |is_video_encrypted_|.
@@ skipping 19 matching lines @@
   base::WeakPtrFactory<MediaSourceDelegate> main_weak_factory_;
   base::WeakPtrFactory<MediaSourceDelegate> media_weak_factory_;
   base::WeakPtr<MediaSourceDelegate> main_weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_