| 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 205356329667f0e631b021bb7e8da80144990a47..31ea2d929b7aad9bcea89a8d8d92495f7565b580 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
|
| @@ -12,6 +12,7 @@ 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;
|
| @@ -63,11 +64,12 @@ public class SyncTest extends SyncTestBase {
|
| }
|
|
|
| /*
|
| + * @FlakyTest
|
| * @LargeTest
|
| * @Feature({"Sync"})
|
| - * BUG = crbug.com/588050
|
| + * BUG = crbug.com/588050, crbug.com/595893
|
| */
|
| - @FlakyTest
|
| + @DisabledTest
|
| public void testRename() throws InterruptedException {
|
| // The two accounts object that would represent the account rename.
|
| final Account oldAccount = setUpTestAccountAndSignInToSync();
|
|
|