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

media/webm/webm_stream_parser.cc

 // 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.
 
 #include "media/webm/webm_stream_parser.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
 #include "media/filters/in_memory_url_protocol.h"
 #include "media/webm/webm_cluster_parser.h"
 #include "media/webm/webm_constants.h"
 #include "media/webm/webm_content_encodings.h"
 #include "media/webm/webm_info_parser.h"
 #include "media/webm/webm_tracks_parser.h"
 
 namespace media {
 
+// TODO(xhwang): Figure out the init data type appropriately once it's spec'ed.
+static const char kWebMInitDataType[] = "video/webm";
+
 // Helper class that uses FFmpeg to create AudioDecoderConfig &
 // VideoDecoderConfig objects.
 //
 // This dependency on FFmpeg can be removed once we update WebMTracksParser
 // to parse the necessary data to construct AudioDecoderConfig &
 // VideoDecoderConfig objects. http://crbug.com/108756
 class FFmpegConfigHelper {
  public:
   FFmpegConfigHelper();
   ~FFmpegConfigHelper();
@@ skipping 435 matching lines @@
     end_of_segment_cb_.Run();
 
   return bytes_parsed;
 }
 
 void WebMStreamParser::FireNeedKey(const std::string& key_id) {
   int key_id_size = key_id.size();
   DCHECK_GT(key_id_size, 0);
   scoped_array<uint8> key_id_array(new uint8[key_id_size]);
   memcpy(key_id_array.get(), key_id.data(), key_id_size);
-  need_key_cb_.Run(key_id_array.Pass(), key_id_size);
+  need_key_cb_.Run(kWebMInitDataType, key_id_array.Pass(), key_id_size);

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

Is there no test for the WebM parser like there is for MP4? Or do we just have
the not empty check in chunk_demuxer_unittest.cc? Is webm_parser_unittest.cc –
the equivalent of the mp4 test?

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

It's pretty much tested in chunk_demuxer_unittests where we actually use webm
for testing (for historical reasons). Added check for "video/webm" there.

 }
 
 }  // namespace media