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

chrome/browser/ui/window_sizer/window_sizer.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 "chrome/browser/ui/window_sizer/window_sizer.h"
 
+#include <utility>
+
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/prefs/pref_service.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 169 matching lines @@
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // WindowSizer, public:
 
 WindowSizer::WindowSizer(
     scoped_ptr<StateProvider> state_provider,
     scoped_ptr<TargetDisplayProvider> target_display_provider,
     const Browser* browser)
-    : state_provider_(state_provider.Pass()),
-      target_display_provider_(target_display_provider.Pass()),
+    : state_provider_(std::move(state_provider)),
+      target_display_provider_(std::move(target_display_provider)),
       // TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
       screen_(gfx::Screen::GetNativeScreen()),
-      browser_(browser) {
-}
+      browser_(browser) {}
 
 WindowSizer::WindowSizer(
     scoped_ptr<StateProvider> state_provider,
     scoped_ptr<TargetDisplayProvider> target_display_provider,
     gfx::Screen* screen,
     const Browser* browser)
-    : state_provider_(state_provider.Pass()),
-      target_display_provider_(target_display_provider.Pass()),
+    : state_provider_(std::move(state_provider)),
+      target_display_provider_(std::move(target_display_provider)),
       screen_(screen),
       browser_(browser) {
   DCHECK(screen_);
 }
 
 WindowSizer::~WindowSizer() {
 }
 
 // static
 void WindowSizer::GetBrowserWindowBoundsAndShowState(
     const std::string& app_name,
     const gfx::Rect& specified_bounds,
     const Browser* browser,
     gfx::Rect* window_bounds,
     ui::WindowShowState* show_state) {
   scoped_ptr<StateProvider> state_provider(
       new DefaultStateProvider(app_name, browser));
   scoped_ptr<TargetDisplayProvider> target_display_provider(
       new DefaultTargetDisplayProvider);
-  const WindowSizer sizer(state_provider.Pass(),
-                          target_display_provider.Pass(),
-                          browser);
+  const WindowSizer sizer(std::move(state_provider),
+                          std::move(target_display_provider), browser);
   sizer.DetermineWindowBoundsAndShowState(specified_bounds,
                                           window_bounds,
                                           show_state);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WindowSizer, private:
 
 void WindowSizer::DetermineWindowBoundsAndShowState(
     const gfx::Rect& specified_bounds,
@@ skipping 202 matching lines @@
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kStartMaximized))
     return ui::SHOW_STATE_MAXIMIZED;
 
   if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT)
     return browser_->initial_show_state();
 
   // Otherwise we use the default which can be overridden later on.
   return ui::SHOW_STATE_DEFAULT;
 }