Making OAuth2TokenService multi-login aware, updating callers, minor fixes

chrome/browser/sync/profile_sync_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/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/values.h"
@@ skipping 83 matching lines @@
       bool issue_auth_token,
       bool synchronous_sync_configuration,
       bool sync_setup_completed,
       syncer::StorageOption storage_option) {
     if (service_)
       return;
 
     SigninManagerBase* signin =
         SigninManagerFactory::GetForProfile(profile_.get());
     signin->SetAuthenticatedUsername("test");
-    OAuth2TokenService* oauth2_token_service =
+    ProfileOAuth2TokenService* oauth2_token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
     ProfileSyncComponentsFactoryMock* factory =
         new ProfileSyncComponentsFactoryMock();
     service_.reset(new TestProfileSyncService(
         factory,
         profile_.get(),
         signin,
         oauth2_token_service,
         ProfileSyncService::AUTO_START,
         true));
@@ skipping 25 matching lines @@
       done.Wait();
       base::RunLoop().RunUntilIdle();
       if (service_->sync_initialized()) {
         return;
       }
     }
     LOG(ERROR) << "Backend not initialized.";
   }
 
   void IssueTestTokens() {
-    TokenService* token_service =
-        TokenServiceFactory::GetForProfile(profile_.get());
-    token_service->IssueAuthTokenForTest(
-        GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
-    token_service->IssueAuthTokenForTest(
-          GaiaConstants::kSyncService, "token");
+    ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
+        ->UpdateCredentials("test", "oauth2_login_token");
+    TokenServiceFactory::GetForProfile(profile_.get())
+        ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token");
   }
 
   scoped_ptr<TestProfileSyncService> service_;
   scoped_ptr<TestingProfile> profile_;
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
 };
 
 class TestProfileSyncServiceObserver : public ProfileSyncServiceObserver {
  public:
   explicit TestProfileSyncServiceObserver(ProfileSyncService* service)
       : service_(service), first_setup_in_progress_(false) {}
   virtual void OnStateChanged() OVERRIDE {
     first_setup_in_progress_ = service_->FirstSetupInProgress();
   }
   bool first_setup_in_progress() const { return first_setup_in_progress_; }
  private:
   ProfileSyncService* service_;
   bool first_setup_in_progress_;
 };
 
 TEST_F(ProfileSyncServiceTest, InitialState) {
   SigninManagerBase* signin =
       SigninManagerFactory::GetForProfile(profile_.get());
-  OAuth2TokenService* oauth2_token_service =
+  ProfileOAuth2TokenService* oauth2_token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
   service_.reset(new TestProfileSyncService(
       new ProfileSyncComponentsFactoryMock(),
       profile_.get(),
       signin,
       oauth2_token_service,
       ProfileSyncService::MANUAL_START,
       true));
   service_->Initialize();
   EXPECT_TRUE(
@@ skipping 16 matching lines @@
   EXPECT_FALSE(observer.first_setup_in_progress());
   service.RemoveObserver(&observer);
 }
 
 TEST_F(ProfileSyncServiceTest, DisabledByPolicy) {
   profile_->GetTestingPrefService()->SetManagedPref(
       prefs::kSyncManaged,
       Value::CreateBooleanValue(true));
   SigninManagerBase* signin =
       SigninManagerFactory::GetForProfile(profile_.get());
-  OAuth2TokenService* oauth2_token_service =
+  ProfileOAuth2TokenService* oauth2_token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
   service_.reset(new TestProfileSyncService(
       new ProfileSyncComponentsFactoryMock(),
       profile_.get(),
       signin,
       oauth2_token_service,
       ProfileSyncService::MANUAL_START,
       true));
   service_->Initialize();
   EXPECT_TRUE(service_->IsManaged());
 }
 
 TEST_F(ProfileSyncServiceTest, AbortedByShutdown) {
   SigninManagerBase* signin =
       SigninManagerFactory::GetForProfile(profile_.get());
   signin->SetAuthenticatedUsername("test");
-  OAuth2TokenService* oauth2_token_service =
+  ProfileOAuth2TokenService* oauth2_token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
   ProfileSyncComponentsFactoryMock* factory =
       new ProfileSyncComponentsFactoryMock();
   service_.reset(new TestProfileSyncService(
       factory,
       profile_.get(),
       signin,
       oauth2_token_service,
       ProfileSyncService::AUTO_START,
       true));
   EXPECT_CALL(*factory, CreateDataTypeManager(_, _, _, _, _, _)).Times(0);
   EXPECT_CALL(*factory, CreateBookmarkSyncComponents(_, _)).
       Times(0);
   service_->RegisterDataTypeController(
       new BookmarkDataTypeController(service_->factory(),
                                      profile_.get(),
                                      service_.get()));
 
   service_->Initialize();
   service_->Shutdown();
   service_.reset();
 }
 
 TEST_F(ProfileSyncServiceTest, DisableAndEnableSyncTemporarily) {
   SigninManagerBase* signin =
       SigninManagerFactory::GetForProfile(profile_.get());
   signin->SetAuthenticatedUsername("test");
-  OAuth2TokenService* oauth2_token_service =
+  ProfileOAuth2TokenService* oauth2_token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
   ProfileSyncComponentsFactoryMock* factory =
       new ProfileSyncComponentsFactoryMock();
   service_.reset(new TestProfileSyncService(
       factory,
       profile_.get(),
       signin,
       oauth2_token_service,
       ProfileSyncService::AUTO_START,
       true));
@@ skipping 20 matching lines @@
       profile_->GetPrefs()->GetBoolean(prefs::kSyncSuppressStart));
 }
 
 // Certain ProfileSyncService tests don't apply to Chrome OS, for example
 // things that deal with concepts like "signing out" and policy.
 #if !defined (OS_CHROMEOS)
 
 TEST_F(ProfileSyncServiceTest, EnableSyncAndSignOut) {
   SigninManager* signin =
       SigninManagerFactory::GetForProfile(profile_.get());
-  signin->SetAuthenticatedUsername("test@test.com");
-  OAuth2TokenService* oauth2_token_service =
+  signin->SetAuthenticatedUsername("test");
+  ProfileOAuth2TokenService* oauth2_token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
   ProfileSyncComponentsFactoryMock* factory =
       new ProfileSyncComponentsFactoryMock();
   service_.reset(new TestProfileSyncService(
       factory,
       profile_.get(),
       signin,
       oauth2_token_service,
       ProfileSyncService::AUTO_START,
       true));
@@ skipping 174 matching lines @@
 TEST_F(ProfileSyncServiceTest, FailToDownloadControlTypes) {
   StartSyncServiceAndSetInitialSyncEnded(false, true, true, true,
                                                   syncer::STORAGE_IN_MEMORY);
 
   // The backend is not ready.  Ensure the PSS knows this.
   EXPECT_FALSE(service_->sync_initialized());
 }
 
 }  // namespace
 }  // namespace browser_sync