Change all FlakyTest import to use org.chromium.base.test.util.FlakyTest

chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
index 914deec1c5e3ac9884f0ad333a878c86477db3cc..929aa28032a3a852062f8ee1ad1412d4fb13f9ad 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
@@ -11,7 +11,6 @@ import android.content.pm.ActivityInfo;
 import android.os.Debug;
 import android.os.Environment;
 import android.os.SystemClock;
-import android.test.FlakyTest;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
@@ -27,6 +26,7 @@ import org.chromium.base.annotations.SuppressFBWarnings;
 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.base.test.util.Restriction;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.R;
@@ -409,12 +409,11 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
      * Verify close button works in the TabSwitcher in landscape mode.
      * This code does not handle properly different screen densities.
      * @throws InterruptedException
-     * Bug: crbug.com/170179
      * @Restriction({RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
      * @LargeTest
      * @Feature({"Android-TabSwitcher"})
      */
-    @FlakyTest
+    @FlakyTest(message = "crbug.com/170179")
     public void testTabSwitcherLandscapeCloseButton() throws InterruptedException {
         getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         // Hard-coded coordinates of the close button on the bottom left of the screen.
@@ -491,9 +490,8 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
      * @EnormousTest
      * @TimeoutScale(30)
      * @Feature({"Navigation"})
-     * crbug/223110
      */
-    @FlakyTest
+    @FlakyTest(message = "crbug.com/223110")
     public void testOpenManyTabsAtOnce10() throws InterruptedException {
         openAndVerifyManyTestTabs(10);
     }
@@ -620,11 +618,10 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
      * Verifies that the tab are actually stacking at the bottom and top of the screen.
      */
     /**
-     * Bug: crbug.com/170179
      * @LargeTest
      * @Feature({"Android-TabSwitcher"})
      */
-    @FlakyTest
+    @FlakyTest(message = "crbug.com/170179")
     @Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
     public void testTabsStacking() throws InterruptedException {
         final int count = openTabs(12, false);
@@ -686,11 +683,10 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
      * Verify that switching back and forth to the tabswitcher does not leak memory.
      */
     /**
-     * Bug: crbug.com/303319
      * @LargeTest
      * @Feature({"Android-TabSwitcher"})
      */
-    @FlakyTest
+    @FlakyTest(message = "crbug.com/303319")
     @Restriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
     public void testTabSwitcherMemoryLeak() throws InterruptedException {
         openTabs(4, true);
@@ -759,11 +755,10 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
     }
 
     /**
-     * Bug: crbug.com/170179
      * @LargeTest
      * @Feature({"Android-TabSwitcher"})
      */
-    @FlakyTest
+    @FlakyTest(message = "crbug.com/170179")
     @Restriction({ChromeRestriction.RESTRICTION_TYPE_PHONE, RESTRICTION_TYPE_NON_LOW_END_DEVICE})
     public void testTabSelectionLandscape() throws InterruptedException {
         getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);