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

chrome/browser/signin/profile_oauth2_token_service.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_H_
 #define CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
@@ skipping 41 matching lines @@
   // Initializes this token service with the profile.
   virtual void Initialize(Profile* profile);
 
   // BrowserContextKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
   // SigninGlobalError::AuthStatusProvider implementation.
   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();

[Andrew T Wilson (Slow), 2013/09/03 14:04:24]

Roger seemed to think maybe this should live elsewhere (like maybe in
SigninManager?) - I'm fine with this here, but maybe ping him?

[Roger Tawa OOO till Jul 10th, 2013/09/03 21:06:42]

As a public api, seems like its better if it live with SM.  Or maybe a static
like:

static std::string XXX::GetPrimaryAccount(Profile* profile);

where XXX could be SigninManager or something else.

[fgorski, 2013/09/03 23:29:25]

OK, I'll make a change tomorrow and retest everything. There are might be places
thou, where we are not using SigninManager explicitly yet, and direct dependency
will have to be added (through header file inclusion).

+
+  // 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.
   void UpdateCredentials(const std::string& account_id,
                          const std::string& refresh_token);
 
   // Revokes credentials related to |account_id|.
   void RevokeCredentials(const std::string& account_id);
 
   // Revokes all credentials handled by the object.
   void RevokeAllCredentials();
 
   SigninGlobalError* signin_global_error() {
     return signin_global_error_.get();
   }
 
   const SigninGlobalError* signin_global_error() const {
     return signin_global_error_.get();
   }
 
   Profile* profile() const { return profile_; }
 
  protected:
   friend class ProfileOAuth2TokenServiceFactory;
   ProfileOAuth2TokenService();
   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
   // logs back in with a different account, then any in-flight token
   // fetches will be for the old account's refresh token.  Therefore
   // when they come back, they shouldn't be cached.
   virtual void RegisterCacheEntry(const std::string& refresh_token,
                                   const ScopeSet& scopes,
                                   const std::string& access_token,
                                   const base::Time& expiration_date) OVERRIDE;
@@ skipping 43 matching lines @@
   // The auth status from the most-recently-completed request.
   GoogleServiceAuthError last_auth_error_;
 
   // Registrar for notifications from the TokenService.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileOAuth2TokenService);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_H_