Change NeedKeyCB to use std::vector.

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"
@@ skipping 301 matching lines @@
       return -1;
   }
 
   if (cluster_ended)
     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_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