Add "type" in GenerateKeyRequest() and OnNeedKey().

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 <string>
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "media/base/media_export.h"
 
 namespace media {
 
 class AudioDecoderConfig;
@@ skipping 32 matching lines @@
   // Return value - True indicates that the buffers are accepted.
   //                False if something was wrong with the buffers and a parsing
   //                error should be signalled.
   typedef base::Callback<bool(const BufferQueue&)> NewBuffersCB;
 
   // Signals the beginning of a new media segment.
   // First parameter - The earliest timestamp of all the streams in the segment.
   typedef base::Callback<void(base::TimeDelta)> NewMediaSegmentCB;
 
   // A new potentially encrypted stream has been parsed.
-  // First parameter - The initialization data associated with the stream.
-  // Second parameter - Number of bytes of the initialization data.
+  // First parameter - The type of the initialization data associated with the
+  //                   stream.
+  // Second parameter - The initialization data associated with the stream.
+  // Third parameter - Number of bytes of the initialization data.
   // Return value - True indicates that the initialization data is accepted.
   //                False if something was wrong with the initialization data
   //                and a parsing error should be signalled.
-  typedef base::Callback<bool(scoped_array<uint8>, int)> NeedKeyCB;
+  typedef base::Callback<bool(const std::string&,
+                              scoped_array<uint8>, int)> NeedKeyCB;
 
   // Initialize 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.
   virtual void Init(const InitCB& init_cb,
                     const NewConfigCB& config_cb,
                     const NewBuffersCB& audio_cb,
                     const NewBuffersCB& video_cb,
                     const NeedKeyCB& need_key_cb,
@@ skipping 10 matching lines @@
   // Returns true if the parse succeeds.
   virtual bool Parse(const uint8* buf, int size) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StreamParser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_STREAM_PARSER_H_