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

chrome/browser/sync/test_profile_sync_service.h

Index: chrome/browser/sync/test_profile_sync_service.h
diff --git a/chrome/browser/sync/test_profile_sync_service.h b/chrome/browser/sync/test_profile_sync_service.h
index b8f0ff1a461659137db584ab72f6415fdd16b6e7..bc272bc23cadea90c0034f92accfbb2edc9f5a67 100644
--- a/chrome/browser/sync/test_profile_sync_service.h
+++ b/chrome/browser/sync/test_profile_sync_service.h
@@ -119,7 +119,7 @@ class TestProfileSyncService : public ProfileSyncService {
       ProfileSyncComponentsFactory* factory,
       Profile* profile,
       SigninManagerBase* signin,
-      OAuth2TokenService* oauth2_token_service,
+      ProfileOAuth2TokenService* oauth2_token_service,
       ProfileSyncService::StartBehavior behavior,
       bool synchronous_backend_initialization);
 
@@ -199,11 +199,19 @@ class TestProfileSyncService : public ProfileSyncService {
 class FakeOAuth2TokenService : public ProfileOAuth2TokenService {
  public:
   virtual scoped_ptr<OAuth2TokenService::Request> StartRequest(
+      const std::string& account_id,
       const OAuth2TokenService::ScopeSet& scopes,
       OAuth2TokenService::Consumer* consumer) OVERRIDE;
 
   static BrowserContextKeyedService* BuildTokenService(
       content::BrowserContext* context);
+
+ protected:
+  virtual void PersistCredentials(const std::string& account_id,
+                                  const std::string& refresh_token) OVERRIDE;
+
+  virtual void ClearPersistedCredentials(
+      const std::string& account_id) OVERRIDE;
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_