Use std::string for decryption key ID in webm parser.

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"
@@ skipping 333 matching lines @@
     return -1;
   }
 
   if (!config_cb_.Run(config_helper.audio_config(),
                       config_helper.video_config())) {
     DVLOG(1) << "New config data isn't allowed.";
     return -1;
   }
 
   // TODO(xhwang): Support decryption of audio (see http://crbug.com/123421).
-  if (tracks_parser.video_encryption_key_id()) {
-    int key_id_size = tracks_parser.video_encryption_key_id_size();
+  if (!tracks_parser.video_encryption_key_id().empty()) {
+    std::string key_id = tracks_parser.video_encryption_key_id();
+    int key_id_size = key_id.size();
     CHECK_GT(key_id_size, 0);
     CHECK_LT(key_id_size, 2048);
-    scoped_array<uint8> key_id(new uint8[key_id_size]);
-    memcpy(key_id.get(), tracks_parser.video_encryption_key_id(), key_id_size);
-    need_key_cb_.Run(key_id.Pass(), key_id_size);
+    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);
   }
 
   cluster_parser_.reset(new WebMClusterParser(
       info_parser.timecode_scale(),
       tracks_parser.audio_track_num(),
       tracks_parser.video_track_num(),
-      tracks_parser.video_encryption_key_id(),
-      tracks_parser.video_encryption_key_id_size()));
+      tracks_parser.video_encryption_key_id()));
 
   ChangeState(kParsingClusters);
 
   if (!init_cb_.is_null()) {
     init_cb_.Run(true, duration);
     init_cb_.Reset();
   }
 
   return bytes_parsed;
 }
@@ skipping 47 matching lines @@
   if (!video_buffers.empty() && !video_cb_.Run(video_buffers))
     return -1;
 
   if (cluster_ended)
     end_of_segment_cb_.Run();
 
   return bytes_parsed;
 }
 
 }  // namespace media