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

This reverts commit 2a0ff28378173300b81b2874736c30a6c48d0029.

Reason: BuildBot Vista fails TokenServiceUpdateClearsCache test.

BUG=
TBR=zelidrag@chromium.org

Review URL: https://codereview.chromium.org/23767004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221350 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 11 deletions

diff --git a/google_apis/gaia/oauth2_access_token_fetcher.cc b/google_apis/gaia/oauth2_access_token_fetcher.cc
index 9fd46d7..456251f 100644
--- a/google_apis/gaia/oauth2_access_token_fetcher.cc
+++ b/google_apis/gaia/oauth2_access_token_fetcher.cc
@@ -56,14 +56,13 @@ static GoogleServiceAuthError CreateAuthError(URLRequestStatus status) {
   }
 }
 
-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);
 
@@ -83,8 +82,6 @@ static URLFetcher* CreateFetcher(int id,
 }
 }  // namespace
 
-int OAuth2AccessTokenFetcher::last_fetcher_id_ = 0;
-
 OAuth2AccessTokenFetcher::OAuth2AccessTokenFetcher(
     OAuth2AccessTokenConsumer* consumer,
     URLRequestContextGetter* getter)
@@ -113,7 +110,6 @@ void OAuth2AccessTokenFetcher::StartGetAccessToken() {
   CHECK_EQ(INITIAL, state_);
   state_ = GET_ACCESS_TOKEN_STARTED;
   fetcher_.reset(CreateFetcher(
-      last_fetcher_id_++,
       getter_,
       MakeGetAccessTokenUrl(),
       MakeGetAccessTokenBody(
@@ -235,8 +231,3 @@ bool OAuth2AccessTokenFetcher::ParseGetAccessTokenResponse(
   return dict->GetString(kAccessTokenKey, access_token) &&
       dict->GetInteger(kExpiresInKey, expires_in);
 }
-
-// static
-void OAuth2AccessTokenFetcher::ResetLastFetcherIdForTest() {
-  last_fetcher_id_ = 0;
-}