Mark SyncTest#testDisableAndEnableSync as flaky.

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

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 718415023c86b7299456d15fb6b2c4a603311b3c..e7f5d90629b839c391ded7bc5c382f943e63e4fc 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,6 +6,7 @@ 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;
@@ -138,6 +139,8 @@ public class SyncTest extends ChromiumTestShellTestBase {
     }
 
     @HostDrivenTest
+    /* http://crbug.com/311091 */
+    @FlakyTest

[Peter Beverloo, 2013/10/24 11:12:35]

I *think* we can only have one @*Test annotation, but commenting out
@HostDrivenTest would change the test runner this would be run with, which is
not the intended affect.

Marcus, is this the right way of annotating a host driven test as being flaky?

     public void testDisableAndEnableSync() throws InterruptedException {
         setupTestAccountAndSignInToSync(FOREIGN_SESSION_TEST_MACHINE_ID);
         Account account =