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

chrome/browser/sync/test_profile_sync_service.cc

Index: chrome/browser/sync/test_profile_sync_service.cc
diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc
index 91d39418bd45eed2856b8bd468bdb31c6b266b0c..357d9e29893a9ba61b8e21d23c5cc114a06fea19 100644
--- a/chrome/browser/sync/test_profile_sync_service.cc
+++ b/chrome/browser/sync/test_profile_sync_service.cc
@@ -315,16 +315,17 @@ void TestProfileSyncService::CreateBackend() {
 }
 
 scoped_ptr<OAuth2TokenService::Request> FakeOAuth2TokenService::StartRequest(
+    const std::string& account_id,
     const OAuth2TokenService::ScopeSet& scopes,
     OAuth2TokenService::Consumer* consumer) {
   // Ensure token in question is cached and never expires. Request will succeed
   // without network IO.
   RegisterCacheEntry("test_client_id",
-                     GetRefreshToken(),
+                     GetRefreshToken(account_id),
                      scopes,
                      "access_token",
                      base::Time::Max());
-  return ProfileOAuth2TokenService::StartRequest(scopes, consumer);
+  return ProfileOAuth2TokenService::StartRequest(account_id, scopes, consumer);
 }
 
 BrowserContextKeyedService* FakeOAuth2TokenService::BuildTokenService(
@@ -335,3 +336,14 @@ BrowserContextKeyedService* FakeOAuth2TokenService::BuildTokenService(
   service->Initialize(profile);
   return service;
 }
+
+void FakeOAuth2TokenService::PersistCredentials(
+    const std::string& account_id,
+    const std::string& refresh_token) {
+  // Disabling the token persistence.
+}
+
+void FakeOAuth2TokenService::ClearPersistedCredentials(
+    const std::string& account_id) {
+  // Disabling the token persistence.
+}