Delay fetching account info until OnRefreshTokensLoaded().

google_apis/gaia/oauth2_token_service_delegate.h

 // Copyright 2015 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 GOOGLE_APIS_GAIA_OAUTH2_TOKEN_SERVICE_DELEGATE_H_
 #define GOOGLE_APIS_GAIA_OAUTH2_TOKEN_SERVICE_DELEGATE_H_
 
 #include "base/observer_list.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/oauth2_token_service.h"
@@ skipping 36 matching lines @@
                                  const std::string& refresh_token) {}
   virtual void RevokeCredentials(const std::string& account_id) {}
   virtual net::URLRequestContextGetter* GetRequestContext() const;
 
   bool ValidateAccountId(const std::string& account_id) const;
 
   // Add or remove observers of this token service.
   void AddObserver(OAuth2TokenService::Observer* observer);
   void RemoveObserver(OAuth2TokenService::Observer* observer);
 
+  // Android uses the account name for identifying the account whereas Chrome
+  // uses the account id. This mapping needs to be seeded usage.

[nyquist, 2015/10/15 19:33:45]

The last sentence here seems a bit off. Do you mean that we need to seed the
account id <-> name map if necessary, i.e. this method returns true?

+  virtual bool NeedsAccountIdNameMap() const;
+
  protected:
   // Called by subclasses to notify observers.
   virtual void FireRefreshTokenAvailable(const std::string& account_id);
   virtual void FireRefreshTokenRevoked(const std::string& account_id);
   virtual void FireRefreshTokensLoaded();
 
   // Helper class to scope batch changes.
   class ScopedBatchChange {
    public:
     explicit ScopedBatchChange(OAuth2TokenServiceDelegate* delegate);
@@ skipping 18 matching lines @@
   void StartBatchChanges();
   void EndBatchChanges();
 
   // The depth of batch changes.
   int batch_change_depth_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2TokenServiceDelegate);
 };
 
 #endif  // GOOGLE_APIS_GAIA_OAUTH2_TOKEN_SERVICE_DELEGATE_H_