Encrypted Media: Rename NeedKey to EncryptedMediaInitData.

media/base/stream_parser.h

 // Copyright (c) 2012 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_BASE_STREAM_PARSER_H_
 #define MEDIA_BASE_STREAM_PARSER_H_
 
 #include <deque>
 #include <map>
 #include <string>
@@ skipping 89 matching lines @@
                               const BufferQueue&,
                               const TextBufferQueueMap&)> NewBuffersCB;
 
   // Signals the beginning of a new media segment.
   typedef base::Callback<void()> NewMediaSegmentCB;
 
   // A new potentially encrypted stream has been parsed.
   // First parameter - The type of the initialization data associated with the
   //                   stream.
   // Second parameter - The initialization data associated with the stream.
-  typedef base::Callback<void(const std::string&,
-                              const std::vector<uint8>&)> NeedKeyCB;
+  typedef base::Callback<void(const std::string&, const std::vector<uint8>&)>
+      EncryptedMediaInitDataCB;
 
   StreamParser();
   virtual ~StreamParser();
 
   // Initializes the parser with necessary callbacks. Must be called before any
   // data is passed to Parse(). |init_cb| will be called once enough data has
   // been parsed to determine the initial stream configurations, presentation
   // start time, and duration. If |ignore_text_track| is true, then no text
   // buffers should be passed later by the parser to |new_buffers_cb|.
-  virtual void Init(const InitCB& init_cb,
-                    const NewConfigCB& config_cb,
-                    const NewBuffersCB& new_buffers_cb,
-                    bool ignore_text_track,
-                    const NeedKeyCB& need_key_cb,
-                    const NewMediaSegmentCB& new_segment_cb,
-                    const base::Closure& end_of_segment_cb,
-                    const LogCB& log_cb) = 0;
+  virtual void Init(
+      const InitCB& init_cb,
+      const NewConfigCB& config_cb,
+      const NewBuffersCB& new_buffers_cb,
+      bool ignore_text_track,
+      const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
+      const NewMediaSegmentCB& new_segment_cb,
+      const base::Closure& end_of_segment_cb,
+      const LogCB& log_cb) = 0;
 
   // Called when a seek occurs. This flushes the current parser state
   // and puts the parser in a state where it can receive data for the new seek
   // point.
   virtual void Flush() = 0;
 
   // Called when there is new data to parse.
   //
   // Returns true if the parse succeeds.
   virtual bool Parse(const uint8* buf, int size) = 0;
@@ skipping 15 matching lines @@
 // subtle issues with tie-breaking. See http://crbug.com/338484.
 MEDIA_EXPORT bool MergeBufferQueues(
     const StreamParser::BufferQueue& audio_buffers,
     const StreamParser::BufferQueue& video_buffers,
     const StreamParser::TextBufferQueueMap& text_buffers,
     StreamParser::BufferQueue* merged_buffers);
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_STREAM_PARSER_H_