Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.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.sync;
 
 import android.accounts.Account;
 import android.app.Activity;
+import android.content.Context;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Log;
 
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.identity.UniqueIdentificationGenerator;
 import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory;
 import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator;
+import org.chromium.chrome.browser.signin.AccountIdProvider;
 import org.chromium.chrome.shell.ChromeShellActivity;
 import org.chromium.chrome.shell.ChromeShellTestBase;
 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.sync.AndroidSyncSettings;
 import org.chromium.sync.internal_api.pub.base.ModelType;
@@ skipping 19 matching lines @@
     private MockAccountManager mAccountManager;
     private SyncController mSyncController;
     private FakeServerHelper mFakeServerHelper;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
         clearAppData();
 
+        // Setup fake mapper from accountNames to Ids.
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                if (AccountIdProvider.getInstance() != null) {
+                    return;
+                }
+
+                AccountIdProvider.setInstance(new AccountIdProvider() {
+                    public String getAccountId(Context ctx, String accountName) {
+                        return "gaia-id-" + accountName;
+                    }
+                });
+            }
+        });
+
         // Mock out the account manager on the device.
         mContext = new SyncTestUtil.SyncTestContext(getInstrumentation().getTargetContext());
         mAccountManager = new MockAccountManager(mContext, getInstrumentation().getContext());
         AccountManagerHelper.overrideAccountManagerHelperForTests(mContext, mAccountManager);
         MockSyncContentResolverDelegate syncContentResolverDelegate =
                 new MockSyncContentResolverDelegate();
         syncContentResolverDelegate.setMasterSyncAutomatically(true);
         AndroidSyncSettings.overrideForTests(mContext, syncContentResolverDelegate);
         // This call initializes the ChromeSigninController to use our test context.
         ChromeSigninController.get(mContext);
@@ skipping 229 matching lines @@
 
         SyncTestUtil.verifySyncIsSignedIn(mContext, defaultTestAccount);
         assertTrue("Sync everything should be enabled",
                 SyncTestUtil.isSyncEverythingEnabled(mContext));
     }
 
     private static ContentViewCore getContentViewCore(ChromeShellActivity activity) {
         return activity.getActiveContentViewCore();
     }
 }