Make sure GetAuthenticatedAccountId() returns a canonicalized id.

sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java

 // Copyright 2011 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.sync.signin;
 
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerFuture;
 import android.accounts.AuthenticatorDescription;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.net.NetworkChangeNotifier;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
 
 /**
  * AccountManagerHelper wraps our access of AccountManager in Android.
  *
  * Use the AccountManagerHelper.get(someContext) to instantiate it
  */
 public class AccountManagerHelper {
 
     private static final String TAG = "AccountManagerHelper";
 
+    private static final Pattern AT_SYMBOL = Pattern.compile("@");
+
+    private static final String GMAIL_COM = "gmail.com";
+
+    private static final String GOOGLEMAIL_COM = "googlemail.com";
+
     public static final String GOOGLE_ACCOUNT_TYPE = "com.google";
 
     private static final Object sLock = new Object();
 
     private static final int MAX_TRIES = 3;
 
     private static AccountManagerHelper sAccountManagerHelper;
 
     private final AccountManagerDelegate mAccountManager;
 
@@ skipping 63 matching lines @@
     }
 
     public Account[] getGoogleAccounts() {
         return mAccountManager.getAccountsByType(GOOGLE_ACCOUNT_TYPE);
     }
 
     public boolean hasGoogleAccounts() {
         return getGoogleAccounts().length > 0;
     }
 
+    private String canonicalizeName(String name) {
+        String[] parts = AT_SYMBOL.split(name);
+        if (parts.length != 2) return name;
+
+        if (GOOGLEMAIL_COM.equalsIgnoreCase(parts[1])) {
+            parts[1] = GMAIL_COM;
+        }
+        if (GMAIL_COM.equalsIgnoreCase(parts[1])) {
+            parts[0] = parts[0].replace(".", "");
+        }
+        return (parts[0] + "@" + parts[1]).toLowerCase(Locale.US);
+    }
+
     /**
      * Returns the account if it exists, null otherwise.
      */
     public Account getAccountFromName(String accountName) {
-        Account[] accounts = mAccountManager.getAccountsByType(GOOGLE_ACCOUNT_TYPE);
+        String canonicalName = canonicalizeName(accountName);
+        Account[] accounts = getGoogleAccounts();
         for (Account account : accounts) {
-            if (account.name.equals(accountName)) {
+            if (canonicalizeName(account.name).equals(canonicalName)) {
                 return account;
             }
         }
         return null;
     }
 
     /**
      * Returns whether the accounts exists.
      */
     public boolean hasAccountForName(String accountName) {
@@ skipping 201 matching lines @@
             null, account, authTokenType, callback, numTries, errorEncountered, null);
     }
 
     /**
      * Removes an auth token from the AccountManager's cache.
      */
     public void invalidateAuthToken(String authToken) {
         mAccountManager.invalidateAuthToken(GOOGLE_ACCOUNT_TYPE, authToken);
     }
 }