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

chrome/browser/sync/profile_sync_service_password_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 <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 74 matching lines @@
       content::BrowserContext* profile) {
     return scoped_refptr<RefcountedBrowserContextKeyedService>();
   }
 
  protected:
   virtual ~NullPasswordStore() {}
 };
 
 class PasswordTestProfileSyncService : public TestProfileSyncService {
  public:
-  PasswordTestProfileSyncService(ProfileSyncComponentsFactory* factory,
-                                 Profile* profile,
-                                 SigninManagerBase* signin,
-                                 OAuth2TokenService* oauth2_token_service)
+  PasswordTestProfileSyncService(
+      ProfileSyncComponentsFactory* factory,
+      Profile* profile,
+      SigninManagerBase* signin,
+      ProfileOAuth2TokenService* oauth2_token_service)
       : TestProfileSyncService(factory,
                                profile,
                                signin,
                                oauth2_token_service,
                                ProfileSyncService::AUTO_START,
                                false) {}
 
   virtual ~PasswordTestProfileSyncService() {}
 
   virtual void OnPassphraseAccepted() OVERRIDE {
     if (!callback_.is_null())
       callback_.Run();
 
     TestProfileSyncService::OnPassphraseAccepted();
   }
 
   static BrowserContextKeyedService* Build(content::BrowserContext* context) {
     Profile* profile = static_cast<Profile*>(context);
     SigninManagerBase* signin =
         SigninManagerFactory::GetForProfile(profile);
-    OAuth2TokenService* oauth2_token_service =
+    ProfileOAuth2TokenService* oauth2_token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
     ProfileSyncComponentsFactoryMock* factory =
         new ProfileSyncComponentsFactoryMock();
     return new PasswordTestProfileSyncService(
         factory, profile, signin, oauth2_token_service);
   }
 
   void set_passphrase_accept_callback(const base::Closure& callback) {
     callback_ = callback;
   }
@@ skipping 96 matching lines @@
       } else {
         // When the password store is unavailable, password sync components must
         // not be created.
         EXPECT_CALL(*components, CreatePasswordSyncComponents(_, _, _))
             .Times(0);
       }
       EXPECT_CALL(*components, CreateDataTypeManager(_, _, _, _, _, _)).
           WillOnce(ReturnNewDataTypeManager());
 
       // We need tokens to get the tests going
-      token_service_->IssueAuthTokenForTest(
-          GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
-      token_service_->IssueAuthTokenForTest(
-          GaiaConstants::kSyncService, "token");
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
+          ->UpdateCredentials("test_user@gmail.com", "oauth2_login_token");
+      token_service_->IssueAuthTokenForTest(GaiaConstants::kSyncService,
+                                            "token");
 
       sync_service_->RegisterDataTypeController(data_type_controller);
       sync_service_->Initialize();
       base::MessageLoop::current()->Run();
       FlushLastDBTask();
 
       sync_service_->SetEncryptionPassphrase("foo",
                                              ProfileSyncService::IMPLICIT);
       base::MessageLoop::current()->Run();
     }
@@ skipping 402 matching lines @@
   CreateRootHelper create_root(this, syncer::PASSWORDS);
   StartSyncService(create_root.callback(),
                    base::Bind(&AddPasswordEntriesCallback, this, sync_forms));
 
   std::vector<PasswordForm> new_sync_forms;
   GetPasswordEntriesFromSyncDB(&new_sync_forms);
 
   EXPECT_EQ(1U, new_sync_forms.size());
   EXPECT_TRUE(ComparePasswords(expected_forms[0], new_sync_forms[0]));
 }