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

media/base/stream_parser.h

Index: media/base/stream_parser.h
diff --git a/media/base/stream_parser.h b/media/base/stream_parser.h
index 64a8c4978128b609be36cdfaf4de984007a72b1b..d4eb335ff45675e24c9994c99d531769b925f9e4 100644
--- a/media/base/stream_parser.h
+++ b/media/base/stream_parser.h
@@ -6,6 +6,7 @@
 #define MEDIA_BASE_STREAM_PARSER_H_
 
 #include <deque>
+#include <string>
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
@@ -58,12 +59,15 @@ class MEDIA_EXPORT StreamParser {
   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

[ddorwin, 2012/10/27 00:08:26]

Not exact, but close enough until we get more clarity in the spec.

[xhwang, 2012/10/27 00:50:14]

:) I choose vague language on purpose.

+  //                   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