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

google_apis/gcm/engine/registration_request_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 <stdint.h>
-
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_tokenizer.h"
 #include "google_apis/gcm/engine/gcm_registration_request_handler.h"
 #include "google_apis/gcm/engine/gcm_request_test_base.h"
 #include "google_apis/gcm/engine/instance_id_get_token_request_handler.h"
 #include "google_apis/gcm/monitoring/fake_gcm_stats_recorder.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
@@ skipping 75 matching lines @@
 
 GCMRegistrationRequestTest::~GCMRegistrationRequestTest() {
 }
 
 void GCMRegistrationRequestTest::CreateRequest(const std::string& sender_ids) {
   RegistrationRequest::RequestInfo request_info(
       kAndroidId, kSecurityToken, kAppId);
   scoped_ptr<GCMRegistrationRequestHandler> request_handler(
       new GCMRegistrationRequestHandler(sender_ids));
   request_.reset(new RegistrationRequest(
-      GURL(kRegistrationURL),
-      request_info,
-      request_handler.Pass(),
+      GURL(kRegistrationURL), request_info, std::move(request_handler),
       GetBackoffPolicy(),
       base::Bind(&RegistrationRequestTest::RegistrationCallback,
                  base::Unretained(this)),
-      max_retry_count_,
-      url_request_context_getter(),
-      &recorder_,
-      sender_ids));
+      max_retry_count_, url_request_context_getter(), &recorder_, sender_ids));
 }
 
 TEST_F(GCMRegistrationRequestTest, RequestSuccessful) {
   set_max_retry_count(0);
   CreateRequest("sender1,sender2");
   request_->Start();
 
   SetResponse(net::HTTP_OK, "token=2501");
   CompleteFetch();
 
@@ skipping 293 matching lines @@
     const std::string& instance_id,
     const std::string& authorized_entity,
     const std::string& scope,
     const std::map<std::string, std::string>& options) {
   RegistrationRequest::RequestInfo request_info(
       kAndroidId, kSecurityToken, kAppId);
   scoped_ptr<InstanceIDGetTokenRequestHandler> request_handler(
       new InstanceIDGetTokenRequestHandler(
           instance_id, authorized_entity, scope, kGCMVersion, options));
   request_.reset(new RegistrationRequest(
-      GURL(kRegistrationURL),
-      request_info,
-      request_handler.Pass(),
+      GURL(kRegistrationURL), request_info, std::move(request_handler),
       GetBackoffPolicy(),
       base::Bind(&RegistrationRequestTest::RegistrationCallback,
                  base::Unretained(this)),
-      max_retry_count_,
-      url_request_context_getter(),
-      &recorder_,
+      max_retry_count_, url_request_context_getter(), &recorder_,
       authorized_entity));
 }
 
 TEST_F(InstanceIDGetTokenRequestTest, RequestSuccessful) {
   std::map<std::string, std::string> options;
   options["Foo"] = "Bar";
 
   set_max_retry_count(0);
   CreateRequest(kInstanceId, kDeveloperId, kScope, options);
   request_->Start();
@@ skipping 75 matching lines @@
 
   SetResponse(net::HTTP_OK, "token=2501");
   CompleteFetch();
 
   EXPECT_TRUE(callback_called_);
   EXPECT_EQ(RegistrationRequest::SUCCESS, status_);
   EXPECT_EQ("2501", registration_id_);
 }
 
 }  // namespace gcm