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

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/UndoTabModelTest.java

 // Copyright 2015 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.tabmodel;
 
-import android.test.FlakyTest;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.FlakyTest;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
 import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content_public.browser.LoadUrlParams;
 
 import java.util.concurrent.TimeoutException;
 
 /**
@@ skipping 969 matching lines @@
      * 9.  CloseTab(1, allow undo)    [ 3s ]             [ 1 2 ]           [ 1 2 3s ]
      * 10. CommitClose(2)             [ 3s ]             [ 1 ]             [ 1 3s ]
      * 11. CancelClose(1)             [ 1 3s ]           -                 [ 1 3s ]
      * 12. CloseTab(3, allow undo)    [ 1s ]             [ 3 ]             [ 1s 3 ]
      * 13. CloseTab(1, allow undo)    -                  [ 1 3 ]           [ 1s 3 ]
      * 14. CommitAll                  -                  -                 -
      *
      * @throws InterruptedException
      */
     @MediumTest
-    @FlakyTest // crbug.com/592969
+    @FlakyTest(message = "crbug.com/592969")
     public void testOutOfOrder2() throws InterruptedException {
         TabModel model = getActivity().getTabModelSelector().getModel(false);
         ChromeTabCreator tabCreator = getActivity().getTabCreator(false);
         createTabOnUiThread(tabCreator);
         createTabOnUiThread(tabCreator);
         createTabOnUiThread(tabCreator);
 
         Tab tab0 = model.getTabAt(0);
         Tab tab1 = model.getTabAt(1);
         Tab tab2 = model.getTabAt(2);
@@ skipping 388 matching lines @@
         checkState(model, new Tab[] { tab1 }, tab1, EMPTY, fullList, tab1);
 
         // 3.
         saveStateOnUiThread(selector);
         fullList = new Tab[] { tab1 };
         checkState(model, new Tab[] { tab1 }, tab1, EMPTY, fullList, tab1);
         assertTrue(tab0.isClosing());
         assertFalse(tab0.isInitialized());
     }
 }