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

chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc

Index: chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
index e8e443a1de07249b9faa9211b8dcd982f71ea887..8da3550ea65d9f0c29e172360facefadb042db20 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
+++ b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
@@ -32,7 +32,6 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/google_service_auth_error.h"
-#include "google_apis/gaia/oauth2_access_token_fetcher.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_context_getter.h"
@@ -143,8 +142,6 @@ class FakeAndroidProfileOAuth2TokenService
 
 #endif
 
-}  // namespace
-
 class UserPolicySigninServiceTest : public testing::Test {
  public:
   UserPolicySigninServiceTest()
@@ -222,7 +219,6 @@ class UserPolicySigninServiceTest : public testing::Test {
     testing_browser_process->SetBrowserPolicyConnector(NULL);
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
-    ResetLastFetcherId();
   }
 
 #if defined(OS_ANDROID)
@@ -352,10 +348,6 @@ class UserPolicySigninServiceTest : public testing::Test {
     Mock::VerifyAndClearExpectations(this);
   }
 
-  void ResetLastFetcherId() {
-    OAuth2AccessTokenFetcher::ResetLastFetcherIdForTest();
-  }
-
   scoped_ptr<TestingProfile> profile_;
   // Weak pointer to a MockUserCloudPolicyStore - lifetime is managed by the
   // UserCloudPolicyManager.
@@ -794,7 +786,6 @@ TEST_F(UserPolicySigninServiceTest, SignOutThenSignInAgain) {
   ASSERT_FALSE(manager_->core()->service());
 
   // Now sign in again.
-  ResetLastFetcherId();
   ASSERT_NO_FATAL_FAILURE(TestSuccessfulSignin());
 }
 
@@ -852,4 +843,6 @@ TEST_F(UserPolicySigninServiceTest, PolicyFetchFailureDisableManagement) {
 #endif
 }
 
+}  // namespace
+
 }  // namespace policy