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

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

Issue 2253943004: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months 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
« no previous file with comments | « media/test/pipeline_integration_test.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 } 185 }
186 186
187 PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename, 187 PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename,
188 uint8_t test_type) { 188 uint8_t test_type) {
189 return StartWithFile(filename, nullptr, test_type); 189 return StartWithFile(filename, nullptr, test_type);
190 } 190 }
191 191
192 PipelineStatus PipelineIntegrationTestBase::Start(const uint8_t* data, 192 PipelineStatus PipelineIntegrationTestBase::Start(const uint8_t* data,
193 size_t size, 193 size_t size,
194 uint8_t test_type) { 194 uint8_t test_type) {
195 return StartInternal(base::WrapUnique(new MemoryDataSource(data, size)), 195 return StartInternal(base::MakeUnique<MemoryDataSource>(data, size), nullptr,
196 nullptr, test_type); 196 test_type);
197 } 197 }
198 198
199 void PipelineIntegrationTestBase::Play() { 199 void PipelineIntegrationTestBase::Play() {
200 pipeline_->SetPlaybackRate(1); 200 pipeline_->SetPlaybackRate(1);
201 } 201 }
202 202
203 void PipelineIntegrationTestBase::Pause() { 203 void PipelineIntegrationTestBase::Pause() {
204 pipeline_->SetPlaybackRate(0); 204 pipeline_->SetPlaybackRate(0);
205 } 205 }
206 206
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 DCHECK(clockless_playback_); 401 DCHECK(clockless_playback_);
402 return clockless_audio_sink_->render_time(); 402 return clockless_audio_sink_->render_time();
403 } 403 }
404 404
405 base::TimeTicks DummyTickClock::NowTicks() { 405 base::TimeTicks DummyTickClock::NowTicks() {
406 now_ += base::TimeDelta::FromSeconds(60); 406 now_ += base::TimeDelta::FromSeconds(60);
407 return now_; 407 return now_;
408 } 408 }
409 409
410 } // namespace media 410 } // namespace media
OLDNEW
« no previous file with comments | « media/test/pipeline_integration_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698