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

ash/wm/window_state.cc

 // Copyright 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 "ash/wm/window_state.h"
 
+#include <utility>
+
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/default_state.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_delegate.h"
 #include "ash/wm/window_state_observer.h"
 #include "ash/wm/window_util.h"
@@ skipping 71 matching lines @@
   // properties. As a result, window_->RemoveObserver() doesn't need to (and
   // shouldn't) be called here.
 }
 
 bool WindowState::HasDelegate() const {
   return delegate_;
 }
 
 void WindowState::SetDelegate(scoped_ptr<WindowStateDelegate> delegate) {
   DCHECK(!delegate_.get());
-  delegate_ = delegate.Pass();
+  delegate_ = std::move(delegate);
 }
 
 WindowStateType WindowState::GetStateType() const {
   return current_state_->GetType();
 }
 
 bool WindowState::IsMinimized() const {
   return GetStateType() == WINDOW_STATE_TYPE_MINIMIZED ||
          GetStateType() == WINDOW_STATE_TYPE_DOCKED_MINIMIZED;
 }
@@ skipping 168 matching lines @@
       ScreenUtil::ConvertRectToScreen(window_->parent(), bounds));
 }
 
 void WindowState::ClearRestoreBounds() {
   window_->ClearProperty(aura::client::kRestoreBoundsKey);
 }
 
 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(
     const gfx::Rect& bounds) {
   pre_auto_manage_window_bounds_.reset(new gfx::Rect(bounds));
 }
 
 void WindowState::AddObserver(WindowStateObserver* observer) {
   observer_list_.AddObserver(observer);
 }
@@ skipping 169 matching lines @@
   // Resize the window to the new size, which will force a layout and paint.
   SetBoundsDirect(new_bounds);
 
   // Ensure the higher-resolution layer is on top.
   bool old_on_top = (old_bounds.width() > new_bounds.width());
   if (old_on_top)
     old_layer->parent()->StackBelow(new_layer, old_layer);
   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() {
   aura::Window* active = GetActiveWindow();
   return active ? GetWindowState(active) : NULL;
 }
 
 WindowState* GetWindowState(aura::Window* window) {
   if (!window)
     return NULL;
   WindowState* settings = window->GetProperty(kWindowStateKey);
   if(!settings) {
     settings = new WindowState(window);
     window->SetProperty(kWindowStateKey, settings);
   }
   return settings;
 }
 
 const WindowState* GetWindowState(const aura::Window* window) {
   return GetWindowState(const_cast<aura::Window*>(window));
 }
 
 }  // namespace wm
 }  // namespace ash