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

media/formats/webm/webm_stream_parser_unittest.cc

 // Copyright 2016 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/webm/webm_stream_parser.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "media/base/decoder_buffer.h"
@@ skipping 89 matching lines @@
   params.detected_audio_track_count = 1;
   params.detected_video_track_count = 1;
   params.detected_text_track_count = 0;
   ParseWebMFile("bear.webm", params);
   EXPECT_NE(media_tracks_.get(), nullptr);
 
   EXPECT_EQ(media_tracks_->tracks().size(), 2u);
 
   const MediaTrack& video_track = *(media_tracks_->tracks()[0]);
   EXPECT_EQ(video_track.type(), MediaTrack::Video);
-  EXPECT_EQ(video_track.id(), "1");
+  EXPECT_EQ(video_track.bytestream_track_id(), 1);
   EXPECT_EQ(video_track.kind(), "main");
   EXPECT_EQ(video_track.label(), "");
   EXPECT_EQ(video_track.language(), "und");
 
   const MediaTrack& audio_track = *(media_tracks_->tracks()[1]);
   EXPECT_EQ(audio_track.type(), MediaTrack::Audio);
-  EXPECT_EQ(audio_track.id(), "2");
+  EXPECT_EQ(audio_track.bytestream_track_id(), 2);
   EXPECT_EQ(audio_track.kind(), "main");
   EXPECT_EQ(audio_track.label(), "");
   EXPECT_EQ(audio_track.language(), "und");
 }
 
 TEST_F(WebMStreamParserTest, VerifyDetectedTrack_AudioOnly) {
   EXPECT_MEDIA_LOG(testing::HasSubstr("Estimating WebM block duration"))
       .Times(testing::AnyNumber());
   StreamParser::InitParameters params(kInfiniteDuration());
   params.detected_audio_track_count = 1;
@@ skipping 21 matching lines @@
   params.detected_audio_track_count = 1;
   params.detected_video_track_count = 1;
   params.detected_text_track_count = 1;
   ParseWebMFile("bear-vp8-webvtt.webm", params);
   EXPECT_EQ(media_tracks_->tracks().size(), 2u);
   EXPECT_EQ(media_tracks_->tracks()[0]->type(), MediaTrack::Video);
   EXPECT_EQ(media_tracks_->tracks()[1]->type(), MediaTrack::Audio);
 }
 
 }  // namespace media