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

chrome/browser/signin/profile_oauth2_token_service.h

Index: chrome/browser/signin/profile_oauth2_token_service.h
diff --git a/chrome/browser/signin/profile_oauth2_token_service.h b/chrome/browser/signin/profile_oauth2_token_service.h
index 013cc065963795ba474feb5732ad7d852aee3bf4..4a6bd37615d6f14d7737540e71160c3f4cfe95ac 100644
--- a/chrome/browser/signin/profile_oauth2_token_service.h
+++ b/chrome/browser/signin/profile_oauth2_token_service.h
@@ -62,8 +62,13 @@ class ProfileOAuth2TokenService : public OAuth2TokenService,
   virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
 
   // Takes injected TokenService for testing.
-  bool ShouldCacheForRefreshToken(TokenService *token_service,
-                                  const std::string& refresh_token);
+  bool ShouldCacheForRefreshToken(const std::string& refresh_token);
+
+  // Gets an account id of the primary account related to the profile.
+  std::string GetPrimaryAccountId();
+
+  // Lists account IDs of all accounts with a refresh token.
+  std::vector<std::string> GetAccounts();
 
   // Updates a |refresh_token| for an |account_id|. Credentials are persisted,
   // and avialable through |LoadCredentials| after service is restarted.
@@ -92,7 +97,7 @@ class ProfileOAuth2TokenService : public OAuth2TokenService,
   virtual ~ProfileOAuth2TokenService();
 
   // OAuth2TokenService overrides.
-  virtual std::string GetRefreshToken() OVERRIDE;
+  virtual std::string GetRefreshToken(const std::string& account_id) OVERRIDE;
 
   // Updates the internal cache of the result from the most-recently-completed
   // auth request (used for reporting errors to the user).