Really mark SyncTest as disabled

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

 // Copyright 2013 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.test.FlakyTest;
 import android.util.Log;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.HostDrivenTest;
 import org.chromium.base.test.util.DisabledTest;
 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.test.util.browser.sync.SyncTestUtil;
 import org.chromium.chrome.testshell.ChromiumTestShellActivity;
@@ skipping 112 matching lines @@
             }
 
         };
         boolean hadExpectedStatus = CriteriaHelper.pollForCriteria(
                 checker, SyncTestUtil.UI_TIMEOUT_MS, SyncTestUtil.CHECK_INTERVAL_MS);
         assertTrue("Sync status not present on about sync page: " + expectedSyncSummary,
                 hadExpectedStatus);
     }
 
     @HostDrivenTest
-    /* http://crbug.com/311091 */
-    @FlakyTest
     public void testDisableAndEnableSync() throws InterruptedException {
         setupTestAccountAndSignInToSync(FOREIGN_SESSION_TEST_MACHINE_ID);
         Account account =
                 AccountManagerHelper.createAccountFromName(SyncTestUtil.DEFAULT_TEST_ACCOUNT);
 
         // Disabling Android sync should turn Chrome sync engine off.
         SyncStatusHelper.get(mContext).disableAndroidSync(account);
         SyncTestUtil.verifySyncIsDisabled(mContext, account);
 
         // Enabling Android sync should turn Chrome sync engine on.
@@ skipping 32 matching lines @@
         assertTrue("Sync everything should be enabled",
                 SyncTestUtil.isSyncEverythingEnabled(mContext));
     }
 
     private static ContentViewCore getContentViewCore(ChromiumTestShellActivity activity) {
         ContentView contentView = activity.getActiveContentView();
         if (contentView == null) return null;
         return contentView.getContentViewCore();
     }
 }