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

media/webm/webm_tracks_parser.cc

Index: media/webm/webm_tracks_parser.cc
diff --git a/media/webm/webm_tracks_parser.cc b/media/webm/webm_tracks_parser.cc
index 77cb0d09096c54b461a6e19bd9fdabd743407ef9..9f3470e93d1e220e0463d7a4a0adb304d35b0740 100644
--- a/media/webm/webm_tracks_parser.cc
+++ b/media/webm/webm_tracks_parser.cc
@@ -26,24 +26,15 @@ WebMTracksParser::WebMTracksParser(int64 timecode_scale)
 
 WebMTracksParser::~WebMTracksParser() {}
 
-const uint8* WebMTracksParser::video_encryption_key_id() const {
+const std::string& WebMTracksParser::video_encryption_key_id() const {
   if (!video_content_encodings_client_.get())
-    return NULL;
+    return EmptyString();
 
   DCHECK(!video_content_encodings_client_->content_encodings().empty());
   return video_content_encodings_client_->content_encodings()[0]->
       encryption_key_id();
 }
 
-int WebMTracksParser::video_encryption_key_id_size() const {
-  if (!video_content_encodings_client_.get())
-    return 0;
-
-  DCHECK(!video_content_encodings_client_->content_encodings().empty());
-  return video_content_encodings_client_->content_encodings()[0]->
-      encryption_key_id_size();
-}
-
 int WebMTracksParser::Parse(const uint8* buf, int size) {
   track_type_ =-1;
   track_num_ = -1;