Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Side by Side Diff: media/test/pipeline_integration_test_base.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/test/pipeline_integration_test_base.h" 5 #include "media/test/pipeline_integration_test_base.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 } 175 }
176 176
177 PipelineStatus PipelineIntegrationTestBase::StartWithFile( 177 PipelineStatus PipelineIntegrationTestBase::StartWithFile(
178 const std::string& filename, 178 const std::string& filename,
179 CdmContext* cdm_context, 179 CdmContext* cdm_context,
180 uint8_t test_type, 180 uint8_t test_type,
181 ScopedVector<VideoDecoder> prepend_video_decoders, 181 ScopedVector<VideoDecoder> prepend_video_decoders,
182 ScopedVector<AudioDecoder> prepend_audio_decoders) { 182 ScopedVector<AudioDecoder> prepend_audio_decoders) {
183 std::unique_ptr<FileDataSource> file_data_source(new FileDataSource()); 183 std::unique_ptr<FileDataSource> file_data_source(new FileDataSource());
184 base::FilePath file_path(GetTestDataFilePath(filename)); 184 base::FilePath file_path(GetTestDataFilePath(filename));
185 CHECK(file_data_source->Initialize(file_path)) << "Is " << file_path.value() 185 // missing?
186 << " missing?"; 186 // Is |file_path.value()|.
187 CHECK(file_data_source->Initialize(file_path));
187 return StartInternal(std::move(file_data_source), cdm_context, test_type, 188 return StartInternal(std::move(file_data_source), cdm_context, test_type,
188 std::move(prepend_video_decoders), 189 std::move(prepend_video_decoders),
189 std::move(prepend_audio_decoders)); 190 std::move(prepend_audio_decoders));
190 } 191 }
191 192
192 PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename) { 193 PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename) {
193 return StartWithFile(filename, nullptr, kNormal); 194 return StartWithFile(filename, nullptr, kNormal);
194 } 195 }
195 196
196 PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename, 197 PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename,
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 DCHECK(clockless_playback_); 433 DCHECK(clockless_playback_);
433 return clockless_audio_sink_->render_time(); 434 return clockless_audio_sink_->render_time();
434 } 435 }
435 436
436 base::TimeTicks DummyTickClock::NowTicks() { 437 base::TimeTicks DummyTickClock::NowTicks() {
437 now_ += base::TimeDelta::FromSeconds(60); 438 now_ += base::TimeDelta::FromSeconds(60);
438 return now_; 439 return now_;
439 } 440 }
440 441
441 } // namespace media 442 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698