| Index: chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
|
| index e7f5d90629b839c391ded7bc5c382f943e63e4fc..718415023c86b7299456d15fb6b2c4a603311b3c 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
|
| @@ -6,7 +6,6 @@ package org.chromium.chrome.browser.sync;
|
|
|
| import android.accounts.Account;
|
| import android.app.Activity;
|
| -import android.test.FlakyTest;
|
| import android.util.Log;
|
|
|
| import org.chromium.base.ThreadUtils;
|
| @@ -139,8 +138,6 @@ public class SyncTest extends ChromiumTestShellTestBase {
|
| }
|
|
|
| @HostDrivenTest
|
| - /* http://crbug.com/311091 */
|
| - @FlakyTest
|
| public void testDisableAndEnableSync() throws InterruptedException {
|
| setupTestAccountAndSignInToSync(FOREIGN_SESSION_TEST_MACHINE_ID);
|
| Account account =
|
|
|