Use StreamParser::TrackId instead of string for MediaTrack::byteStreamTrackId

media/formats/mpeg/mpeg1_audio_stream_parser.cc

 // Copyright 2014 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/formats/mpeg/mpeg1_audio_stream_parser.h"
 
+#include "media/base/media_log.h"
+
 namespace media {
 
 static const uint32_t kMPEG1StartCodeMask = 0xffe00000;
 
 // Map that determines which bitrate_index & channel_mode combinations
 // are allowed.
 // Derived from: http://mpgedit.org/mpgedit/mpeg_format/MP3Format.html
 static const bool kIsAllowed[17][4] = {
   { true, true, true, true },      // free
   { true, false, false, false },   // 32
@@ skipping 262 matching lines @@
     if (metadata_frame)
       *metadata_frame = true;
     return header_bytes_read + reader.bits_read() / 8;
   }
 
   // If it wasn't a XING frame, just return the number consumed bytes.
   return header_bytes_read;
 }
 
 }  // namespace media