Encrypted Media: Rename NeedKey to EncryptedMediaInitData.

media/formats/webm/webm_stream_parser.h

 // Copyright 2014 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 MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_
 #define MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/buffers.h"
 #include "media/base/byte_queue.h"
 #include "media/base/stream_parser.h"
 #include "media/base/video_decoder_config.h"
 
 namespace media {
 
 class WebMClusterParser;
 
 class WebMStreamParser : public StreamParser {
  public:
   WebMStreamParser();
   ~WebMStreamParser() override;
 
   // StreamParser implementation.
   void Init(const InitCB& init_cb,
             const NewConfigCB& config_cb,
             const NewBuffersCB& new_buffers_cb,
             bool ignore_text_tracks,
-            const NeedKeyCB& need_key_cb,
+            const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
             const NewMediaSegmentCB& new_segment_cb,
             const base::Closure& end_of_segment_cb,
             const LogCB& log_cb) override;
   void Flush() override;
   bool Parse(const uint8* buf, int size) override;
 
  private:
   enum State {
     kWaitingForInit,
     kParsingHeaders,
@@ skipping 15 matching lines @@
 
   // Incrementally parses WebM cluster elements. This method also skips
   // CUES elements if they are encountered since we currently don't use the
   // data in these elements.
   //
   // Returns < 0 if the parse fails.
   // Returns 0 if more data is needed.
   // Returning > 0 indicates success & the number of bytes parsed.
   int ParseCluster(const uint8* data, int size);
 
-  // Fire needkey event through the |need_key_cb_|.
-  void FireNeedKey(const std::string& key_id);
+  // Fire needkey event through the |encrypted_media_init_data_cb_|.
+  void OnEncryptedMediaInitData(const std::string& key_id);
 
   State state_;
   InitCB init_cb_;
   NewConfigCB config_cb_;
   NewBuffersCB new_buffers_cb_;
   bool ignore_text_tracks_;
-  NeedKeyCB need_key_cb_;
+  EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
 
   NewMediaSegmentCB new_segment_cb_;
   base::Closure end_of_segment_cb_;
   LogCB log_cb_;
 
   bool unknown_segment_size_;
 
   scoped_ptr<WebMClusterParser> cluster_parser_;
   ByteQueue byte_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMStreamParser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_