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

media/mp4/mp4_stream_parser_unittest.cc

Index: media/mp4/mp4_stream_parser_unittest.cc
diff --git a/media/mp4/mp4_stream_parser_unittest.cc b/media/mp4/mp4_stream_parser_unittest.cc
index 6d7221a9c5e6b7c93664db280b0da6da5198cc26..f760dc1f74c431672a58c08292c396676fb3ad3a 100644
--- a/media/mp4/mp4_stream_parser_unittest.cc
+++ b/media/mp4/mp4_stream_parser_unittest.cc
@@ -23,6 +23,9 @@ using base::TimeDelta;
 namespace media {
 namespace mp4 {
 
+// TODO(xhwang): Figure out the init data type appropriately once it's spec'ed.
+static const char kMp4InitDataType[] = "video/mp4";
+
 class MP4StreamParserTest : public testing::Test {
  public:
   MP4StreamParserTest()
@@ -76,7 +79,9 @@ class MP4StreamParserTest : public testing::Test {
     return true;
   }
 
-  bool KeyNeededF(scoped_array<uint8> init_data, int init_data_size) {
+  bool KeyNeededF(const std::string& type,
+                  scoped_array<uint8> init_data, int init_data_size) {
+    EXPECT_EQ(type, kMp4InitDataType);

[ddorwin, 2012/10/27 01:47:17]

swap params

[xhwang, 2012/10/27 03:22:59]

Done.

     DVLOG(1) << "KeyNeededF: " << init_data_size;

[ddorwin, 2012/10/27 01:47:17]

Any idea why we log but don't check this?

[xhwang, 2012/10/27 03:22:59]

Done.

     return true;
   }