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 123 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 {
@@ skipping 129 matching lines @@
       harness_.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(harness_.profile.get());
-  signin->SetAuthenticatedUsername("test@test.com");
+  signin->SetAuthenticatedUsername("test");

[Andrew T Wilson (Slow), 2013/09/06 09:23:10]

Why did we change the username here?

[fgorski, 2013/09/12 23:46:24]

Sync service does not care, as long as it is set, but if you look at
IssueTestTokens, only account_id = "test" is set a refresh token. For
ProfileOAuth2TokenService that matters and the change is meant to fix a failing
unit test.

   ProfileSyncComponentsFactoryMock* factory =
       new ProfileSyncComponentsFactoryMock();
   harness_.service.reset(new TestProfileSyncService(
       factory,
       harness_.profile.get(),
       signin,
       ProfileSyncService::AUTO_START,
       true));
   // Register the bookmark data type.
   EXPECT_CALL(*factory, CreateDataTypeManager(_, _, _, _, _, _)).
@@ skipping 168 matching lines @@
 TEST_F(ProfileSyncServiceTest, FailToDownloadControlTypes) {
   harness_.StartSyncServiceAndSetInitialSyncEnded(false, true, true, true,
                                                   syncer::STORAGE_IN_MEMORY);
 
   // The backend is not ready.  Ensure the PSS knows this.
   EXPECT_FALSE(harness_.service->sync_initialized());
 }
 
 }  // namespace
 }  // namespace browser_sync