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

❆(੭ु ◜◡‾)੭ु⁾☃❆

BUG=557422
R=avi@chromium.org
TBR=oshima@chromium.org

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

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

46 files changed, 171 insertions, 126 deletions

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 19d53e1..25fde9c 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <cmath>
 #include <string>
+#include <utility>
 
 #include "ash/accelerators/accelerator_commands.h"
 #include "ash/accelerators/debug_commands.h"
@@ -169,7 +170,8 @@ void ShowDeprecatedAcceleratorNotification(const char* const notification_id,
               system_notifier::kNotifierDeprecatedAccelerator),
           message_center::RichNotificationData(),
           new DeprecatedAcceleratorNotificationDelegate));
-  message_center::MessageCenter::Get()->AddNotification(notification.Pass());
+  message_center::MessageCenter::Get()->AddNotification(
+      std::move(notification));
 }
 
 void RecordUmaHistogram(const char* histogram_name,
@@ -831,17 +833,17 @@ AcceleratorController::GetCurrentAcceleratorRestriction() {
 
 void AcceleratorController::SetBrightnessControlDelegate(
     scoped_ptr<BrightnessControlDelegate> brightness_control_delegate) {
-  brightness_control_delegate_ = brightness_control_delegate.Pass();
+  brightness_control_delegate_ = std::move(brightness_control_delegate);
 }
 
 void AcceleratorController::SetImeControlDelegate(
     scoped_ptr<ImeControlDelegate> ime_control_delegate) {
-  ime_control_delegate_ = ime_control_delegate.Pass();
+  ime_control_delegate_ = std::move(ime_control_delegate);
 }
 
 void AcceleratorController::SetScreenshotDelegate(
     scoped_ptr<ScreenshotDelegate> screenshot_delegate) {
-  screenshot_delegate_ = screenshot_delegate.Pass();
+  screenshot_delegate_ = std::move(screenshot_delegate);
 }
 
 bool AcceleratorController::ShouldCloseMenuAndRepostAccelerator(
@@ -1454,7 +1456,7 @@ void AcceleratorController::SetKeyboardBrightnessControlDelegate(
     scoped_ptr<KeyboardBrightnessControlDelegate>
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
-      keyboard_brightness_control_delegate.Pass();
+      std::move(keyboard_brightness_control_delegate);
 }
 
 }  // namespace ash
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index 2d4b60d..738bf48 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -1054,7 +1054,7 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) {
     EXPECT_FALSE(ProcessInController(hangul));
     DummyImeControlDelegate* delegate = new DummyImeControlDelegate;
     GetController()->SetImeControlDelegate(
-        scoped_ptr<ImeControlDelegate>(delegate).Pass());
+        scoped_ptr<ImeControlDelegate>(delegate));
     EXPECT_EQ(0, delegate->handle_previous_ime_count());
     EXPECT_TRUE(ProcessInController(control_space_down));
     EXPECT_EQ(1, delegate->handle_previous_ime_count());
@@ -1084,7 +1084,7 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) {
 
     DummyImeControlDelegate* delegate = new DummyImeControlDelegate;
     GetController()->SetImeControlDelegate(
-        scoped_ptr<ImeControlDelegate>(delegate).Pass());
+        scoped_ptr<ImeControlDelegate>(delegate));
     EXPECT_EQ(0, delegate->handle_next_ime_count());
     EXPECT_FALSE(ProcessInController(shift_alt_press));
     EXPECT_TRUE(ProcessInController(shift_alt));
@@ -1192,7 +1192,7 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAcceleratorsWorkaround139556) {
 TEST_F(AcceleratorControllerTest, ImeGlobalAcceleratorsNoConflict) {
   DummyImeControlDelegate* delegate = new DummyImeControlDelegate;
   GetController()->SetImeControlDelegate(
-      scoped_ptr<ImeControlDelegate>(delegate).Pass());
+      scoped_ptr<ImeControlDelegate>(delegate));
   ui::test::EventGenerator& generator = GetEventGenerator();
 
   // Correct sequence of a conflicting accelerator must not trigger next IME.
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index 7daadce..df57174 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -4,6 +4,8 @@
 
 #include "ash/display/mirror_window_controller.h"
 
+#include <utility>
+
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
@@ -226,7 +228,7 @@ void MirrorWindowController::UpdateWindow(
           new aura::Window(nullptr);
       mirror_window->Init(ui::LAYER_SOLID_COLOR);
       host->window()->AddChild(mirror_window);
-      host_info->ash_host->SetRootWindowTransformer(transformer.Pass());
+      host_info->ash_host->SetRootWindowTransformer(std::move(transformer));
       mirror_window->SetBounds(host->window()->bounds());
       mirror_window->Show();
       if (reflector_) {
@@ -242,7 +244,7 @@ void MirrorWindowController::UpdateWindow(
           mirroring_host_info_map_[display_info.id()]->ash_host.get();
       aura::WindowTreeHost* host = ash_host->AsWindowTreeHost();
       GetRootWindowSettings(host->window())->display_id = display_info.id();
-      ash_host->SetRootWindowTransformer(transformer.Pass());
+      ash_host->SetRootWindowTransformer(std::move(transformer));
       host->SetBounds(display_info.bounds_in_native());
     }
   }
diff --git a/ash/display/mouse_cursor_event_filter.cc b/ash/display/mouse_cursor_event_filter.cc
index 570058f..2efb75a 100644
--- a/ash/display/mouse_cursor_event_filter.cc
+++ b/ash/display/mouse_cursor_event_filter.cc
@@ -23,10 +23,8 @@ MouseCursorEventFilter::~MouseCursorEventFilter() {
 }
 
 void MouseCursorEventFilter::ShowSharedEdgeIndicator(aura::Window* from) {
-  mouse_warp_controller_ = Shell::GetInstance()
-                               ->display_manager()
-                               ->CreateMouseWarpController(from)
-                               .Pass();
+  mouse_warp_controller_ =
+      Shell::GetInstance()->display_manager()->CreateMouseWarpController(from);
 }
 
 void MouseCursorEventFilter::HideSharedEdgeIndicator() {
@@ -38,10 +36,9 @@ void MouseCursorEventFilter::OnDisplaysInitialized() {
 }
 
 void MouseCursorEventFilter::OnDisplayConfigurationChanged() {
-  mouse_warp_controller_ = Shell::GetInstance()
-                               ->display_manager()
-                               ->CreateMouseWarpController(nullptr)
-                               .Pass();
+  mouse_warp_controller_ =
+      Shell::GetInstance()->display_manager()->CreateMouseWarpController(
+          nullptr);
 }
 
 void MouseCursorEventFilter::OnMouseEvent(ui::MouseEvent* event) {
diff --git a/ash/display/window_tree_host_manager.cc b/ash/display/window_tree_host_manager.cc
index bb0224e..8f2ba2e 100644
--- a/ash/display/window_tree_host_manager.cc
+++ b/ash/display/window_tree_host_manager.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <cmath>
 #include <map>
+#include <utility>
 
 #include "ash/ash_switches.h"
 #include "ash/display/cursor_window_controller.h"
@@ -148,7 +149,7 @@ void SetDisplayPropertiesOnHost(AshWindowTreeHost* ash_host,
 #endif
   scoped_ptr<RootWindowTransformer> transformer(
       CreateRootWindowTransformerForDisplay(host->window(), display));
-  ash_host->SetRootWindowTransformer(transformer.Pass());
+  ash_host->SetRootWindowTransformer(std::move(transformer));
 
   DisplayMode mode =
       GetDisplayManager()->GetActiveModeForDisplayId(display.id());
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc
index 3882ea3..ad87b7c 100644
--- a/ash/drag_drop/drag_drop_controller.cc
+++ b/ash/drag_drop/drag_drop_controller.cc
@@ -4,6 +4,8 @@
 
 #include "ash/drag_drop/drag_drop_controller.h"
 
+#include <utility>
+
 #include "ash/drag_drop/drag_drop_tracker.h"
 #include "ash/drag_drop/drag_image_view.h"
 #include "ash/shell.h"
@@ -565,7 +567,7 @@ void DragDropController::Cleanup() {
   drag_data_ = NULL;
   // Cleanup can be called again while deleting DragDropTracker, so delete
   // the pointer with a local variable to avoid double free.
-  scoped_ptr<ash::DragDropTracker> holder = drag_drop_tracker_.Pass();
+  scoped_ptr<ash::DragDropTracker> holder = std::move(drag_drop_tracker_);
 }
 
 }  // namespace ash
diff --git a/ash/frame/custom_frame_view_ash_unittest.cc b/ash/frame/custom_frame_view_ash_unittest.cc
index ab3656e..3d227f3 100644
--- a/ash/frame/custom_frame_view_ash_unittest.cc
+++ b/ash/frame/custom_frame_view_ash_unittest.cc
@@ -108,7 +108,7 @@ class CustomFrameViewAshTest : public test::AshTestBase {
     params.bounds = gfx::Rect(0, 0, 100, 100);
     params.context = CurrentContext();
     widget->Init(params);
-    return widget.Pass();
+    return widget;
   }
 
   test::TestSessionStateDelegate* GetTestSessionStateDelegate() {
diff --git a/ash/host/ash_window_tree_host_unified.cc b/ash/host/ash_window_tree_host_unified.cc
index f94d1e2..ab9a954 100644
--- a/ash/host/ash_window_tree_host_unified.cc
+++ b/ash/host/ash_window_tree_host_unified.cc
@@ -3,6 +3,9 @@
 // found in the LICENSE file.
 
 #include "ash/host/ash_window_tree_host_unified.h"
+
+#include <utility>
+
 #include "ash/host/root_window_transformer.h"
 #include "ash/ime/input_method_event_handler.h"
 #include "base/logging.h"
@@ -91,7 +94,7 @@ void AshWindowTreeHostUnified::UnConfineCursor() {
 
 void AshWindowTreeHostUnified::SetRootWindowTransformer(
     scoped_ptr<RootWindowTransformer> transformer) {
-  transformer_helper_.SetRootWindowTransformer(transformer.Pass());
+  transformer_helper_.SetRootWindowTransformer(std::move(transformer));
 }
 
 gfx::Insets AshWindowTreeHostUnified::GetHostInsets() const {
diff --git a/ash/host/ash_window_tree_host_x11.cc b/ash/host/ash_window_tree_host_x11.cc
index 24332af..50e29a4 100644
--- a/ash/host/ash_window_tree_host_x11.cc
+++ b/ash/host/ash_window_tree_host_x11.cc
@@ -4,12 +4,12 @@
 
 #include "ash/host/ash_window_tree_host_x11.h"
 
-#include <X11/extensions/Xfixes.h>
-#include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
-
+#include <X11/extensions/XInput2.h>
+#include <X11/extensions/Xfixes.h>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "ash/host/ash_window_tree_host_init_params.h"
@@ -112,7 +112,7 @@ void AshWindowTreeHostX11::UnConfineCursor() {
 
 void AshWindowTreeHostX11::SetRootWindowTransformer(
     scoped_ptr<RootWindowTransformer> transformer) {
-  transformer_helper_.SetRootWindowTransformer(transformer.Pass());
+  transformer_helper_.SetRootWindowTransformer(std::move(transformer));
   if (pointer_barriers_) {
     UnConfineCursor();
     ConfineCursorToRootWindow();
diff --git a/ash/host/transformer_helper.cc b/ash/host/transformer_helper.cc
index af56d8a..aba9460 100644
--- a/ash/host/transformer_helper.cc
+++ b/ash/host/transformer_helper.cc
@@ -4,6 +4,8 @@
 
 #include "ash/host/transformer_helper.h"
 
+#include <utility>
+
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/host/root_window_transformer.h"
 #include "ui/aura/window.h"
@@ -73,12 +75,12 @@ gfx::Insets TransformerHelper::GetHostInsets() const {
 void TransformerHelper::SetTransform(const gfx::Transform& transform) {
   scoped_ptr<RootWindowTransformer> transformer(new SimpleRootWindowTransformer(
       ash_host_->AsWindowTreeHost()->window(), transform));
-  SetRootWindowTransformer(transformer.Pass());
+  SetRootWindowTransformer(std::move(transformer));
 }
 
 void TransformerHelper::SetRootWindowTransformer(
     scoped_ptr<RootWindowTransformer> transformer) {
-  transformer_ = transformer.Pass();
+  transformer_ = std::move(transformer);
   aura::WindowTreeHost* host = ash_host_->AsWindowTreeHost();
   aura::Window* window = host->window();
   window->SetTransform(transformer_->GetTransform());
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
index 31cd831..e4c5b8e 100644
--- a/ash/magnifier/magnification_controller.cc
+++ b/ash/magnifier/magnification_controller.cc
@@ -4,6 +4,8 @@
 
 #include "ash/magnifier/magnification_controller.h"
 
+#include <utility>
+
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accessibility_delegate.h"
 #include "ash/ash_switches.h"
@@ -373,8 +375,9 @@ bool MagnificationControllerImpl::RedrawDIP(const gfx::PointF& position_in_dip,
       Shell::GetScreen()->GetDisplayNearestWindow(root_window_);
   scoped_ptr<RootWindowTransformer> transformer(
       CreateRootWindowTransformerForDisplay(root_window_, display));
-  GetRootWindowController(root_window_)->ash_host()->SetRootWindowTransformer(
-      transformer.Pass());
+  GetRootWindowController(root_window_)
+      ->ash_host()
+      ->SetRootWindowTransformer(std::move(transformer));
 
   if (duration_in_ms > 0)
     is_on_animation_ = true;
diff --git a/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc b/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc
index 59ec7f9..f4c28c4 100644
--- a/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc
+++ b/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc
@@ -104,7 +104,7 @@ DesktopTaskSwitchMetricRecorderTest::CreatePositionableWindow() const {
       aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate()));
   window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
   window->Init(ui::LAYER_NOT_DRAWN);
-  return window.Pass();
+  return window;
 }
 
 scoped_ptr<aura::Window>
@@ -113,7 +113,7 @@ DesktopTaskSwitchMetricRecorderTest::CreateNonPositionableWindow() const {
       aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate()));
   window->SetType(ui::wm::WINDOW_TYPE_UNKNOWN);
   window->Init(ui::LAYER_NOT_DRAWN);
-  return window.Pass();
+  return window;
 }
 
 // Verify user action is recorded when a positionable window is activated given
@@ -121,8 +121,7 @@ DesktopTaskSwitchMetricRecorderTest::CreateNonPositionableWindow() const {
 TEST_F(DesktopTaskSwitchMetricRecorderTest,
        ActivatePositionableWindowWhenNullWindowWasActivatedLast) {
   scoped_ptr<aura::Window> null_window;
-  scoped_ptr<aura::Window> positionable_window =
-      CreatePositionableWindow().Pass();
+  scoped_ptr<aura::Window> positionable_window = CreatePositionableWindow();
 
   ActiveTaskWindowWithUserInput(null_window.get());
   ResetActionCounts();
@@ -136,10 +135,8 @@ TEST_F(DesktopTaskSwitchMetricRecorderTest,
 TEST_F(
     DesktopTaskSwitchMetricRecorderTest,
     ActivatePositionableWindowWhenADifferentPositionableWindowWasActivatedLast) {
-  scoped_ptr<aura::Window> positionable_window_1 =
-      CreatePositionableWindow().Pass();
-  scoped_ptr<aura::Window> positionable_window_2 =
-      CreatePositionableWindow().Pass();
+  scoped_ptr<aura::Window> positionable_window_1 = CreatePositionableWindow();
+  scoped_ptr<aura::Window> positionable_window_2 = CreatePositionableWindow();
 
   ActiveTaskWindowWithUserInput(positionable_window_1.get());
   ResetActionCounts();
@@ -153,8 +150,7 @@ TEST_F(
 TEST_F(
     DesktopTaskSwitchMetricRecorderTest,
     ActivatePositionableWindowWhenTheSamePositionableWindowWasActivatedLast) {
-  scoped_ptr<aura::Window> positionable_window =
-      CreatePositionableWindow().Pass();
+  scoped_ptr<aura::Window> positionable_window = CreatePositionableWindow();
 
   ActiveTaskWindowWithUserInput(positionable_window.get());
   ResetActionCounts();
@@ -168,9 +164,8 @@ TEST_F(
 TEST_F(DesktopTaskSwitchMetricRecorderTest,
        ActivatePositionableWindowWhenANonPositionableWindowWasActivatedLast) {
   scoped_ptr<aura::Window> non_positionable_window =
-      CreateNonPositionableWindow().Pass();
-  scoped_ptr<aura::Window> positionable_window =
-      CreatePositionableWindow().Pass();
+      CreateNonPositionableWindow();
+  scoped_ptr<aura::Window> positionable_window = CreatePositionableWindow();
 
   ActiveTaskWindowWithUserInput(non_positionable_window.get());
   ResetActionCounts();
@@ -183,10 +178,9 @@ TEST_F(DesktopTaskSwitchMetricRecorderTest,
 // activated between two activations of the same positionable window.
 TEST_F(DesktopTaskSwitchMetricRecorderTest,
        ActivateNonPositionableWindowBetweenTwoPositionableWindowActivations) {
-  scoped_ptr<aura::Window> positionable_window =
-      CreatePositionableWindow().Pass();
+  scoped_ptr<aura::Window> positionable_window = CreatePositionableWindow();
   scoped_ptr<aura::Window> non_positionable_window =
-      CreateNonPositionableWindow().Pass();
+      CreateNonPositionableWindow();
 
   ActiveTaskWindowWithUserInput(positionable_window.get());
   ResetActionCounts();
@@ -200,8 +194,7 @@ TEST_F(DesktopTaskSwitchMetricRecorderTest,
 
 // Verify user action is not recorded when a null window is activated.
 TEST_F(DesktopTaskSwitchMetricRecorderTest, ActivateNullWindow) {
-  scoped_ptr<aura::Window> positionable_window =
-      CreatePositionableWindow().Pass();
+  scoped_ptr<aura::Window> positionable_window = CreatePositionableWindow();
   scoped_ptr<aura::Window> null_window = nullptr;
 
   ActiveTaskWindowWithUserInput(positionable_window.get());
@@ -214,10 +207,9 @@ TEST_F(DesktopTaskSwitchMetricRecorderTest, ActivateNullWindow) {
 // Verify user action is not recorded when a non-positionable window is
 // activated.
 TEST_F(DesktopTaskSwitchMetricRecorderTest, ActivateNonPositionableWindow) {
-  scoped_ptr<aura::Window> positionable_window =
-      CreatePositionableWindow().Pass();
+  scoped_ptr<aura::Window> positionable_window = CreatePositionableWindow();
   scoped_ptr<aura::Window> non_positionable_window =
-      CreateNonPositionableWindow().Pass();
+      CreateNonPositionableWindow();
 
   ActiveTaskWindowWithUserInput(positionable_window.get());
   ResetActionCounts();
@@ -230,10 +222,8 @@ TEST_F(DesktopTaskSwitchMetricRecorderTest, ActivateNonPositionableWindow) {
 // INPUT_EVENT.
 TEST_F(DesktopTaskSwitchMetricRecorderTest,
        ActivatePositionableWindowWithNonInputEventReason) {
-  scoped_ptr<aura::Window> positionable_window_1 =
-      CreatePositionableWindow().Pass();
-  scoped_ptr<aura::Window> positionable_window_2 =
-      CreatePositionableWindow().Pass();
+  scoped_ptr<aura::Window> positionable_window_1 = CreatePositionableWindow();
+  scoped_ptr<aura::Window> positionable_window_2 = CreatePositionableWindow();
 
   ActiveTaskWindowWithUserInput(positionable_window_1.get());
   ResetActionCounts();
diff --git a/ash/rotator/screen_rotation_animator.cc b/ash/rotator/screen_rotation_animator.cc
index 8996855..c60cbe2 100644
--- a/ash/rotator/screen_rotation_animator.cc
+++ b/ash/rotator/screen_rotation_animator.cc
@@ -5,6 +5,7 @@
 #include "ash/rotator/screen_rotation_animator.h"
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "ash/display/display_info.h"
@@ -98,8 +99,7 @@ class LayerCleanupObserver : public ui::LayerAnimationObserver {
 
 LayerCleanupObserver::LayerCleanupObserver(
     scoped_ptr<ui::LayerTreeOwner> layer_tree_owner)
-    : layer_tree_owner_(layer_tree_owner.Pass()), sequence_(nullptr) {
-}
+    : layer_tree_owner_(std::move(layer_tree_owner)), sequence_(nullptr) {}
 
 LayerCleanupObserver::~LayerCleanupObserver() {
   // We must eplicitly detach from |sequence_| because we return true from
@@ -176,7 +176,7 @@ void RotateScreen(int64_t display_id,
   root_window->layer()->StackAtTop(old_layer_tree->root());
 
   scoped_ptr<LayerCleanupObserver> layer_cleanup_observer(
-      new LayerCleanupObserver(old_layer_tree.Pass()));
+      new LayerCleanupObserver(std::move(old_layer_tree)));
 
   Shell::GetInstance()->display_manager()->SetDisplayRotation(
       display_id, new_rotation, source);
diff --git a/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc b/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc
index ba2f3b1..0101618 100644
--- a/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc
+++ b/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "ash/shelf/shelf_button_pressed_metric_tracker.h"
 
+#include <utility>
+
 #include "ash/shelf/shelf.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shelf_button_pressed_metric_tracker_test_api.h"
@@ -118,7 +120,7 @@ void ShelfButtonPressedMetricTrackerTest::SetUp() {
 
   scoped_ptr<base::TickClock> test_tick_clock(new base::SimpleTestTickClock());
   tick_clock_ = static_cast<base::SimpleTestTickClock*>(test_tick_clock.get());
-  test_api.SetTickClock(test_tick_clock.Pass());
+  test_api.SetTickClock(std::move(test_tick_clock));
 
   // Ensure the TickClock->NowTicks() doesn't return base::TimeTicks because
   // ShelfButtonPressedMetricTracker interprets that value as unset.
diff --git a/ash/shelf/shelf_unittest.cc b/ash/shelf/shelf_unittest.cc
index 87d6b1a..ef8be34 100644
--- a/ash/shelf/shelf_unittest.cc
+++ b/ash/shelf/shelf_unittest.cc
@@ -3,6 +3,9 @@
 // found in the LICENSE file.
 
 #include "ash/shelf/shelf.h"
+
+#include <utility>
+
 #include "ash/shelf/shelf_button.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_model.h"
@@ -120,7 +123,7 @@ TEST_F(ShelfTest, checkHoverAfterMenu) {
   scoped_ptr<ShelfItemDelegate> delegate(
       new test::TestShelfItemDelegate(NULL));
   item_manager()->SetShelfItemDelegate(shelf_model()->items()[index].id,
-                                       delegate.Pass());
+                                       std::move(delegate));
 
   ASSERT_EQ(++button_count, test_api()->GetButtonCount());
   ShelfButton* button = test_api()->GetButton(index);
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index 203048e..efd75ad 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -333,7 +333,7 @@ class ShelfViewTest : public AshTestBase {
  protected:
   void CreateAndSetShelfItemDelegateForID(ShelfID id) {
     scoped_ptr<ShelfItemDelegate> delegate(new TestShelfItemDelegate(NULL));
-    item_manager_->SetShelfItemDelegate(id, delegate.Pass());
+    item_manager_->SetShelfItemDelegate(id, std::move(delegate));
   }
 
   ShelfID AddBrowserShortcut() {
@@ -1241,8 +1241,7 @@ TEST_F(ShelfViewTest, ClickingTwiceActivatesOnce) {
   ShelfID browser_shelf_id = model_->items()[browser_index_].id;
   ShelfItemSelectionTracker* selection_tracker = new ShelfItemSelectionTracker;
   item_manager_->SetShelfItemDelegate(
-      browser_shelf_id,
-      scoped_ptr<ShelfItemDelegate>(selection_tracker).Pass());
+      browser_shelf_id, scoped_ptr<ShelfItemDelegate>(selection_tracker));
 
   // A single click selects the item.
   SimulateClick(browser_index_);
@@ -1267,8 +1266,7 @@ TEST_F(ShelfViewTest, ClickAndMoveSlightly) {
   // the shelf item gets selected.
   ShelfItemSelectionTracker* selection_tracker = new ShelfItemSelectionTracker;
   item_manager_->SetShelfItemDelegate(
-      shelf_id,
-      scoped_ptr<ShelfItemDelegate>(selection_tracker).Pass());
+      shelf_id, scoped_ptr<ShelfItemDelegate>(selection_tracker));
 
   gfx::Vector2d press_offset(5, 30);
   gfx::Point press_location = gfx::Point() + press_offset;
@@ -1874,8 +1872,7 @@ TEST_F(ShelfViewTest,
   ShelfID browser_shelf_id = model_->items()[browser_index_].id;
   ShelfItemSelectionTracker* selection_tracker = new ShelfItemSelectionTracker;
   item_manager_->SetShelfItemDelegate(
-      browser_shelf_id,
-      scoped_ptr<ShelfItemDelegate>(selection_tracker).Pass());
+      browser_shelf_id, scoped_ptr<ShelfItemDelegate>(selection_tracker));
 
   SimulateClick(browser_index_);
   EXPECT_EQ(1,
@@ -1892,8 +1889,7 @@ TEST_F(ShelfViewTest, Launcher_TaskUserActionsRecordedWhenItemSelected) {
   selection_tracker->set_item_selected_action(
       ShelfItemDelegate::kNewWindowCreated);
   item_manager_->SetShelfItemDelegate(
-      browser_shelf_id,
-      scoped_ptr<ShelfItemDelegate>(selection_tracker).Pass());
+      browser_shelf_id, scoped_ptr<ShelfItemDelegate>(selection_tracker));
 
   SimulateClick(browser_index_);
   EXPECT_EQ(1, user_action_tester.GetActionCount("Launcher_LaunchTask"));
@@ -1908,8 +1904,7 @@ TEST_F(ShelfViewTest,
   ShelfID browser_shelf_id = model_->items()[browser_index_].id;
   ShelfItemSelectionTracker* selection_tracker = new ShelfItemSelectionTracker;
   item_manager_->SetShelfItemDelegate(
-      browser_shelf_id,
-      scoped_ptr<ShelfItemDelegate>(selection_tracker).Pass());
+      browser_shelf_id, scoped_ptr<ShelfItemDelegate>(selection_tracker));
 
   selection_tracker->set_item_selected_action(
       ShelfItemDelegate::kExistingWindowMinimized);
diff --git a/ash/shelf/shelf_window_watcher.cc b/ash/shelf/shelf_window_watcher.cc
index 4bdb024..4146b50 100644
--- a/ash/shelf/shelf_window_watcher.cc
+++ b/ash/shelf/shelf_window_watcher.cc
@@ -4,6 +4,8 @@
 
 #include "ash/shelf/shelf_window_watcher.h"
 
+#include <utility>
+
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
@@ -136,7 +138,7 @@ void ShelfWindowWatcher::AddShelfItem(aura::Window* window) {
   scoped_ptr<ShelfItemDelegate> item_delegate(
       new ShelfWindowWatcherItemDelegate(window, model_));
   // |item_delegate| is owned by |item_delegate_manager_|.
-  item_delegate_manager_->SetShelfItemDelegate(id, item_delegate.Pass());
+  item_delegate_manager_->SetShelfItemDelegate(id, std::move(item_delegate));
   model_->Add(item);
 }
 
diff --git a/ash/shell.cc b/ash/shell.cc
index 6ef7842..e54163d 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <string>
+#include <utility>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_delegate.h"
@@ -588,7 +589,7 @@ ShelfDelegate* Shell::GetShelfDelegate() {
     ShelfID app_list_id = shelf_model_->items()[app_list_index].id;
     DCHECK(app_list_id);
     shelf_item_delegate_manager_->SetShelfItemDelegate(app_list_id,
-                                                       controller.Pass());
+                                                       std::move(controller));
     shelf_window_watcher_.reset(new ShelfWindowWatcher(
         shelf_model_.get(), shelf_item_delegate_manager_.get()));
   }
@@ -935,7 +936,7 @@ void Shell::Init(const ShellInitParams& init_params) {
   AddShellObserver(overlay_filter_.get());
 
   accelerator_filter_.reset(new ::wm::AcceleratorFilter(
-      scoped_ptr< ::wm::AcceleratorDelegate>(new AcceleratorDelegate).Pass(),
+      scoped_ptr<::wm::AcceleratorDelegate>(new AcceleratorDelegate),
       accelerator_controller_->accelerator_history()));
   AddPreTargetHandler(accelerator_filter_.get());
 
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index b4581d8..a85e4d1 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "ash/session/session_state_delegate.h"
@@ -218,7 +219,7 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
       std::string id = base::IntToString(i);
       scoped_ptr<WindowTypeShelfItem> shelf_item(
           new WindowTypeShelfItem(id, type));
-      model_->AddItem(shelf_item.Pass());
+      model_->AddItem(std::move(shelf_item));
     }
   }
 
diff --git a/ash/shell/content/client/shell_content_browser_client.cc b/ash/shell/content/client/shell_content_browser_client.cc
index 287b596..1329a65 100644
--- a/ash/shell/content/client/shell_content_browser_client.cc
+++ b/ash/shell/content/client/shell_content_browser_client.cc
@@ -4,6 +4,8 @@
 
 #include "ash/shell/content/client/shell_content_browser_client.h"
 
+#include <utility>
+
 #include "ash/shell/content/client/shell_browser_main_parts.h"
 #include "base/command_line.h"
 #include "content/shell/browser/shell_browser_context.h"
@@ -30,7 +32,7 @@ net::URLRequestContextGetter* ShellContentBrowserClient::CreateRequestContext(
   content::ShellBrowserContext* shell_context =
       static_cast<content::ShellBrowserContext*>(content_browser_context);
   return shell_context->CreateRequestContext(protocol_handlers,
-                                             request_interceptors.Pass());
+                                             std::move(request_interceptors));
 }
 
 content::ShellBrowserContext* ShellContentBrowserClient::browser_context() {
diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc
index c681be8..4805891 100644
--- a/ash/shell/window_type_launcher.cc
+++ b/ash/shell/window_type_launcher.cc
@@ -4,6 +4,8 @@
 
 #include "ash/shell/window_type_launcher.h"
 
+#include <utility>
+
 #include "ash/content/shell_content_state.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_state_delegate.h"
@@ -320,9 +322,12 @@ void WindowTypeLauncher::ButtonPressed(views::Button* sender,
                                    "test-id"),
         message_center::RichNotificationData(), NULL /* delegate */));
 
-    ash::Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget()
-        ->web_notification_tray()->message_center()
-        ->AddNotification(notification.Pass());
+    ash::Shell::GetPrimaryRootWindowController()
+        ->shelf()
+        ->status_area_widget()
+        ->web_notification_tray()
+        ->message_center()
+        ->AddNotification(std::move(notification));
   } else if (sender == examples_button_) {
     views::examples::ShowExamplesWindowWithContent(
         views::examples::DO_NOTHING_ON_CLOSE,
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc
index bd5d148..e8163b2 100644
--- a/ash/shell/window_watcher.cc
+++ b/ash/shell/window_watcher.cc
@@ -4,6 +4,8 @@
 
 #include "ash/shell/window_watcher.h"
 
+#include <utility>
+
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
@@ -118,7 +120,7 @@ void WindowWatcher::OnWindowAdded(aura::Window* new_window) {
       Shell::GetInstance()->shelf_item_delegate_manager();
   scoped_ptr<ShelfItemDelegate> delegate(
       new WindowWatcherShelfItemDelegate(id, this));
-  manager->SetShelfItemDelegate(id, delegate.Pass());
+  manager->SetShelfItemDelegate(id, std::move(delegate));
   SetShelfIDForWindow(id, new_window);
 }
 
diff --git a/ash/system/audio/tray_audio.cc b/ash/system/audio/tray_audio.cc
index 41340bd..332dd44 100644
--- a/ash/system/audio/tray_audio.cc
+++ b/ash/system/audio/tray_audio.cc
@@ -5,6 +5,7 @@
 #include "ash/system/audio/tray_audio.h"
 
 #include <cmath>
+#include <utility>
 
 #include "ash/ash_constants.h"
 #include "ash/display/display_manager.h"
@@ -43,7 +44,7 @@ namespace ash {
 TrayAudio::TrayAudio(SystemTray* system_tray,
                      scoped_ptr<system::TrayAudioDelegate> audio_delegate)
     : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_VOLUME_MUTE),
-      audio_delegate_(audio_delegate.Pass()),
+      audio_delegate_(std::move(audio_delegate)),
       volume_view_(NULL),
       pop_up_volume_view_(false) {
   Shell::GetInstance()->system_tray_notifier()->AddAudioObserver(this);
diff --git a/ash/system/locale/locale_notification_controller.cc b/ash/system/locale/locale_notification_controller.cc
index 76df066..575002d 100644
--- a/ash/system/locale/locale_notification_controller.cc
+++ b/ash/system/locale/locale_notification_controller.cc
@@ -4,6 +4,8 @@
 
 #include "ash/system/locale/locale_notification_controller.h"
 
+#include <utility>
+
 #include "ash/shell.h"
 #include "ash/system/system_notifier.h"
 #include "ash/system/tray/system_tray_notifier.h"
@@ -109,7 +111,8 @@ void LocaleNotificationController::OnLocaleChanged(
       message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
                                  system_notifier::kNotifierLocale),
       optional, new LocaleNotificationDelegate(delegate)));
-  message_center::MessageCenter::Get()->AddNotification(notification.Pass());
+  message_center::MessageCenter::Get()->AddNotification(
+      std::move(notification));
 }
 
 }  // namespace ash
diff --git a/ash/system/tray/default_system_tray_delegate.cc b/ash/system/tray/default_system_tray_delegate.cc
index ea16339..649a9f3 100644
--- a/ash/system/tray/default_system_tray_delegate.cc
+++ b/ash/system/tray/default_system_tray_delegate.cc
@@ -5,6 +5,7 @@
 #include "ash/system/tray/default_system_tray_delegate.h"
 
 #include <string>
+#include <utility>
 
 #include "ash/networking_config_delegate.h"
 #include "ash/session/session_state_delegate.h"
@@ -82,7 +83,7 @@ VolumeControlDelegate* DefaultSystemTrayDelegate::GetVolumeControlDelegate()
 
 void DefaultSystemTrayDelegate::SetVolumeControlDelegate(
     scoped_ptr<VolumeControlDelegate> delegate) {
-  volume_control_delegate_ = delegate.Pass();
+  volume_control_delegate_ = std::move(delegate);
 }
 
 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() {
diff --git a/ash/system/user/user_view.cc b/ash/system/user/user_view.cc
index 4d1b538..2a69325 100644
--- a/ash/system/user/user_view.cc
+++ b/ash/system/user/user_view.cc
@@ -5,6 +5,7 @@
 #include "ash/system/user/user_view.h"
 
 #include <algorithm>
+#include <utility>
 
 #include "ash/multi_profile_uma.h"
 #include "ash/popup_message.h"
@@ -351,7 +352,7 @@ void UserView::AddLogoutButton(user::LoginStatus login) {
                        views::Button::STATE_PRESSED,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesHovered));
-    logout_button_->SetBorder(border.Pass());
+    logout_button_->SetBorder(std::move(border));
   }
   AddChildView(logout_button_);
 }
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
index ad4358d..9884e4b 100644
--- a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
+++ b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ash/system/web_notification/ash_popup_alignment_delegate.h"
 
+#include <utility>
 #include <vector>
 
 #include "ash/display/display_manager.h"
@@ -69,7 +70,7 @@ class AshPopupAlignmentDelegateTest : public test::AshTestBase {
       alignment_delegate_.reset();
       return;
     }
-    alignment_delegate_ = delegate.Pass();
+    alignment_delegate_ = std::move(delegate);
     UpdateWorkArea(alignment_delegate_.get(),
                    Shell::GetScreen()->GetPrimaryDisplay());
   }
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc
index 79269a4..946e3ce 100644
--- a/ash/system/web_notification/web_notification_tray_unittest.cc
+++ b/ash/system/web_notification/web_notification_tray_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ash/system/web_notification/web_notification_tray.h"
 
+#include <utility>
 #include <vector>
 
 #include "ash/display/display_manager.h"
@@ -107,7 +108,7 @@ class WebNotificationTrayTest : public test::AshTestBase {
         base::ASCIIToUTF16("www.test.org"), GURL(),
         message_center::NotifierId(), message_center::RichNotificationData(),
         NULL /* delegate */));
-    GetMessageCenter()->AddNotification(notification.Pass());
+    GetMessageCenter()->AddNotification(std::move(notification));
   }
 
   void UpdateNotification(const std::string& old_id,
@@ -120,7 +121,7 @@ class WebNotificationTrayTest : public test::AshTestBase {
         base::ASCIIToUTF16("www.test.org"), GURL(),
         message_center::NotifierId(), message_center::RichNotificationData(),
         NULL /* delegate */));
-    GetMessageCenter()->UpdateNotification(old_id, notification.Pass());
+    GetMessageCenter()->UpdateNotification(old_id, std::move(notification));
   }
 
   void RemoveNotification(const std::string& id) {
diff --git a/ash/test/test_shelf_delegate.cc b/ash/test/test_shelf_delegate.cc
index 114d736..232c46c 100644
--- a/ash/test/test_shelf_delegate.cc
+++ b/ash/test/test_shelf_delegate.cc
@@ -4,6 +4,8 @@
 
 #include "ash/test/test_shelf_delegate.h"
 
+#include <utility>
+
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_util.h"
@@ -54,7 +56,7 @@ void TestShelfDelegate::AddShelfItem(aura::Window* window,
       Shell::GetInstance()->shelf_item_delegate_manager();
   // |manager| owns TestShelfItemDelegate.
   scoped_ptr<ShelfItemDelegate> delegate(new TestShelfItemDelegate(window));
-  manager->SetShelfItemDelegate(id, delegate.Pass());
+  manager->SetShelfItemDelegate(id, std::move(delegate));
   SetShelfIDForWindow(id, window);
 }
 
diff --git a/ash/touch/touch_hud_debug.cc b/ash/touch/touch_hud_debug.cc
index bac5c7d..5c85f5f 100644
--- a/ash/touch/touch_hud_debug.cc
+++ b/ash/touch/touch_hud_debug.cc
@@ -114,7 +114,7 @@ struct TouchPointLog {
     value->SetInteger("tracking_id", tracking_id);
     value->SetInteger("source_device", source_device);
 
-    return value.Pass();
+    return value;
   }
 
   int id;
@@ -157,7 +157,7 @@ class TouchTrace {
     scoped_ptr<base::ListValue> list(new base::ListValue());
     for (const_iterator i = log_.begin(); i != log_.end(); ++i)
       list->Append((*i).GetAsDictionary().release());
-    return list.Pass();
+    return list;
   }
 
   void Reset() {
@@ -194,7 +194,7 @@ class TouchLog {
       if (!traces_[i].log().empty())
         list->Append(traces_[i].GetAsList().release());
     }
-    return list.Pass();
+    return list;
   }
 
   int GetTraceIndex(int touch_id) const {
@@ -370,7 +370,7 @@ scoped_ptr<base::DictionaryValue> TouchHudDebug::GetAllAsDictionary() {
         value->Set(base::Int64ToString(hud->display_id()), list.release());
     }
   }
-  return value.Pass();
+  return value;
 }
 
 void TouchHudDebug::ChangeToNextMode() {
diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc
index aa075c5..a0f0d84 100644
--- a/ash/wm/lock_state_controller.cc
+++ b/ash/wm/lock_state_controller.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <string>
+#include <utility>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/ash_switches.h"
@@ -98,7 +99,7 @@ LockStateController::~LockStateController() {
 
 void LockStateController::SetDelegate(
     scoped_ptr<LockStateControllerDelegate> delegate) {
-  delegate_ = delegate.Pass();
+  delegate_ = std::move(delegate);
 }
 
 void LockStateController::AddObserver(LockStateObserver* observer) {
diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc
index a9a1387..0f784b3 100644
--- a/ash/wm/lock_state_controller_unittest.cc
+++ b/ash/wm/lock_state_controller_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "ash/wm/lock_state_controller.h"
 
+#include <utility>
+
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ -58,7 +60,8 @@ class LockStateControllerTest : public AshTestBase {
     test_animator_ = new TestSessionStateAnimator;
 
     lock_state_controller_ = Shell::GetInstance()->lock_state_controller();
-    lock_state_controller_->SetDelegate(lock_state_controller_delegate.Pass());
+    lock_state_controller_->SetDelegate(
+        std::move(lock_state_controller_delegate));
     lock_state_controller_->set_animator_for_test(test_animator_);
 
     test_api_.reset(new LockStateController::TestApi(lock_state_controller_));
diff --git a/ash/wm/lock_window_state.cc b/ash/wm/lock_window_state.cc
index 6230dd1..7e5b4ec 100644
--- a/ash/wm/lock_window_state.cc
+++ b/ash/wm/lock_window_state.cc
@@ -4,6 +4,8 @@
 
 #include "ash/wm/lock_window_state.h"
 
+#include <utility>
+
 #include "ash/display/display_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
@@ -112,7 +114,7 @@ void LockWindowState::DetachState(wm::WindowState* window_state) {
 wm::WindowState* LockWindowState::SetLockWindowState(aura::Window* window) {
   scoped_ptr<wm::WindowState::State> lock_state(new LockWindowState(window));
   scoped_ptr<wm::WindowState::State> old_state(
-      wm::GetWindowState(window)->SetStateObject(lock_state.Pass()));
+      wm::GetWindowState(window)->SetStateObject(std::move(lock_state)));
   return wm::GetWindowState(window);
 }
 
diff --git a/ash/wm/maximize_mode/maximize_mode_controller.cc b/ash/wm/maximize_mode/maximize_mode_controller.cc
index c732863..146a378 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller.cc
+++ b/ash/wm/maximize_mode/maximize_mode_controller.cc
@@ -4,6 +4,8 @@
 
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 
+#include <utility>
+
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
@@ -406,7 +408,7 @@ bool MaximizeModeController::WasLidOpenedRecently() const {
 void MaximizeModeController::SetTickClockForTest(
     scoped_ptr<base::TickClock> tick_clock) {
   DCHECK(tick_clock_);
-  tick_clock_ = tick_clock.Pass();
+  tick_clock_ = std::move(tick_clock);
 }
 
 }  // namespace ash
diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.cc b/ash/wm/maximize_mode/maximize_mode_window_state.cc
index e8da85a..3691dcaa 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_state.cc
+++ b/ash/wm/maximize_mode/maximize_mode_window_state.cc
@@ -4,6 +4,8 @@
 
 #include "ash/wm/maximize_mode/maximize_mode_window_state.h"
 
+#include <utility>
+
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ -95,9 +97,9 @@ MaximizeModeWindowState::MaximizeModeWindowState(
       creator_(creator),
       current_state_type_(wm::GetWindowState(window)->GetStateType()),
       defer_bounds_updates_(false) {
-  old_state_.reset(
-      wm::GetWindowState(window)->SetStateObject(
-          scoped_ptr<State>(this).Pass()).release());
+  old_state_.reset(wm::GetWindowState(window)
+                       ->SetStateObject(scoped_ptr<State>(this))
+                       .release());
 }
 
 MaximizeModeWindowState::~MaximizeModeWindowState() {
@@ -107,7 +109,7 @@ MaximizeModeWindowState::~MaximizeModeWindowState() {
 void MaximizeModeWindowState::LeaveMaximizeMode(wm::WindowState* window_state) {
   // Note: When we return we will destroy ourselves with the |our_reference|.
   scoped_ptr<wm::WindowState::State> our_reference =
-      window_state->SetStateObject(old_state_.Pass());
+      window_state->SetStateObject(std::move(old_state_));
 }
 
 void MaximizeModeWindowState::SetDeferBoundsUpdates(bool defer_bounds_updates) {
diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
index 2f7fde2..3c7e09e 100644
--- a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
+++ b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
@@ -4,9 +4,10 @@
 
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"
 
-#include <set>
-#include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
+#include <X11/extensions/XInput2.h>
+#include <set>
+#include <utility>
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screen_util.h"
@@ -112,7 +113,7 @@ ScopedDisableInternalMouseAndKeyboardX11::
   excepted_keys->insert(ui::VKEY_VOLUME_DOWN);
   excepted_keys->insert(ui::VKEY_VOLUME_UP);
   excepted_keys->insert(ui::VKEY_POWER);
-  device_data_manager->SetDisabledKeyboardAllowedKeys(excepted_keys.Pass());
+  device_data_manager->SetDisabledKeyboardAllowedKeys(std::move(excepted_keys));
   ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this);
 }
 
diff --git a/ash/wm/overview/window_grid.cc b/ash/wm/overview/window_grid.cc
index 713c7cb..ec3b362 100644
--- a/ash/wm/overview/window_grid.cc
+++ b/ash/wm/overview/window_grid.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <functional>
 #include <set>
+#include <utility>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ -57,8 +58,7 @@ class CleanupWidgetAfterAnimationObserver
 
 CleanupWidgetAfterAnimationObserver::CleanupWidgetAfterAnimationObserver(
     scoped_ptr<views::Widget> widget)
-    : widget_(widget.Pass()) {
-}
+    : widget_(std::move(widget)) {}
 
 CleanupWidgetAfterAnimationObserver::~CleanupWidgetAfterAnimationObserver() {
 }
@@ -477,7 +477,7 @@ void WindowGrid::MoveSelectionWidget(WindowSelector::Direction direction,
     // CleanupWidgetAfterAnimationObserver will delete itself (and the
     // widget) when the movement animation is complete.
     animation_settings.AddObserver(
-        new CleanupWidgetAfterAnimationObserver(selection_widget_.Pass()));
+        new CleanupWidgetAfterAnimationObserver(std::move(selection_widget_)));
     old_selection->SetOpacity(0);
     old_selection->GetNativeWindow()->SetBounds(
         old_selection->GetNativeWindow()->bounds() + fade_out_direction);
diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc
index 1699ceb..50d82da 100644
--- a/ash/wm/overview/window_selector.cc
+++ b/ash/wm/overview/window_selector.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <functional>
 #include <set>
+#include <utility>
 #include <vector>
 
 #include "ash/accessibility_delegate.h"
@@ -287,7 +288,7 @@ void WindowSelector::Init(const WindowList& windows) {
     if (grid->empty())
       continue;
     num_items_ += grid->size();
-    grid_list_.push_back(grid.Pass());
+    grid_list_.push_back(std::move(grid));
   }
 
   {
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
index cddcf65..54cbb9d 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -124,7 +124,7 @@ class WindowSelectorTest : public test::AshTestBase {
     widget->Init(params);
     widget->Show();
     ParentWindowInPrimaryRootWindow(widget->GetNativeWindow());
-    return widget.Pass();
+    return widget;
   }
 
   aura::Window* CreatePanelWindow(const gfx::Rect& bounds) {
diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc
index 412a8d1..9694cc2 100644
--- a/ash/wm/panels/panel_layout_manager.cc
+++ b/ash/wm/panels/panel_layout_manager.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <map>
+#include <utility>
 
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
@@ -544,7 +545,7 @@ void PanelLayoutManager::WillChangeVisibilityState(
   if (!shelf_hidden) {
     if (restore_windows_on_shelf_visible_) {
       scoped_ptr<aura::WindowTracker> restore_windows(
-          restore_windows_on_shelf_visible_.Pass());
+          std::move(restore_windows_on_shelf_visible_));
       for (aura::Window::Windows::const_iterator iter =
                restore_windows->windows().begin();
            iter != restore_windows->windows().end(); ++iter) {
@@ -568,7 +569,7 @@ void PanelLayoutManager::WillChangeVisibilityState(
       wm::GetWindowState(window)->Minimize();
     }
   }
-  restore_windows_on_shelf_visible_ = minimized_windows.Pass();
+  restore_windows_on_shelf_visible_ = std::move(minimized_windows);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index 93af37a..fc14224 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -5,8 +5,8 @@
 #include "ash/wm/window_animations.h"
 
 #include <math.h>
-
 #include <algorithm>
+#include <utility>
 #include <vector>
 
 #include "ash/screen_util.h"
@@ -271,8 +271,7 @@ class CrossFadeObserver : public ui::CompositorObserver,
   // Takes ownership of |layer| and its child layers.
   CrossFadeObserver(aura::Window* window,
                     scoped_ptr<ui::LayerTreeOwner> layer_owner)
-      : window_(window),
-        layer_owner_(layer_owner.Pass()) {
+      : window_(window), layer_owner_(std::move(layer_owner)) {
     window_->AddObserver(this);
     layer_owner_->root()->GetCompositor()->AddObserver(this);
   }
@@ -342,7 +341,8 @@ base::TimeDelta CrossFadeAnimation(
     ui::ScopedLayerAnimationSettings settings(old_layer->GetAnimator());
 
     // Animation observer owns the old layer and deletes itself.
-    settings.AddObserver(new CrossFadeObserver(window, old_layer_owner.Pass()));
+    settings.AddObserver(
+        new CrossFadeObserver(window, std::move(old_layer_owner)));
     settings.SetTransitionDuration(duration);
     settings.SetTweenType(tween_type);
     gfx::Transform out_transform;
diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc
index b314c95..21a69d9 100644
--- a/ash/wm/window_state.cc
+++ b/ash/wm/window_state.cc
@@ -4,6 +4,8 @@
 
 #include "ash/wm/window_state.h"
 
+#include <utility>
+
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
@@ -95,7 +97,7 @@ bool WindowState::HasDelegate() const {
 
 void WindowState::SetDelegate(scoped_ptr<WindowStateDelegate> delegate) {
   DCHECK(!delegate_.get());
-  delegate_ = delegate.Pass();
+  delegate_ = std::move(delegate);
 }
 
 WindowStateType WindowState::GetStateType() const {
@@ -284,10 +286,10 @@ void WindowState::ClearRestoreBounds() {
 scoped_ptr<WindowState::State> WindowState::SetStateObject(
     scoped_ptr<WindowState::State> new_state) {
   current_state_->DetachState(this);
-  scoped_ptr<WindowState::State> old_object = current_state_.Pass();
-  current_state_ = new_state.Pass();
+  scoped_ptr<WindowState::State> old_object = std::move(current_state_);
+  current_state_ = std::move(new_state);
   current_state_->AttachState(this, old_object.get());
-  return old_object.Pass();
+  return old_object;
 }
 
 void WindowState::SetPreAutoManageWindowBounds(
@@ -477,7 +479,7 @@ void WindowState::SetBoundsDirectCrossFade(const gfx::Rect& new_bounds) {
   else
     old_layer->parent()->StackAbove(new_layer, old_layer);
 
-  CrossFadeAnimation(window_, old_layer_owner.Pass(), gfx::Tween::EASE_OUT);
+  CrossFadeAnimation(window_, std::move(old_layer_owner), gfx::Tween::EASE_OUT);
 }
 
 WindowState* GetActiveWindowState() {
diff --git a/ash/wm/window_state_unittest.cc b/ash/wm/window_state_unittest.cc
index ecfbc6a..4c95ce7 100644
--- a/ash/wm/window_state_unittest.cc
+++ b/ash/wm/window_state_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "ash/wm/window_state.h"
 
+#include <utility>
+
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ -306,11 +308,11 @@ TEST_F(WindowStateTest, StateSwapRestore) {
   scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
   WindowState* window_state = GetWindowState(window.get());
   EXPECT_FALSE(window_state->IsMaximized());
-  scoped_ptr<WindowState::State> old(window_state->SetStateObject(
-      scoped_ptr<WindowState::State> (new AlwaysMaximizeTestState(
-          window_state->GetStateType()))).Pass());
+  scoped_ptr<WindowState::State> old(
+      window_state->SetStateObject(scoped_ptr<WindowState::State>(
+          new AlwaysMaximizeTestState(window_state->GetStateType()))));
   EXPECT_TRUE(window_state->IsMaximized());
-  window_state->SetStateObject(old.Pass());
+  window_state->SetStateObject(std::move(old));
   EXPECT_FALSE(window_state->IsMaximized());
 }
 
diff --git a/ash/wm/workspace/phantom_window_controller.cc b/ash/wm/workspace/phantom_window_controller.cc
index ee2d458..d7af625 100644
--- a/ash/wm/workspace/phantom_window_controller.cc
+++ b/ash/wm/workspace/phantom_window_controller.cc
@@ -143,7 +143,7 @@ scoped_ptr<views::Widget> PhantomWindowController::CreatePhantomWidget(
       base::TimeDelta::FromMilliseconds(kAnimationDurationMs));
   widget_layer->SetOpacity(1);
 
-  return phantom_widget.Pass();
+  return phantom_widget;
 }
 
 }  // namespace ash
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc
index 9d26de5..1ac8b69 100644
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -5,6 +5,7 @@
 #include "ash/wm/workspace/workspace_layout_manager.h"
 
 #include <string>
+#include <utility>
 
 #include "ash/display/display_layout.h"
 #include "ash/display/display_manager.h"
@@ -834,7 +835,7 @@ class WorkspaceLayoutManagerBackdropTest : public test::AshTestBase {
       backdrop.reset(new ash::WorkspaceBackdropDelegate(default_container_));
     }
     (static_cast<WorkspaceLayoutManager*>(default_container_->layout_manager()))
-        ->SetMaximizeBackdropDelegate(backdrop.Pass());
+        ->SetMaximizeBackdropDelegate(std::move(backdrop));
     // Closing and / or opening can be a delayed operation.
     base::MessageLoop::current()->RunUntilIdle();
   }
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index d186b0d..bea54a9 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -4,6 +4,8 @@
 
 #include "ash/wm/workspace_controller.h"
 
+#include <utility>
+
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
@@ -133,7 +135,7 @@ void WorkspaceController::DoInitialAnimation() {
 
 void WorkspaceController::SetMaximizeBackdropDelegate(
     scoped_ptr<WorkspaceLayoutManagerDelegate> delegate) {
-  layout_manager_->SetMaximizeBackdropDelegate(delegate.Pass());
+  layout_manager_->SetMaximizeBackdropDelegate(std::move(delegate));
 }
 
 }  // namespace ash