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

ui/wm/core/capture_controller_unittest.cc

 // Copyright (c) 2013 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 "ui/wm/core/capture_controller.h"
 
+#include <utility>
+
 #include "base/logging.h"
 #include "ui/aura/client/capture_delegate.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
@@ skipping 191 matching lines @@
   EXPECT_FALSE(delegate->HasNativeCapture());
   EXPECT_FALSE(delegate2->HasNativeCapture());
 }
 
 // A delegate that deletes a window on scroll cancel gesture event.
 class GestureEventDeleteWindowOnScrollEnd
     : public aura::test::TestWindowDelegate {
  public:
   GestureEventDeleteWindowOnScrollEnd() {}
 
-  void SetWindow(scoped_ptr<aura::Window> window) { window_ = window.Pass(); }
+  void SetWindow(scoped_ptr<aura::Window> window) {
+    window_ = std::move(window);
+  }
   aura::Window* window() { return window_.get(); }
 
   // aura::test::TestWindowDelegate:
   void OnGestureEvent(ui::GestureEvent* gesture) override {
     TestWindowDelegate::OnGestureEvent(gesture);
     if (gesture->type() != ui::ET_GESTURE_SCROLL_END)
       return;
     window_.reset();
   }
 
@@ skipping 10 matching lines @@
       new GestureEventDeleteWindowOnScrollEnd());
   const int kWindowWidth = 123;
   const int kWindowHeight = 45;
   gfx::Rect bounds(100, 200, kWindowWidth, kWindowHeight);
   scoped_ptr<aura::Window> window1(
       CreateNormalWindowWithBounds(-1235, root_window(), bounds, nullptr));
 
   bounds.Offset(0, 100);
   scoped_ptr<aura::Window> window2(CreateNormalWindowWithBounds(
       -1234, root_window(), bounds, delegate.get()));
-  delegate->SetWindow(window1.Pass());
+  delegate->SetWindow(std::move(window1));
 
   ui::test::EventGenerator event_generator(root_window());
   const int position_x = bounds.x() + 1;
   int position_y = bounds.y() + 1;
   event_generator.MoveTouch(gfx::Point(position_x, position_y));
   event_generator.PressTouch();
   for (int idx = 0 ; idx < 20 ; idx++, position_y++)
     event_generator.MoveTouch(gfx::Point(position_x, position_y));
 
   // Setting capture on |window1| cancels touch gestures that are active on
   // |window2|. GestureEventDeleteWindowOnScrollEnd will then delete |window1|
   // and should release capture on it.
   delegate->window()->SetCapture();
 
   // capture should not be set upon exit from SetCapture() above.
   aura::client::CaptureClient* capture_client =
       aura::client::GetCaptureClient(root_window());
   ASSERT_NE(nullptr, capture_client);
   EXPECT_EQ(nullptr, capture_client->GetCaptureWindow());
 
   // Send a mouse click. We no longer hold capture so this should not crash.
   ui::MouseEvent mouse_press(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                              base::TimeDelta(), 0, 0);
   DispatchEventUsingWindowDispatcher(&mouse_press);
 }
 
 }  // namespace wm