| Index: remoting/test/app_remoting_latency_test_fixture.cc
|
| diff --git a/remoting/test/app_remoting_latency_test_fixture.cc b/remoting/test/app_remoting_latency_test_fixture.cc
|
| index 2827c2cbd2d3664a8d80333b2a5b3a8440e57b87..d5f1a5ff9eaa1b368012803288f45a06d42424a2 100644
|
| --- a/remoting/test/app_remoting_latency_test_fixture.cc
|
| +++ b/remoting/test/app_remoting_latency_test_fixture.cc
|
| @@ -29,10 +29,11 @@ AppRemotingLatencyTestFixture::AppRemotingLatencyTestFixture()
|
| AppRemotingLatencyTestFixture::~AppRemotingLatencyTestFixture() {}
|
|
|
| void AppRemotingLatencyTestFixture::SetUp() {
|
| - scoped_ptr<TestVideoRenderer> test_video_renderer(new TestVideoRenderer());
|
| + std::unique_ptr<TestVideoRenderer> test_video_renderer(
|
| + new TestVideoRenderer());
|
| test_video_renderer_ = test_video_renderer->GetWeakPtr();
|
|
|
| - scoped_ptr<TestChromotingClient> test_chromoting_client(
|
| + std::unique_ptr<TestChromotingClient> test_chromoting_client(
|
| new TestChromotingClient(std::move(test_video_renderer)));
|
|
|
| test_chromoting_client->AddRemoteConnectionObserver(this);
|
| @@ -67,7 +68,7 @@ WaitForImagePatternMatchCallback
|
| AppRemotingLatencyTestFixture::SetExpectedImagePattern(
|
| const webrtc::DesktopRect& expected_rect,
|
| const RGBValue& expected_color) {
|
| - scoped_ptr<base::RunLoop> run_loop(new base::RunLoop());
|
| + std::unique_ptr<base::RunLoop> run_loop(new base::RunLoop());
|
|
|
| test_video_renderer_->ExpectAverageColorInRect(expected_rect, expected_color,
|
| run_loop->QuitClosure());
|
| @@ -82,7 +83,7 @@ void AppRemotingLatencyTestFixture::SaveFrameDataToDisk(
|
| }
|
|
|
| bool AppRemotingLatencyTestFixture::WaitForImagePatternMatch(
|
| - scoped_ptr<base::RunLoop> run_loop,
|
| + std::unique_ptr<base::RunLoop> run_loop,
|
| const base::TimeDelta& max_wait_time) {
|
| DCHECK(run_loop);
|
| DCHECK(!timer_->IsRunning());
|
|
|