Change NeedKeyCB to use std::vector.

media/webm/webm_stream_parser.cc

Index: media/webm/webm_stream_parser.cc
diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc
index 796a1b3b0950bff38b6ebb7bfad2ca4cca918d72..ea058d8ebfabc2916758d5f698bafde102988329 100644
--- a/media/webm/webm_stream_parser.cc
+++ b/media/webm/webm_stream_parser.cc
@@ -319,11 +319,12 @@ int WebMStreamParser::ParseCluster(const uint8* data, int size) {
 }
 
 void WebMStreamParser::FireNeedKey(const std::string& key_id) {
-  int key_id_size = key_id.size();
-  DCHECK_GT(key_id_size, 0);
-  scoped_ptr<uint8[]> key_id_array(new uint8[key_id_size]);
-  memcpy(key_id_array.get(), key_id.data(), key_id_size);
-  need_key_cb_.Run(kWebMEncryptInitDataType, key_id_array.Pass(), key_id_size);
+  size_t key_id_size = key_id.size();
+  DCHECK_GT(key_id_size, 0u);
+  std::vector<uint8> key_id_array(key_id_size);
+  if (key_id_size)
+    memcpy(&key_id_array[0], key_id.data(), key_id.size());

[xhwang, 2013/08/23 17:24:37]

ditto about using vector::vector(firstIter, lastIter).

[acolwell GONE FROM CHROMIUM, 2013/08/23 19:55:28]

Done.

+  need_key_cb_.Run(kWebMEncryptInitDataType, key_id_array);
 }
 
 }  // namespace media