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

chrome/browser/signin/profile_oauth2_token_service_unittest.cc

 // Copyright 2013 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 "base/run_loop.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/token_service_unittest.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/gaia_constants.h"
@@ skipping 313 matching lines @@
   service()->EraseTokensFromDB();
   ExpectOneTokensClearedNotification();
 
   EXPECT_EQ(0, oauth2_service_->cache_size_for_testing());
   service()->IssueAuthTokenForTest(GaiaConstants::kGaiaOAuth2LoginRefreshToken,
                                   "refreshToken");
   ExpectOneTokenAvailableNotification();
 
   request = oauth2_service_->StartRequest(scope_list, &consumer_);
   base::RunLoop().RunUntilIdle();
-  fetcher = factory_.GetFetcherByID(1);
+  fetcher = factory_.GetFetcherByID(0);
   fetcher->set_response_code(net::HTTP_OK);
   fetcher->SetResponseString(GetValidTokenResponse("another token", 3600));
   fetcher->delegate()->OnURLFetchComplete(fetcher);
   EXPECT_EQ(2, consumer_.number_of_successful_tokens_);
   EXPECT_EQ(0, consumer_.number_of_errors_);
   EXPECT_EQ("another token", consumer_.last_token_);
   EXPECT_EQ(1, oauth2_service_->cache_size_for_testing());
 }
 
 // Android doesn't use the current profile's TokenService login refresh token.
 #if !defined(OS_ANDROID)
 TEST_F(ProfileOAuth2TokenServiceTest, StaleRefreshTokensNotCached) {
   EXPECT_FALSE(service()->HasOAuthLoginToken());
   EXPECT_FALSE(oauth2_service_->ShouldCacheForRefreshToken(service(), "T1"));
 
   service()->IssueAuthTokenForTest(GaiaConstants::kGaiaOAuth2LoginRefreshToken,
                                   "T1");
   ExpectOneTokenAvailableNotification();
   EXPECT_TRUE(oauth2_service_->ShouldCacheForRefreshToken(service(), "T1"));
   EXPECT_FALSE(oauth2_service_->ShouldCacheForRefreshToken(service(), "T2"));
 
   service()->IssueAuthTokenForTest(GaiaConstants::kGaiaOAuth2LoginRefreshToken,
                                   "T2");
   ExpectOneTokenAvailableNotification();
   EXPECT_TRUE(oauth2_service_->ShouldCacheForRefreshToken(service(), "T2"));
   EXPECT_FALSE(oauth2_service_->ShouldCacheForRefreshToken(NULL, "T2"));
 }
 #endif