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

chrome/browser/chromeos/policy/upload_job_unittest.cc

 // Copyright (c) 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/chromeos/policy/upload_job.h"
 
 #include <stddef.h>
 
 #include <queue>
 #include <set>
@@ skipping 155 matching lines @@
   void OnFailure(UploadJob::ErrorCode error_code) override {
     if (expected_error_ && *expected_error_.get() == error_code)
       run_loop_.Quit();
     else
       FAIL();
   }
 
   const GURL GetServerURL() const { return test_server_.GetURL(kUploadPath); }
 
   void SetExpectedError(scoped_ptr<UploadJob::ErrorCode> expected_error) {
-    expected_error_ = expected_error.Pass();
+    expected_error_ = std::move(expected_error);
   }
 
   // testing::Test:
   void SetUp() override {
     request_context_getter_ = new net::TestURLRequestContextGetter(
         base::ThreadTaskRunnerHandle::Get());
     oauth2_service_.AddAccount("robot@gmail.com");
     ASSERT_TRUE(test_server_.Start());
   }
 
   // testing::Test:
   void TearDown() override {
     ASSERT_TRUE(test_server_.ShutdownAndWaitUntilComplete());
   }
 
  protected:
   scoped_ptr<UploadJob> PrepareUploadJob(scoped_ptr<
       UploadJobImpl::MimeBoundaryGenerator> mime_boundary_generator) {
-    scoped_ptr<UploadJob> upload_job(new UploadJobImpl(
-        GetServerURL(), kRobotAccountId, &oauth2_service_,
-        request_context_getter_.get(), this, mime_boundary_generator.Pass()));
+    scoped_ptr<UploadJob> upload_job(
+        new UploadJobImpl(GetServerURL(), kRobotAccountId, &oauth2_service_,
+                          request_context_getter_.get(), this,
+                          std::move(mime_boundary_generator)));
 
     std::map<std::string, std::string> header_entries;
     header_entries.insert(std::make_pair(kCustomField1, "CUSTOM1"));
     scoped_ptr<std::string> data(new std::string(kTestPayload1));
     upload_job->AddDataSegment("Name1", "file1.ext", header_entries,
-                               data.Pass());
+                               std::move(data));
 
     header_entries.insert(std::make_pair(kCustomField2, "CUSTOM2"));
     scoped_ptr<std::string> data2(new std::string(kTestPayload2));
-    upload_job->AddDataSegment("Name2", "", header_entries, data2.Pass());
-    return upload_job.Pass();
+    upload_job->AddDataSegment("Name2", "", header_entries, std::move(data2));
+    return upload_job;
   }
 
   content::TestBrowserThreadBundle test_browser_thread_bundle_;
   base::RunLoop run_loop_;
   net::EmbeddedTestServer test_server_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
   MockOAuth2TokenService oauth2_service_;
 
   scoped_ptr<UploadJob::ErrorCode> expected_error_;
 };
@@ skipping 12 matching lines @@
   scoped_ptr<net::test_server::HttpResponse> HandlePostRequest(
       const net::test_server::HttpRequest& request) {
     EXPECT_TRUE(request.headers.find("Authorization") != request.headers.end());
     const std::string authorization_header =
         request.headers.at("Authorization");
     scoped_ptr<net::test_server::BasicHttpResponse> response(
         new net::test_server::BasicHttpResponse);
     const size_t pos = authorization_header.find(" ");
     if (pos == std::string::npos) {
       response->set_code(net::HTTP_UNAUTHORIZED);
-      return response.Pass();
+      return std::move(response);
     }
 
     const std::string token = authorization_header.substr(pos + 1);
     response->set_code(oauth2_service_.IsTokenValid(token)
                            ? net::HTTP_OK
                            : net::HTTP_UNAUTHORIZED);
-    return response.Pass();
+    return std::move(response);
   }
 };
 
 TEST_F(UploadFlowTest, SuccessfulUpload) {
   oauth2_service_.SetTokenValid(kTokenValid);
   oauth2_service_.AddTokenToQueue(kTokenValid);
   scoped_ptr<UploadJob> upload_job = PrepareUploadJob(
       make_scoped_ptr(new UploadJobImpl::RandomMimeBoundaryGenerator));
   upload_job->Start();
   run_loop_.Run();
@@ skipping 41 matching lines @@
     test_server_.RegisterRequestHandler(base::Bind(
         &UploadRequestTest::HandlePostRequest, base::Unretained(this)));
   }
 
   scoped_ptr<net::test_server::HttpResponse> HandlePostRequest(
       const net::test_server::HttpRequest& request) {
     scoped_ptr<net::test_server::BasicHttpResponse> response(
         new net::test_server::BasicHttpResponse);
     response->set_code(net::HTTP_OK);
     EXPECT_EQ(expected_content_, request.content);
-    return response.Pass();
+    return std::move(response);
   }
 
   void SetExpectedRequestContent(const std::string& expected_content) {
     expected_content_ = expected_content;
   }
 
  protected:
   std::string expected_content_;
 };
 
@@ skipping 15 matching lines @@
       "customfield2: CUSTOM2\r\n"
       "\r\n"
       "**||--||PAYLOAD2||--||**\r\n--"
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA--\r\n");
 
   upload_job->Start();
   run_loop_.Run();
 }
 
 }  // namespace policy