Convert Pass()→std::move() in //content/browser

content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc

 // Copyright 2014 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 "content/browser/web_contents/aura/overscroll_navigation_overlay.h"
 
 #include <string.h>
-
+#include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/common/frame_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/overscroll_configuration.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/test/mock_render_process_host.h"
@@ skipping 16 matching lines @@
 class OverscrollTestWebContents : public TestWebContents {
  public:
   ~OverscrollTestWebContents() override {}
 
   static OverscrollTestWebContents* Create(
       BrowserContext* browser_context,
       SiteInstance* instance,
       scoped_ptr<aura::Window> fake_native_view,
       scoped_ptr<aura::Window> fake_contents_window) {
     OverscrollTestWebContents* web_contents = new OverscrollTestWebContents(
-        browser_context, fake_native_view.Pass(), fake_contents_window.Pass());
+        browser_context, std::move(fake_native_view),
+        std::move(fake_contents_window));
     web_contents->Init(WebContents::CreateParams(browser_context, instance));
     return web_contents;
   }
 
   void ResetNativeView() { fake_native_view_.reset(); }
 
   void ResetContentNativeView() { fake_contents_window_.reset(); }
 
   void set_is_being_destroyed(bool val) { is_being_destroyed_ = val; }
 
   gfx::NativeView GetNativeView() override { return fake_native_view_.get(); }
 
   gfx::NativeView GetContentNativeView() override {
     return fake_contents_window_.get();
   }
 
   bool IsBeingDestroyed() const override { return is_being_destroyed_; }
 
  protected:
   explicit OverscrollTestWebContents(
       BrowserContext* browser_context,
       scoped_ptr<aura::Window> fake_native_view,
       scoped_ptr<aura::Window> fake_contents_window)
       : TestWebContents(browser_context),
-        fake_native_view_(fake_native_view.Pass()),
-        fake_contents_window_(fake_contents_window.Pass()),
+        fake_native_view_(std::move(fake_native_view)),
+        fake_contents_window_(std::move(fake_contents_window)),
         is_being_destroyed_(false) {}
 
  private:
   scoped_ptr<aura::Window> fake_native_view_;
   scoped_ptr<aura::Window> fake_contents_window_;
   bool is_being_destroyed_;
 };
 
 class OverscrollNavigationOverlayTest : public RenderViewHostImplTestHarness {
  public:
@@ skipping 31 matching lines @@
         GetOverlay()->CreateBackWindow(GetBackSlideWindowBounds()));
     bool window_created = window;
     // Performs BACK navigation, sets image from layer_delegate_ on
     // image_delegate_.
     GetOverlay()->OnOverscrollCompleting();
     if (window_created)
       EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::BACK);
     else
       EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::NONE);
     window->SetBounds(gfx::Rect(root_window()->bounds().size()));
-    GetOverlay()->OnOverscrollCompleted(window.Pass());
+    GetOverlay()->OnOverscrollCompleted(std::move(window));
     if (IsBrowserSideNavigationEnabled())
       main_test_rfh()->PrepareForCommit();
     else
       contents()->GetPendingMainFrame()->PrepareForCommit();
     if (window_created)
       EXPECT_TRUE(contents()->CrossProcessNavigationPending());
     else
       EXPECT_FALSE(contents()->CrossProcessNavigationPending());
   }
 
@@ skipping 25 matching lines @@
     fake_native_view->SetBounds(gfx::Rect(root_window()->bounds().size()));
 
     // Set up the fake contents window.
     scoped_ptr<aura::Window> fake_contents_window(new aura::Window(nullptr));
     fake_contents_window->Init(ui::LAYER_SOLID_COLOR);
     root_window()->AddChild(fake_contents_window.get());
     fake_contents_window->SetBounds(gfx::Rect(root_window()->bounds().size()));
 
     // Replace the default test web contents with our custom class.
     SetContents(OverscrollTestWebContents::Create(
-        browser_context(),
-        SiteInstance::Create(browser_context()),
-        fake_native_view.Pass(),
-        fake_contents_window.Pass()));
+        browser_context(), SiteInstance::Create(browser_context()),
+        std::move(fake_native_view), std::move(fake_contents_window)));
 
     contents()->NavigateAndCommit(first());
     EXPECT_TRUE(controller().GetVisibleEntry());
     EXPECT_FALSE(controller().CanGoBack());
 
     contents()->NavigateAndCommit(second());
     EXPECT_TRUE(controller().CanGoBack());
 
     contents()->NavigateAndCommit(third());
     EXPECT_TRUE(controller().CanGoBack());
@@ skipping 223 matching lines @@
   EXPECT_TRUE(GetOverlay()->window_.get());
 
   // Load the page.
   contents()->CommitPendingNavigation();
   ReceivePaintUpdate();
   EXPECT_FALSE(GetOverlay()->window_.get());
   EXPECT_EQ(contents()->GetURL(), first());
 }
 
 }  // namespace content