Convert Pass()→std::move() in ui/

BUG=557422

Review URL: https://codereview.chromium.org/1539583003

Cr-Commit-Position: refs/heads/master@{#366017}

8 files changed, 26 insertions, 14 deletions

diff --git a/ui/aura/env.cc b/ui/aura/env.cc
index 4d2db40..148300c 100644
--- a/ui/aura/env.cc
+++ b/ui/aura/env.cc
@@ -71,7 +71,7 @@ bool Env::IsMouseButtonDown() const {
 Env::Env()
     : mouse_button_flags_(0),
       is_touch_down_(false),
-      input_state_lookup_(InputStateLookup::Create().Pass()),
+      input_state_lookup_(InputStateLookup::Create()),
       context_factory_(NULL) {
   DCHECK(lazy_tls_ptr.Pointer()->Get() == NULL);
   lazy_tls_ptr.Pointer()->Set(this);
diff --git a/ui/aura/scoped_window_targeter.cc b/ui/aura/scoped_window_targeter.cc
index d71e919..ae7c06b 100644
--- a/ui/aura/scoped_window_targeter.cc
+++ b/ui/aura/scoped_window_targeter.cc
@@ -4,6 +4,8 @@
 
 #include "ui/aura/scoped_window_targeter.h"
 
+#include <utility>
+
 #include "ui/aura/window.h"
 
 namespace aura {
@@ -12,14 +14,14 @@ ScopedWindowTargeter::ScopedWindowTargeter(
     Window* window,
     scoped_ptr<ui::EventTargeter> new_targeter)
     : window_(window),
-      old_targeter_(window->SetEventTargeter(new_targeter.Pass())) {
+      old_targeter_(window->SetEventTargeter(std::move(new_targeter))) {
   window_->AddObserver(this);
 }
 
 ScopedWindowTargeter::~ScopedWindowTargeter() {
   if (window_) {
     window_->RemoveObserver(this);
-    window_->SetEventTargeter(old_targeter_.Pass());
+    window_->SetEventTargeter(std::move(old_targeter_));
   }
 }
 
diff --git a/ui/aura/test/aura_test_utils.cc b/ui/aura/test/aura_test_utils.cc
index ce40df8..7a11b19 100644
--- a/ui/aura/test/aura_test_utils.cc
+++ b/ui/aura/test/aura_test_utils.cc
@@ -4,6 +4,8 @@
 
 #include "ui/aura/test/aura_test_utils.h"
 
+#include <utility>
+
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 
@@ -19,7 +21,7 @@ class WindowTreeHostTestApi {
   }
 
   void set_dispatcher(scoped_ptr<WindowEventDispatcher> dispatcher) {
-    host_->dispatcher_ = dispatcher.Pass();
+    host_->dispatcher_ = std::move(dispatcher);
   }
 
  private:
@@ -36,7 +38,7 @@ const gfx::Point& QueryLatestMousePositionRequestInHost(WindowTreeHost* host) {
 void SetHostDispatcher(WindowTreeHost* host,
                        scoped_ptr<WindowEventDispatcher> dispatcher) {
   WindowTreeHostTestApi host_test_api(host);
-  host_test_api.set_dispatcher(dispatcher.Pass());
+  host_test_api.set_dispatcher(std::move(dispatcher));
 }
 
 }  // namespace test
diff --git a/ui/aura/test/env_test_helper.h b/ui/aura/test/env_test_helper.h
index 7356062..fb64d46 100644
--- a/ui/aura/test/env_test_helper.h
+++ b/ui/aura/test/env_test_helper.h
@@ -5,6 +5,8 @@
 #ifndef UI_AURA_TEST_ENV_TEST_HELPER_H_
 #define UI_AURA_TEST_ENV_TEST_HELPER_H_
 
+#include <utility>
+
 #include "ui/aura/env.h"
 #include "ui/aura/input_state_lookup.h"
 
@@ -17,7 +19,7 @@ class EnvTestHelper {
   ~EnvTestHelper() {}
 
   void SetInputStateLookup(scoped_ptr<InputStateLookup> input_state_lookup) {
-    env_->input_state_lookup_ = input_state_lookup.Pass();
+    env_->input_state_lookup_ = std::move(input_state_lookup);
   }
 
   void ResetEventState() {
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 2634eba..8f27a6c 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -5,6 +5,7 @@
 #include "ui/aura/window.h"
 
 #include <algorithm>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -291,9 +292,9 @@ void Window::SetLayoutManager(LayoutManager* layout_manager) {
 
 scoped_ptr<ui::EventTargeter>
 Window::SetEventTargeter(scoped_ptr<ui::EventTargeter> targeter) {
-  scoped_ptr<ui::EventTargeter> old_targeter = targeter_.Pass();
-  targeter_ = targeter.Pass();
-  return old_targeter.Pass();
+  scoped_ptr<ui::EventTargeter> old_targeter = std::move(targeter_);
+  targeter_ = std::move(targeter);
+  return old_targeter;
 }
 
 void Window::SetBounds(const gfx::Rect& new_bounds) {
diff --git a/ui/aura/window_event_dispatcher_unittest.cc b/ui/aura/window_event_dispatcher_unittest.cc
index f9e80f4..21a3170 100644
--- a/ui/aura/window_event_dispatcher_unittest.cc
+++ b/ui/aura/window_event_dispatcher_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ui/aura/window_event_dispatcher.h"
 
+#include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ -2226,7 +2227,7 @@ class SelfDestructDelegate : public test::TestWindowDelegate {
   void OnMouseEvent(ui::MouseEvent* event) override { window_.reset(); }
 
   void set_window(scoped_ptr<aura::Window> window) {
-    window_ = window.Pass();
+    window_ = std::move(window);
   }
   bool has_window() const { return !!window_.get(); }
 
@@ -2257,7 +2258,7 @@ TEST_F(WindowEventDispatcherTest, SynthesizedLocatedEvent) {
   SelfDestructDelegate delegate;
   scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(50, 50, 100, 100), root_window()));
-  delegate.set_window(window.Pass());
+  delegate.set_window(std::move(window));
   EXPECT_TRUE(delegate.has_window());
 
   generator.MoveMouseTo(100, 100);
@@ -2276,7 +2277,7 @@ TEST_F(WindowEventDispatcherTest, DestroyWindowOnCaptureChanged) {
   Window* window_first_raw = window_first.get();
   window_first->Show();
   window_first->SetCapture();
-  delegate.set_window(window_first.Pass());
+  delegate.set_window(std::move(window_first));
   EXPECT_TRUE(delegate.has_window());
 
   scoped_ptr<aura::Window> window_second(
diff --git a/ui/aura/window_targeter_unittest.cc b/ui/aura/window_targeter_unittest.cc
index 36d36ae..de362e9 100644
--- a/ui/aura/window_targeter_unittest.cc
+++ b/ui/aura/window_targeter_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "ui/aura/window_targeter.h"
 
+#include <utility>
+
 #include "ui/aura/scoped_window_targeter.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_window_delegate.h"
@@ -240,7 +242,7 @@ TEST_F(WindowTargeterTest, Bounds) {
   EXPECT_EQ(child_r, targeter->FindTargetForEvent(root_target, &mouse3));
 
   // restore original WindowTargeter for |child|.
-  child_r->SetEventTargeter(original_targeter.Pass());
+  child_r->SetEventTargeter(std::move(original_targeter));
 
   // Target |grandchild| location.
   ui::MouseEvent second(ui::ET_MOUSE_MOVED, gfx::Point(12, 12),
diff --git a/ui/aura/window_tree_host_platform.cc b/ui/aura/window_tree_host_platform.cc
index 2a7d054..a696eea 100644
--- a/ui/aura/window_tree_host_platform.cc
+++ b/ui/aura/window_tree_host_platform.cc
@@ -4,6 +4,8 @@
 
 #include "ui/aura/window_tree_host_platform.h"
 
+#include <utility>
+
 #include "base/trace_event/trace_event.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/compositor.h"
@@ -55,7 +57,7 @@ WindowTreeHostPlatform::WindowTreeHostPlatform()
 
 void WindowTreeHostPlatform::SetPlatformWindow(
     scoped_ptr<ui::PlatformWindow> window) {
-  window_ = window.Pass();
+  window_ = std::move(window);
 }
 
 WindowTreeHostPlatform::~WindowTreeHostPlatform() {