GAIA ID migration for Android

chrome/android/java/src/org/chromium/chrome/browser/signin/AccountIdProvider.java

 // Copyright 2014 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.
 
 package org.chromium.chrome.browser.signin;
 
 import android.content.Context;
 
+import com.google.android.gms.auth.GoogleAuthException;
+import com.google.android.gms.auth.GoogleAuthUtil;
+
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 
+import java.io.IOException;
+
 /**
  * Returns a stable id that can be used to identify a Google Account.  This
  * id does not change if the email address associated to the account changes,
  * nor does it change depending on whether the email has dots or varying
  * capitalization.
  */
 public abstract class AccountIdProvider {
     private static AccountIdProvider sProvider;
 
     /**
@@ skipping 22 matching lines @@
 
     /**
      * Gets the global account Id provider.
      */
     public static AccountIdProvider getInstance() {
         ThreadUtils.assertOnUiThread();
         return sProvider;
     }
 
     /**
+    * Gets the Google Account Id Provider.
+    */
+    public static AccountIdProvider getGoogleAccountIdProvider() {
+        return new AccountIdProvider() {
+            @Override
+            public String getAccountId(Context ctx, String accountName) {
+                try {
+                    return GoogleAuthUtil.getAccountId(ctx, accountName);
+                } catch (IOException | GoogleAuthException ex) {
+                    return null;
+                }
+            }
+        };
+    }

[Roger Tawa OOO till Jul 10th, 2015/08/12 15:28:46]

What is the reason for moving this code?  If the implementation should live
here, then should probably create the instance in getInstance() and then remove
the method getGoogleAccountIdProvider().

[gogerald1, 2015/08/13 18:12:12]

Acknowledged.

+
+    /**
      * For testing purposes only, allows to set the provider even if it has already been
      * initialized.
      */
     @VisibleForTesting
     public static void setInstanceForTest(AccountIdProvider provider) {
         sProvider = provider;
     }
 }