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

chrome/browser/sync/profile_sync_service_session_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 <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 65 matching lines @@
 namespace browser_sync {
 
 namespace {
 
 class FakeProfileSyncService : public TestProfileSyncService {
  public:
   FakeProfileSyncService(
       ProfileSyncComponentsFactory* factory,
       Profile* profile,
       SigninManagerBase* signin,
-      OAuth2TokenService* oauth2_token_service,
+      ProfileOAuth2TokenService* oauth2_token_service,
       ProfileSyncService::StartBehavior behavior,
       bool synchronous_backend_initialization)
       : TestProfileSyncService(factory,
                                profile,
                                signin,
                                oauth2_token_service,
                                behavior,
                                synchronous_backend_initialization) {}
   virtual ~FakeProfileSyncService() {}
 
@@ skipping 171 matching lines @@
     BrowserWithTestWindowTest::TearDown();
   }
 
   bool StartSyncService(const base::Closure& callback,
                         bool will_fail_association) {
     if (sync_service_)
       return false;
     SigninManagerBase* signin =
         SigninManagerFactory::GetForProfile(profile());
     signin->SetAuthenticatedUsername("test_user");
-    OAuth2TokenService* oauth2_token_service =
+    ProfileOAuth2TokenService* oauth2_token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile());
     ProfileSyncComponentsFactoryMock* factory =
         new ProfileSyncComponentsFactoryMock();
     sync_service_.reset(new FakeProfileSyncService(
         factory,
         profile(),
         signin,
         oauth2_token_service,
         ProfileSyncService::AUTO_START,
         false));
@@ skipping 10 matching lines @@
                                    true /* setup_for_test */);
     change_processor_ = new SessionChangeProcessor(
         dtc, model_associator_,
         true /* setup_for_test */);
     EXPECT_CALL(*factory, CreateSessionSyncComponents(_, _)).
         WillOnce(Return(ProfileSyncComponentsFactory::SyncComponents(
             model_associator_, change_processor_)));
     EXPECT_CALL(*factory, CreateDataTypeManager(_, _, _, _, _, _)).
         WillOnce(ReturnNewDataTypeManager());
 
-    TokenServiceFactory::GetForProfile(profile())->IssueAuthTokenForTest(
-        GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
-    TokenServiceFactory::GetForProfile(profile())->IssueAuthTokenForTest(
-        GaiaConstants::kSyncService, "token");
+    ProfileOAuth2TokenServiceFactory::GetForProfile(profile())
+        ->UpdateCredentials("test_user", "oauth2_login_token");
+    TokenServiceFactory::GetForProfile(profile())
+        ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token");
     sync_service_->Initialize();
     base::MessageLoop::current()->Run();
     return true;
   }
 
   // Path used in testing.
   base::ScopedTempDir temp_dir_;
   SessionModelAssociator* model_associator_;
   SessionChangeProcessor* change_processor_;
   SessionID window_id_;
@@ skipping 1077 matching lines @@
     tab_node.SetSessionSpecifics(specifics);
   }
 
   error = model_associator_->DisassociateModels();
   ASSERT_FALSE(error.IsSet());
   error = model_associator_->AssociateModels(NULL, NULL);
   ASSERT_FALSE(error.IsSet());
 }
 
 }  // namespace browser_sync