Fix SyncTest#testRename

chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
index fe143b74c9dd9cbf03e65f70177291799a126776..e2e7fa1acec15e73a0acaf8510da8151404c1995 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
@@ -11,7 +11,6 @@ import android.test.suitebuilder.annotation.LargeTest;
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.signin.AccountIdProvider;
@@ -62,9 +61,8 @@ public class SyncTest extends SyncTestBase {
         SyncTestUtil.verifySyncIsActiveForAccount(mContext, account);
     }
 
-    // @LargeTest
-    // @Feature({"Sync"})
-    @DisabledTest
+    @LargeTest
+    @Feature({"Sync"})
     public void testRename() throws InterruptedException {
         // The two accounts object that would represent the account rename.
         final Account oldAccount = setUpTestAccountAndSignInToSync();
@@ -78,6 +76,7 @@ public class SyncTest extends SyncTestBase {
                 // real account rename events instead of the mocks.
                 MockChangeEventChecker eventChecker = new MockChangeEventChecker();
                 eventChecker.insertRenameEvent(oldAccount.name, newAccount.name);
+                SigninHelper.resetAccountRenameEventIndex(mContext);
                 SigninHelper.updateAccountRenameData(mContext, eventChecker);
 
                 // Tell the fake content resolver that a rename had happen and copy over the sync
@@ -88,8 +87,9 @@ public class SyncTest extends SyncTestBase {
                 // Inform the AccountTracker, these would normally be done by account validation
                 // or signin. We will only be calling the testing versions of it.
                 AccountIdProvider provider = AccountIdProvider.getInstance();
-                String[] accountNames = {newAccount.name};
-                String[] accountIds = {provider.getAccountId(mContext, accountNames[0])};
+                String[] accountNames = {oldAccount.name, newAccount.name};
+                String[] accountIds = {provider.getAccountId(mContext, accountNames[0]),
+                                       provider.getAccountId(mContext, accountNames[1])};
                 AccountTrackerService.get(mContext).syncForceRefreshForTest(
                         accountIds, accountNames);