GAIA ID migration for Android

chrome/browser/signin/oauth2_token_service_delegate_android.h

Index: chrome/browser/signin/oauth2_token_service_delegate_android.h
diff --git a/chrome/browser/signin/oauth2_token_service_delegate_android.h b/chrome/browser/signin/oauth2_token_service_delegate_android.h
index a35837d22c32a6e58eb45a8aa15b7b37f1b3e1b6..b398f844749231421563f665d869b7b8f0d48e89 100644
--- a/chrome/browser/signin/oauth2_token_service_delegate_android.h
+++ b/chrome/browser/signin/oauth2_token_service_delegate_android.h
@@ -14,6 +14,7 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
+#include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_token_service_delegate.h"
@@ -44,8 +45,6 @@ class OAuth2TokenServiceDelegateAndroid : public OAuth2TokenServiceDelegate {
   // accounts which requires special permission.
   static void set_is_testing_profile() { is_testing_profile_ = true; }
 
-  void Initialize();
-
   // OAuth2TokenServiceDelegate overrides:
   bool RefreshTokenIsAvailable(const std::string& account_id) const override;
   bool RefreshTokenHasError(const std::string& account_id) const override;
@@ -53,8 +52,8 @@ class OAuth2TokenServiceDelegateAndroid : public OAuth2TokenServiceDelegate {
                        const GoogleServiceAuthError& error) override;
   std::vector<std::string> GetAccounts() override;
 
-  // Lists account at the OS level.
-  std::vector<std::string> GetSystemAccounts();
+  // Lists account names at the OS level.
+  std::vector<std::string> GetSystemAccountNames();
 
   void ValidateAccounts(JNIEnv* env,
                         jobject obj,
@@ -87,9 +86,12 @@ class OAuth2TokenServiceDelegateAndroid : public OAuth2TokenServiceDelegate {
   // OA2TService aware accounts.
   void RevokeAllCredentials() override;
 
+  void LoadCredentials(const std::string& primary_account_id) override;
+
  protected:
   friend class ProfileOAuth2TokenServiceFactory;
-  OAuth2TokenServiceDelegateAndroid();
+  OAuth2TokenServiceDelegateAndroid(
+      AccountTrackerService* account_tracker_service);
   ~OAuth2TokenServiceDelegateAndroid() override;
 
   OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
@@ -112,12 +114,22 @@ class OAuth2TokenServiceDelegateAndroid : public OAuth2TokenServiceDelegate {
   void FireRefreshTokensLoaded() override;
 
  private:
+  std::string MapAccountIdToAccountName(const std::string& account_id) const;
+  std::string MapAccountNameToAccountId(const std::string& account_name) const;
+
   struct ErrorInfo {
     ErrorInfo();
     explicit ErrorInfo(const GoogleServiceAuthError& error);
     GoogleServiceAuthError error;
   };
 
+  enum RefreshTokenLoadStatus {
+    RT_LOAD_NOT_START,
+    RT_WAIT_FOR_VALIDATION,
+    RT_HAS_BEEN_VALIDATED,
+    RT_LOADED
+  };
+
   // Return whether |signed_in_account| is valid and we have access
   // to all the tokens in |curr_account_ids|. If |force_notifications| is true,
   // TokenAvailable notifications will be sent anyway, even if the account was
@@ -134,6 +146,9 @@ class OAuth2TokenServiceDelegateAndroid : public OAuth2TokenServiceDelegate {
   // Maps account_id to the last error for that account.
   std::map<std::string, ErrorInfo> errors_;
 
+  AccountTrackerService* account_tracker_service_;
+  RefreshTokenLoadStatus fire_refresh_token_loaded_;
+
   static bool is_testing_profile_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2TokenServiceDelegateAndroid);