Use std::move() instead of .Pass() in remoting/host

remoting/host/resizing_host_observer_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "remoting/host/resizing_host_observer.h"
+
 #include <list>
+#include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "remoting/host/desktop_resizer.h"
-#include "remoting/host/resizing_host_observer.h"
 #include "remoting/host/screen_resolution.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace remoting {
 
 std::ostream& operator<<(std::ostream& os, const ScreenResolution& resolution) {
   return os << resolution.dimensions().width() << "x"
             << resolution.dimensions().height() << " @ "
             << resolution.dpi().x() << "x" << resolution.dpi().y();
@@ skipping 77 matching lines @@
   base::Time GetTime() {
     return now_;
   }
 
  protected:
   void SetDesktopResizer(scoped_ptr<FakeDesktopResizer> desktop_resizer) {
     CHECK(!desktop_resizer_) << "Call SetDeskopResizer once per 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)));
   }
 
   ScreenResolution GetBestResolution(const ScreenResolution& client_size) {
     resizing_host_observer_->SetScreenResolution(client_size);
     return desktop_resizer_->GetCurrentResolution();
   }
 
@@ skipping 18 matching lines @@
   base::Time now_;
 };
 
 // Check that the resolution isn't restored if it wasn't changed by this class.
 TEST_F(ResizingHostObserverTest, NoRestoreResolution) {
   int restore_resolution_call_count = 0;
   ScreenResolution initial = MakeResolution(640, 480);
   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);
 }
 
 // Check that the host is not resized if GetSupportedSizes returns an empty
 // list (even if GetCurrentSize is supported).
 TEST_F(ResizingHostObserverTest, EmptyGetSupportedSizes) {
   int restore_resolution_call_count = 0;
   ScreenResolution initial = MakeResolution(640, 480);
   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) };
   ScreenResolution expected_sizes[] = { initial, initial };
   VerifySizes(client_sizes, expected_sizes, arraysize(client_sizes));
 
   resizing_host_observer_.reset();
   EXPECT_EQ(0, restore_resolution_call_count);
 }
 
 // Check that if the implementation supports exact size matching, it is used.
 TEST_F(ResizingHostObserverTest, SelectExactSize) {
   int restore_resolution_call_count = 0;
   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),
                                       MakeResolution(640, 480),
                                       MakeResolution(480, 640),
                                       MakeResolution(1280, 1024) };
   VerifySizes(client_sizes, client_sizes, arraysize(client_sizes));
   resizing_host_observer_.reset();
   EXPECT_EQ(1, restore_resolution_call_count);
 }
 
 // Check that if the implementation supports a size that is no larger than
 // the requested size, then the largest such size is used.
 TEST_F(ResizingHostObserverTest, SelectBestSmallerSize) {
   ScreenResolution supported_sizes[] = { MakeResolution(639, 479),
                                          MakeResolution(640, 480) };
   scoped_ptr<FakeDesktopResizer> desktop_resizer(
       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),
                                       MakeResolution(641, 481),
                                       MakeResolution(999, 999) };
   ScreenResolution expected_sizes[] = { supported_sizes[0], supported_sizes[1],
                                supported_sizes[1], supported_sizes[1] };
   VerifySizes(client_sizes, expected_sizes, arraysize(client_sizes));
 }
 
 // Check that if the implementation supports only sizes that are larger than
 // the requested size, then the one that requires the least down-scaling.
 TEST_F(ResizingHostObserverTest, SelectBestScaleFactor) {
   ScreenResolution supported_sizes[] = { MakeResolution(100, 100),
                                          MakeResolution(200, 100) };
   scoped_ptr<FakeDesktopResizer> desktop_resizer(
       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),
                                       MakeResolution(199, 99) };
   ScreenResolution expected_sizes[] = { supported_sizes[0], supported_sizes[0],
                                supported_sizes[1] };
   VerifySizes(client_sizes, expected_sizes, arraysize(client_sizes));
 }
 
 // Check that if the implementation supports two sizes that have the same
 // resultant scale factor, then the widest one is selected.
 TEST_F(ResizingHostObserverTest, SelectWidest) {
   ScreenResolution supported_sizes[] = { MakeResolution(640, 480),
                                          MakeResolution(480, 640) };
   scoped_ptr<FakeDesktopResizer> desktop_resizer(
       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),
                                       MakeResolution(500, 500),
                                       MakeResolution(640, 640),
                                       MakeResolution(1000, 1000) };
   ScreenResolution expected_sizes[] = { supported_sizes[0], supported_sizes[0],
                                supported_sizes[0], supported_sizes[0],
                                supported_sizes[0] };
   VerifySizes(client_sizes, expected_sizes, arraysize(client_sizes));
@@ skipping 48 matching lines @@
       FROM_HERE,
       run_loop.QuitClosure(),
       base::TimeDelta::FromMilliseconds(2));
   run_loop.Run();
 
   // If the QuitClosure fired before the final resize, it's a test failure.
   EXPECT_EQ(desktop_resizer_->GetCurrentResolution(), MakeResolution(300, 300));
 }
 
 }  // namespace remoting