Index: remoting/host/resizing_host_observer_unittest.cc |
diff --git a/remoting/host/resizing_host_observer_unittest.cc b/remoting/host/resizing_host_observer_unittest.cc |
index f25465afbc2bf879a4ea8d442b66a33a1989194e..92074964e1a69eb37ae31feae28d8fefcb6456ad 100644 |
--- a/remoting/host/resizing_host_observer_unittest.cc |
+++ b/remoting/host/resizing_host_observer_unittest.cc |
@@ -108,7 +108,7 @@ class ResizingHostObserverTest : public testing::Test { |
desktop_resizer_ = desktop_resizer.get(); |
resizing_host_observer_.reset( |
- new ResizingHostObserver(desktop_resizer.Pass())); |
+ new ResizingHostObserver(std::move(desktop_resizer))); |
resizing_host_observer_->SetNowFunctionForTesting( |
base::Bind(&ResizingHostObserverTest::GetTimeAndIncrement, |
base::Unretained(this))); |
@@ -147,7 +147,7 @@ TEST_F(ResizingHostObserverTest, NoRestoreResolution) { |
scoped_ptr<FakeDesktopResizer> desktop_resizer( |
new FakeDesktopResizer(initial, false, nullptr, 0, |
&restore_resolution_call_count)); |
- SetDesktopResizer(desktop_resizer.Pass()); |
+ SetDesktopResizer(std::move(desktop_resizer)); |
VerifySizes(nullptr, nullptr, 0); |
resizing_host_observer_.reset(); |
EXPECT_EQ(0, restore_resolution_call_count); |
@@ -161,7 +161,7 @@ TEST_F(ResizingHostObserverTest, EmptyGetSupportedSizes) { |
scoped_ptr<FakeDesktopResizer> desktop_resizer( |
new FakeDesktopResizer(initial, false, nullptr, 0, |
&restore_resolution_call_count)); |
- SetDesktopResizer(desktop_resizer.Pass()); |
+ SetDesktopResizer(std::move(desktop_resizer)); |
ScreenResolution client_sizes[] = { MakeResolution(200, 100), |
MakeResolution(100, 200) }; |
@@ -178,7 +178,7 @@ TEST_F(ResizingHostObserverTest, SelectExactSize) { |
scoped_ptr<FakeDesktopResizer> desktop_resizer( |
new FakeDesktopResizer(MakeResolution(640, 480), true, nullptr, 0, |
&restore_resolution_call_count)); |
- SetDesktopResizer(desktop_resizer.Pass()); |
+ SetDesktopResizer(std::move(desktop_resizer)); |
ScreenResolution client_sizes[] = { MakeResolution(200, 100), |
MakeResolution(100, 200), |
@@ -199,7 +199,7 @@ TEST_F(ResizingHostObserverTest, SelectBestSmallerSize) { |
new FakeDesktopResizer(MakeResolution(640, 480), false, |
supported_sizes, arraysize(supported_sizes), |
nullptr)); |
- SetDesktopResizer(desktop_resizer.Pass()); |
+ SetDesktopResizer(std::move(desktop_resizer)); |
ScreenResolution client_sizes[] = { MakeResolution(639, 479), |
MakeResolution(640, 480), |
@@ -219,7 +219,7 @@ TEST_F(ResizingHostObserverTest, SelectBestScaleFactor) { |
new FakeDesktopResizer(MakeResolution(200, 100), false, |
supported_sizes, arraysize(supported_sizes), |
nullptr)); |
- SetDesktopResizer(desktop_resizer.Pass()); |
+ SetDesktopResizer(std::move(desktop_resizer)); |
ScreenResolution client_sizes[] = { MakeResolution(1, 1), |
MakeResolution(99, 99), |
@@ -238,7 +238,7 @@ TEST_F(ResizingHostObserverTest, SelectWidest) { |
new FakeDesktopResizer(MakeResolution(480, 640), false, |
supported_sizes, arraysize(supported_sizes), |
nullptr)); |
- SetDesktopResizer(desktop_resizer.Pass()); |
+ SetDesktopResizer(std::move(desktop_resizer)); |
ScreenResolution client_sizes[] = { MakeResolution(100, 100), |
MakeResolution(480, 480), |