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

chrome/browser/policy/cloud/user_policy_signin_service_unittest.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 "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
@@ skipping 14 matching lines @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #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"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/policy/cloud/user_policy_signin_service_android.h"
 #include "chrome/browser/signin/android_profile_oauth2_token_service.h"
@@ skipping 90 matching lines @@
   bool HasPendingRequest() const {
     return pending_request_;
   }
 
  private:
   base::WeakPtr<RequestImpl> pending_request_;
 };
 
 #endif
 
-}  // namespace
-
 class UserPolicySigninServiceTest : public testing::Test {
  public:
   UserPolicySigninServiceTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         register_completed_(false) {}
 
   MOCK_METHOD1(OnPolicyRefresh, void(bool));
 
   void OnRegisterCompleted(scoped_ptr<CloudPolicyClient> client) {
     register_completed_ = true;
@@ skipping 57 matching lines @@
     UserPolicySigninServiceFactory::SetDeviceManagementServiceForTesting(NULL);
     // Free the profile before we clear out the browser prefs.
     profile_.reset();
     TestingBrowserProcess* testing_browser_process =
         TestingBrowserProcess::GetGlobal();
     testing_browser_process->SetLocalState(NULL);
     local_state_.reset();
     testing_browser_process->SetBrowserPolicyConnector(NULL);
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
-    ResetLastFetcherId();
   }
 
 #if defined(OS_ANDROID)
   FakeAndroidProfileOAuth2TokenService* GetTokenService() {
     ProfileOAuth2TokenService* service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
     return static_cast<FakeAndroidProfileOAuth2TokenService*>(service);
   }
 #else
   FakeProfileOAuth2TokenService* GetTokenService() {
@@ skipping 109 matching lines @@
     ASSERT_TRUE(policy_data.SerializeToString(
         policy_response->mutable_policy_data()));
     fetch_request->SendResponse(DM_STATUS_SUCCESS, policy_blob);
 
     // Complete the store which should cause the policy fetch callback to be
     // invoked.
     mock_store_->NotifyStoreLoaded();
     Mock::VerifyAndClearExpectations(this);
   }
 
-  void ResetLastFetcherId() {
-    OAuth2AccessTokenFetcher::ResetLastFetcherIdForTest();
-  }
-
   scoped_ptr<TestingProfile> profile_;
   // Weak pointer to a MockUserCloudPolicyStore - lifetime is managed by the
   // UserCloudPolicyManager.
   MockUserCloudPolicyStore* mock_store_;
   scoped_ptr<UserCloudPolicyManager> manager_;
 
   // BrowserPolicyConnector and UrlFetcherFactory want to initialize and free
   // various components asynchronously via tasks, so create fake threads here.
   content::TestBrowserThreadBundle thread_bundle_;
 
@@ skipping 418 matching lines @@
 }
 
 TEST_F(UserPolicySigninServiceTest, SignOutThenSignInAgain) {
   ASSERT_NO_FATAL_FAILURE(TestSuccessfulSignin());
 
   EXPECT_CALL(*mock_store_, Clear());
   signin_manager_->ForceSignOut();
   ASSERT_FALSE(manager_->core()->service());
 
   // Now sign in again.
-  ResetLastFetcherId();
   ASSERT_NO_FATAL_FAILURE(TestSuccessfulSignin());
 }
 
 TEST_F(UserPolicySigninServiceTest, PolicyFetchFailureTemporary) {
   ASSERT_NO_FATAL_FAILURE(TestSuccessfulSignin());
 
   ASSERT_TRUE(manager_->IsClientRegistered());
 
   // Kick off another policy fetch.
   MockDeviceManagementJob* fetch_request = NULL;
@@ skipping 37 matching lines @@
   EXPECT_CALL(*mock_store_, Clear());
   fetch_request->SendResponse(DM_STATUS_SERVICE_MANAGEMENT_NOT_SUPPORTED,
                               em::DeviceManagementResponse());
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(manager_->IsClientRegistered());
 #if !defined(OS_ANDROID)
   EXPECT_FALSE(signin_manager_->IsSignoutProhibited());
 #endif
 }
 
+}  // namespace
+
 }  // namespace policy