Mark sync.FirstRunTest#testSignIn flaky

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

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java
index fb67e4c5c47e8308a9a15edea5b20ebeeaa6d78f..968dad4eaae5a0ac8f62bccf75b9d98c4cf40d24 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java
@@ -10,8 +10,8 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.FlakyTest;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.firstrun.FirstRunActivity;
 import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
@@ -41,8 +41,11 @@ public class FirstRunTest extends SyncTestBase {
     }
 
     // Test that signing in through FirstRun signs in and starts sync.
-    @SmallTest
-    @Feature({"Sync"})
+    /*
+     * @SmallTest
+     * @Feature({"Sync"})
+     */
+    @FlakyTest(message = "https://crbug.com/616456")
     public void testSignIn() throws Exception {
         Account testAccount = SigninTestUtil.addTestAccount();
         assertNull(SigninTestUtil.getCurrentAccount());
@@ -55,10 +58,11 @@ public class FirstRunTest extends SyncTestBase {
 
     // Test that signing in and opening settings through FirstRun signs in and doesn't fully start
     // sync until the settings page is closed.
-    // Disabled due to flakiness. See crbug.com/616456
-    // @SmallTest
-    // @Feature({"Sync"})
-    @DisabledTest
+    /*
+     * @SmallTest
+     * @Feature({"Sync"})
+     */
+    @FlakyTest(message = "https://crbug.com/616456")
     public void testSignInWithOpenSettings() throws Exception {
         final Account testAccount = SigninTestUtil.addTestAccount();
         final Preferences prefActivity = processFirstRun(testAccount.name, ShowSettings.YES);