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 79a5329c24a3ca5fb2b7226d33050598fe1aa5a2..19831b27e6cb9d30ba87ab705c91c5817a0d20a7 100644
--- a/chrome/browser/signin/profile_oauth2_token_service.h
+++ b/chrome/browser/signin/profile_oauth2_token_service.h
@@ -59,8 +59,13 @@ class ProfileOAuth2TokenService : public OAuth2TokenService,
   virtual GoogleServiceAuthError GetAuthStatus() const 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.
+  virtual std::vector<std::string> GetAccounts() OVERRIDE;
 
   // Updates a |refresh_token| for an |account_id|. Credentials are persisted,
   // and avialable through |LoadCredentials| after service is restarted.
@@ -89,14 +94,16 @@ class ProfileOAuth2TokenService : public OAuth2TokenService,
   virtual ~ProfileOAuth2TokenService();
 
   // OAuth2TokenService overrides.
-  virtual std::string GetRefreshToken() OVERRIDE;
+  virtual std::string GetRefreshToken(const std::string& account_id) OVERRIDE;
 
   // OAuth2TokenService implementation.
   virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
 
   // Updates the internal cache of the result from the most-recently-completed
   // auth request (used for reporting errors to the user).
-  virtual void UpdateAuthError(const GoogleServiceAuthError& error) OVERRIDE;
+  virtual void UpdateAuthError(
+      const std::string& account_id,
+      const GoogleServiceAuthError& error) OVERRIDE;
 
   // Overridden to not cache tokens if the TokenService refresh token
   // changes while a token fetch is in-flight.  If the user logs out and
@@ -108,6 +115,15 @@ class ProfileOAuth2TokenService : public OAuth2TokenService,
                                   const std::string& access_token,
                                   const base::Time& expiration_date) OVERRIDE;
 
+  // Method responsible for persistence of credentials. Enables overriding for

[Michael Courage, 2013/09/05 20:20:59]

I'd probably remove the first sentence here (PersistCredentials pretty much says
it all), or match the phrasing in the RevokeCredentials comment:
// Persists credentials for |account_id|.

The comma after "other cases" should go.

[fgorski, 2013/09/12 23:46:24]

Done.

+  // testing purposes, or other cases, when accessing the DB is not desired.
+  virtual void PersistCredentials(const std::string& account_id,
+                                  const std::string& refresh_token);
+
+  // Method responsible for clearing persisted credentials. Enables overriding
+  // for testing purposes, or other cases, when accessing the DB is not desired.
+  virtual void ClearPersistedCredentials(const std::string& account_id);
+
  private:
   FRIEND_TEST_ALL_PREFIXES(ProfileOAuth2TokenServiceTest,
                            StaleRefreshTokensNotCached);