Revert "Handling of multiple concurrent requests from different clients in OAuth2TokenService"

google_apis/gaia/oauth2_access_token_fetcher.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/oauth2_access_token_fetcher.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 38 matching lines @@
   CHECK(!status.is_success());
   if (status.status() == URLRequestStatus::CANCELED) {
     return GoogleServiceAuthError(GoogleServiceAuthError::REQUEST_CANCELED);
   } else {
     DLOG(WARNING) << "Could not reach Google Accounts servers: errno "
                   << status.error();
     return GoogleServiceAuthError::FromConnectionError(status.error());
   }
 }
 
-static URLFetcher* CreateFetcher(int id,
-                                 URLRequestContextGetter* getter,
+static URLFetcher* CreateFetcher(URLRequestContextGetter* getter,
                                  const GURL& url,
                                  const std::string& body,
                                  URLFetcherDelegate* delegate) {
   bool empty_body = body.empty();
   URLFetcher* result = net::URLFetcher::Create(
-      id, url,
+      0, url,
       empty_body ? URLFetcher::GET : URLFetcher::POST,
       delegate);
 
   result->SetRequestContext(getter);
   result->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                        net::LOAD_DO_NOT_SAVE_COOKIES);
   // Fetchers are sometimes cancelled because a network change was detected,
   // especially at startup and after sign-in on ChromeOS. Retrying once should
   // be enough in those cases; let the fetcher retry up to 3 times just in case.
   // http://crbug.com/163710
   result->SetAutomaticallyRetryOnNetworkChanges(3);
 
   if (!empty_body)
     result->SetUploadData("application/x-www-form-urlencoded", body);
 
   return result;
 }
 }  // namespace
 
-int OAuth2AccessTokenFetcher::last_fetcher_id_ = 0;
-
 OAuth2AccessTokenFetcher::OAuth2AccessTokenFetcher(
     OAuth2AccessTokenConsumer* consumer,
     URLRequestContextGetter* getter)
     : consumer_(consumer),
       getter_(getter),
       state_(INITIAL) { }
 
 OAuth2AccessTokenFetcher::~OAuth2AccessTokenFetcher() { }
 
 void OAuth2AccessTokenFetcher::CancelRequest() {
   fetcher_.reset();
 }
 
 void OAuth2AccessTokenFetcher::Start(const std::string& client_id,
                                      const std::string& client_secret,
                                      const std::string& refresh_token,
                                      const std::vector<std::string>& scopes) {
   client_id_ = client_id;
   client_secret_ = client_secret;
   refresh_token_ = refresh_token;
   scopes_ = scopes;
   StartGetAccessToken();
 }
 
 void OAuth2AccessTokenFetcher::StartGetAccessToken() {
   CHECK_EQ(INITIAL, state_);
   state_ = GET_ACCESS_TOKEN_STARTED;
   fetcher_.reset(CreateFetcher(
-      last_fetcher_id_++,
       getter_,
       MakeGetAccessTokenUrl(),
       MakeGetAccessTokenBody(
           client_id_, client_secret_, refresh_token_, scopes_),
       this));
   fetcher_->Start();  // OnURLFetchComplete will be called.
 }
 
 void OAuth2AccessTokenFetcher::EndGetAccessToken(
     const net::URLFetcher* source) {
@@ skipping 101 matching lines @@
   source->GetResponseAsString(&data);
   scoped_ptr<base::Value> value(base::JSONReader::Read(data));
   if (!value.get() || value->GetType() != base::Value::TYPE_DICTIONARY)
     return false;
 
   base::DictionaryValue* dict =
       static_cast<base::DictionaryValue*>(value.get());
   return dict->GetString(kAccessTokenKey, access_token) &&
       dict->GetInteger(kExpiresInKey, expires_in);
 }
-
-// static
-void OAuth2AccessTokenFetcher::ResetLastFetcherIdForTest() {
-  last_fetcher_id_ = 0;
-}