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

google_apis/gaia/gaia_oauth_client.cc

 // Copyright (c) 2012 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 "google_apis/gaia/gaia_oauth_client.h"
 
+#include <utility>
+
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
@@ skipping 226 matching lines @@
     request_->Start();
   }
 }
 
 void GaiaOAuthClient::Core::HandleResponse(
     const net::URLFetcher* source,
     bool* should_retry_request) {
   // Move ownership of the request fetcher into a local scoped_ptr which
   // will be nuked when we're done handling the request, unless we need
   // to retry, in which case ownership will be returned to request_.
-  scoped_ptr<net::URLFetcher> old_request = request_.Pass();
+  scoped_ptr<net::URLFetcher> old_request = std::move(request_);
   DCHECK_EQ(source, old_request.get());
 
   // HTTP_BAD_REQUEST means the arguments are invalid.  HTTP_UNAUTHORIZED means
   // the access or refresh token is invalid. No point retrying. We are
   // done here.
   int response_code = source->GetResponseCode();
   if (response_code == net::HTTP_BAD_REQUEST ||
       response_code == net::HTTP_UNAUTHORIZED) {
     delegate_->OnOAuthError();
     return;
@@ skipping 12 matching lines @@
   }
 
   if (!response_dict.get()) {
     // If we don't have an access token yet and the the error was not
     // RC_BAD_REQUEST, we may need to retry.
     if ((source->GetMaxRetriesOn5xx() != -1) &&
         (num_retries_ >= source->GetMaxRetriesOn5xx())) {
       // Retry limit reached. Give up.
       delegate_->OnNetworkError(source->GetResponseCode());
     } else {
-      request_ = old_request.Pass();
+      request_ = std::move(old_request);
       *should_retry_request = true;
     }
     return;
   }
 
   RequestType type = request_type_;
   request_type_ = NO_PENDING_REQUEST;
 
   switch (type) {
     case USER_EMAIL: {
       std::string email;
       response_dict->GetString("email", &email);
       delegate_->OnGetUserEmailResponse(email);
       break;
     }
 
     case USER_ID: {
       std::string id;
       response_dict->GetString("id", &id);
       delegate_->OnGetUserIdResponse(id);
       break;
     }
 
     case USER_INFO: {
-      delegate_->OnGetUserInfoResponse(response_dict.Pass());
+      delegate_->OnGetUserInfoResponse(std::move(response_dict));
       break;
     }
 
     case TOKEN_INFO: {
-      delegate_->OnGetTokenInfoResponse(response_dict.Pass());
+      delegate_->OnGetTokenInfoResponse(std::move(response_dict));
       break;
     }
 
     case TOKENS_FROM_AUTH_CODE:
     case REFRESH_TOKEN: {
       std::string access_token;
       std::string refresh_token;
       int expires_in_seconds = 0;
       response_dict->GetString(kAccessTokenValue, &access_token);
       response_dict->GetString(kRefreshTokenValue, &refresh_token);
@@ skipping 76 matching lines @@
 }
 
 void GaiaOAuthClient::GetTokenHandleInfo(const std::string& token_handle,
                                          int max_retries,
                                          Delegate* delegate) {
   return core_->GetTokenInfo("token_handle", token_handle, max_retries,
                              delegate);
 }
 
 }  // namespace gaia