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 bb544169328e023931ff5ae8e20a1ca9187bfb94..105cd85871484ee3758364d1cbd6b52d5d29b3d9 100644
--- a/chrome/browser/sync/test_profile_sync_service.cc
+++ b/chrome/browser/sync/test_profile_sync_service.cc
@@ -315,13 +315,14 @@ 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(GetRefreshToken(), scopes, "access_token",
+  RegisterCacheEntry(GetRefreshToken(account_id), scopes, "access_token",
       base::Time::Max());
-  return ProfileOAuth2TokenService::StartRequest(scopes, consumer);
+  return ProfileOAuth2TokenService::StartRequest(account_id, scopes, consumer);
 }
 
 BrowserContextKeyedService* FakeOAuth2TokenService::BuildTokenService(