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

chrome/browser/engagement/site_engagement_helper_unittest.cc

 // Copyright 2015 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/engagement/site_engagement_helper.h"
+
+#include <utility>
+
 #include "base/command_line.h"
 #include "base/test/histogram_tester.h"
 #include "base/timer/mock_timer.h"
 #include "base/values.h"
-#include "chrome/browser/engagement/site_engagement_helper.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/engagement/site_engagement_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "content/public/browser/page_navigator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class SiteEngagementHelperTest : public BrowserWithTestWindowTest {
  public:
   // Create a SiteEngagementHelper. Called here as friend class methods cannot
   // be called in tests.
   scoped_ptr<SiteEngagementHelper> CreateHelper(
       content::WebContents* web_contents) {
     scoped_ptr<SiteEngagementHelper> helper(
         new SiteEngagementHelper(web_contents));
     DCHECK(helper.get());
 
-    return helper.Pass();
+    return helper;
   }
 
   void TrackingStarted(SiteEngagementHelper* helper) {
     helper->input_tracker_.TrackingStarted();
     helper->media_tracker_.TrackingStarted();
   }
 
   // Simulate a user interaction event and handle it.
   void HandleUserInput(SiteEngagementHelper* helper,
                        blink::WebInputEvent::Type type) {
@@ skipping 18 matching lines @@
   }
 
   void MediaStoppedPlaying(SiteEngagementHelper* helper) {
     helper->media_tracker_.MediaStoppedPlaying(
         content::WebContentsObserver::MediaPlayerId(nullptr, 1));
   }
 
   // Set a pause timer on the input tracker for test purposes.
   void SetInputTrackerPauseTimer(SiteEngagementHelper* helper,
                                  scoped_ptr<base::Timer> timer) {
-    helper->input_tracker_.SetPauseTimerForTesting(timer.Pass());
+    helper->input_tracker_.SetPauseTimerForTesting(std::move(timer));
   }
 
   // Set a pause timer on the input tracker for test purposes.
   void SetMediaTrackerPauseTimer(SiteEngagementHelper* helper,
                                  scoped_ptr<base::Timer> timer) {
-    helper->media_tracker_.SetPauseTimerForTesting(timer.Pass());
+    helper->media_tracker_.SetPauseTimerForTesting(std::move(timer));
   }
 
   bool IsTrackingInput(SiteEngagementHelper* helper) {
     return helper->input_tracker_.is_tracking();
   }
 
   void NavigateWithDisposition(GURL& url, WindowOpenDisposition disposition) {
     content::NavigationController* controller =
         &browser()->tab_strip_model()->GetActiveWebContents()->GetController();
     browser()->OpenURL(
@@ skipping 489 matching lines @@
   // When the timer fires, callbacks are added.
   input_tracker_timer->Fire();
   EXPECT_FALSE(input_tracker_timer->IsRunning());
   EXPECT_TRUE(IsTrackingInput(helper.get()));
 
   // Navigation should start the initial delay timer again.
   NavigateWithDisposition(url1, CURRENT_TAB);
   EXPECT_TRUE(input_tracker_timer->IsRunning());
   EXPECT_FALSE(IsTrackingInput(helper.get()));
 }