| Index: media/test/pipeline_integration_test_base.cc
 | 
| diff --git a/media/test/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc
 | 
| index 56b50871ca286d3a983f411d4bfbb94f57520903..42e7b9b9c58d105082879146e4ad25304aeaae53 100644
 | 
| --- a/media/test/pipeline_integration_test_base.cc
 | 
| +++ b/media/test/pipeline_integration_test_base.cc
 | 
| @@ -83,6 +83,15 @@ void PipelineIntegrationTestBase::DemuxerEncryptedMediaInitDataCB(
 | 
|  void PipelineIntegrationTestBase::DemuxerMediaTracksUpdatedCB(
 | 
|      std::unique_ptr<MediaTracks> tracks) {
 | 
|    CHECK(tracks);
 | 
| +  CHECK(demuxer_);
 | 
| +
 | 
| +  // Generate track ids.
 | 
| +  std::vector<unsigned> track_ids;
 | 
| +  for (unsigned track_id = 1; track_id <= tracks->tracks().size(); ++track_id) {
 | 
| +    track_ids.push_back(track_id);
 | 
| +  }
 | 
| +
 | 
| +  demuxer_->OnTrackIdsAssigned(*tracks.get(), track_ids);
 | 
|  }
 | 
|  
 | 
|  void PipelineIntegrationTestBase::OnEnded() {
 | 
| @@ -265,16 +274,14 @@ void PipelineIntegrationTestBase::CreateDemuxer(
 | 
|      std::unique_ptr<DataSource> data_source) {
 | 
|    data_source_ = std::move(data_source);
 | 
|  
 | 
| -  Demuxer::MediaTracksUpdatedCB tracks_updated_cb =
 | 
| -      base::Bind(&PipelineIntegrationTestBase::DemuxerMediaTracksUpdatedCB,
 | 
| -                 base::Unretained(this));
 | 
| -
 | 
|  #if !defined(MEDIA_DISABLE_FFMPEG)
 | 
|    demuxer_ = std::unique_ptr<Demuxer>(new FFmpegDemuxer(
 | 
|        message_loop_.task_runner(), data_source_.get(),
 | 
|        base::Bind(&PipelineIntegrationTestBase::DemuxerEncryptedMediaInitDataCB,
 | 
|                   base::Unretained(this)),
 | 
| -      tracks_updated_cb, new MediaLog()));
 | 
| +      base::Bind(&PipelineIntegrationTestBase::DemuxerMediaTracksUpdatedCB,
 | 
| +                 base::Unretained(this)),
 | 
| +      new MediaLog()));
 | 
|  #endif
 | 
|  }
 | 
|  
 | 
| 
 |