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

media/webm/webm_cluster_parser.h

 // 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.
 
 #ifndef MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_
 #define MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_
 
 #include <deque>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/webm/webm_parser.h"
 
 namespace media {
 
 class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
 
   // Size is defined by the WebM encryption specification.
   // http://wiki.webmproject.org/encryption/webm-encryption-rfc
   static const int kIvSize = 8;
 
   WebMClusterParser(int64 timecode_scale,
                     int audio_track_num,
                     int video_track_num,
-                    const uint8* video_encryption_key_id,
-                    int video_encryption_key_id_size);
+                    const std::string& video_encryption_key_id);
   virtual ~WebMClusterParser();
 
   // Resets the parser state so it can accept a new cluster.
   void Reset();
 
   // Parses a WebM cluster element in |buf|.
   //
   // Returns -1 if the parse fails.
   // Returns 0 if more data is needed.
   // Returns the number of bytes parsed on success.
@@ skipping 31 matching lines @@
   virtual bool OnListEnd(int id) OVERRIDE;
   virtual bool OnUInt(int id, int64 val) OVERRIDE;
   virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE;
 
   bool ParseBlock(const uint8* buf, int size, int duration);
   bool OnBlock(int track_num, int timecode, int duration, int flags,
                const uint8* data, int size);
 
   double timecode_multiplier_;  // Multiplier used to convert timecodes into
                                 // microseconds.
-  scoped_array<uint8> video_encryption_key_id_;
-  int video_encryption_key_id_size_;
+  std::string video_encryption_key_id_;
 
   WebMListParser parser_;
 
   int64 last_block_timecode_;
   scoped_array<uint8> block_data_;
   int block_data_size_;
   int64 block_duration_;
 
   int64 cluster_timecode_;
   base::TimeDelta cluster_start_time_;
   bool cluster_ended_;
 
   Track audio_;
   Track video_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_