GAIA ID migration for Android

chrome/android/java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java b/chrome/android/java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java
index 68c9613e53d996e97edf2a48145570a3b296a42b..9825b28335638f913cc6d517d0cf51456ce0834a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java
@@ -7,9 +7,6 @@ package org.chromium.chrome.browser.services;
 import android.content.Context;
 import android.util.Log;
 
-import com.google.android.gms.auth.GoogleAuthException;
-import com.google.android.gms.auth.GoogleAuthUtil;
-
 import org.chromium.base.ApplicationState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ApplicationStatus.ApplicationStateListener;
@@ -22,8 +19,6 @@ import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.sync.SyncController;
 import org.chromium.sync.signin.ChromeSigninController;
 
-import java.io.IOException;
-
 /**
  * Starts and monitors various sync and Google services related tasks.
  * - add listeners to AccountManager.
@@ -90,20 +85,8 @@ public class GoogleServicesManager implements ApplicationStateListener {
                 signinManager.signOut(null, null);
             }
 
-            // AccountIdProvider might be already set in tests.
             if (AccountIdProvider.getInstance() == null) {
-                // Register account Id provider.
-                AccountIdProvider.setInstance(new AccountIdProvider() {
-                    @Override
-                    public String getAccountId(Context ctx, String accountName) {
-                        try {
-                            return GoogleAuthUtil.getAccountId(ctx, accountName);
-                        } catch (IOException | GoogleAuthException ex) {
-                            Log.e(TAG, "AccountIdProvider.getAccountId", ex);
-                            return null;
-                        }
-                    }
-                });
+                AccountIdProvider.setInstance(AccountIdProvider.getGoogleAccountIdProvider());
             }
 
             // Initialize sync.