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

chrome/browser/predictors/resource_prefetcher_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 "chrome/browser/predictors/resource_prefetcher.h"
+
 #include <stddef.h>
+#include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
-#include "chrome/browser/predictors/resource_prefetcher.h"
 #include "chrome/browser/predictors/resource_prefetcher_manager.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::Eq;
 using testing::Property;
 
 namespace predictors {
 
 // Wrapper over the ResourcePrefetcher that stubs out the StartURLRequest call
 // since we do not want to do network fetches in this unittest.
 class TestResourcePrefetcher : public ResourcePrefetcher {
  public:
   TestResourcePrefetcher(ResourcePrefetcher::Delegate* delegate,
                          const ResourcePrefetchPredictorConfig& config,
                          const NavigationID& navigation_id,
                          PrefetchKeyType key_type,
                          scoped_ptr<RequestVector> requests)
-      : ResourcePrefetcher(delegate, config, navigation_id,
-                           key_type, requests.Pass()) { }
+      : ResourcePrefetcher(delegate,
+                           config,
+                           navigation_id,
+                           key_type,
+                           std::move(requests)) {}
 
   ~TestResourcePrefetcher() override {}
 
   MOCK_METHOD1(StartURLRequest, void(net::URLRequest* request));
 
   void ReadFullResponse(net::URLRequest* request) override {
     EXPECT_TRUE(request->load_flags() & net::LOAD_PREFETCH);
     FinishRequest(request, Request::PREFETCH_STATUS_FROM_CACHE);
   }
 
@@ skipping 136 matching lines @@
       "http://yahoo.com/resource5.png")));
 
   NavigationID navigation_id;
   navigation_id.render_process_id = 1;
   navigation_id.render_frame_id = 2;
   navigation_id.main_frame_url = GURL("http://www.google.com");
 
   // Needed later for comparison.
   ResourcePrefetcher::RequestVector* requests_ptr = requests.get();
 
-  prefetcher_.reset(new TestResourcePrefetcher(&prefetcher_delegate_,
-                                               config_,
-                                               navigation_id,
-                                               PREFETCH_KEY_TYPE_URL,
-                                               requests.Pass()));
+  prefetcher_.reset(
+      new TestResourcePrefetcher(&prefetcher_delegate_, config_, navigation_id,
+                                 PREFETCH_KEY_TYPE_URL, std::move(requests)));
 
   // Starting the prefetcher maxes out the number of possible requests.
   AddStartUrlRequestExpectation("http://www.google.com/resource1.html");
   AddStartUrlRequestExpectation("http://www.google.com/resource2.png");
   AddStartUrlRequestExpectation("http://yahoo.com/resource1.png");
   AddStartUrlRequestExpectation("http://yahoo.com/resource2.png");
   AddStartUrlRequestExpectation("http://m.google.com/resource1.jpg");
 
   prefetcher_->Start();
   CheckPrefetcherState(5, 7, 3);
@@ skipping 98 matching lines @@
       "http://m.google.com/resource1.jpg")));
 
   NavigationID navigation_id;
   navigation_id.render_process_id = 1;
   navigation_id.render_frame_id = 2;
   navigation_id.main_frame_url = GURL("http://www.google.com");
 
   // Needed later for comparison.
   ResourcePrefetcher::RequestVector* requests_ptr = requests.get();
 
-  prefetcher_.reset(new TestResourcePrefetcher(&prefetcher_delegate_,
-                                               config_,
-                                               navigation_id,
-                                               PREFETCH_KEY_TYPE_HOST,
-                                               requests.Pass()));
+  prefetcher_.reset(
+      new TestResourcePrefetcher(&prefetcher_delegate_, config_, navigation_id,
+                                 PREFETCH_KEY_TYPE_HOST, std::move(requests)));
 
   // Starting the prefetcher maxes out the number of possible requests.
   AddStartUrlRequestExpectation("http://www.google.com/resource1.html");
   AddStartUrlRequestExpectation("http://www.google.com/resource2.png");
   AddStartUrlRequestExpectation("http://yahoo.com/resource1.png");
   AddStartUrlRequestExpectation("http://yahoo.com/resource2.png");
   AddStartUrlRequestExpectation("http://m.google.com/resource1.jpg");
 
   prefetcher_->Start();
   CheckPrefetcherState(5, 1, 3);
@@ skipping 23 matching lines @@
   // We need to delete requests_ptr here, though it looks to be managed by the
   // scoped_ptr requests. The scoped_ptr requests releases itself and the raw
   // pointer requests_ptr is passed to ResourcePrefetcherFinished(). In the
   // test, ResourcePrefetcherFinished() is a mock function and does not handle
   // the raw pointer properly. In the real code, requests_ptr will eventually be
   // passed to and managed by ResourcePrefetchPredictor::Result::Result.
   delete requests_ptr;
 }
 
 }  // namespace predictors