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

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/PowerBroadcastReceiverTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/PowerBroadcastReceiverTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/PowerBroadcastReceiverTest.java
index 6102b1718623b6067ce57a5fc8c0028204d27475..cb27ba1a2c6077e864ea7f2e80530204485ee693 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/PowerBroadcastReceiverTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/PowerBroadcastReceiverTest.java
@@ -6,10 +6,10 @@ package org.chromium.chrome.browser;
 
 import android.content.Context;
 import android.content.Intent;
-import android.test.FlakyTest;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.FlakyTest;
 import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
 import org.chromium.chrome.test.util.ApplicationTestUtils;
 import org.chromium.content.browser.test.util.CallbackHelper;
@@ -115,7 +115,7 @@ public class PowerBroadcastReceiverTest extends ChromeTabbedActivityTestBase {
     /**
      * Check that the runnable gets posted and canceled when Main is sent to the background.
      */
-    @FlakyTest // https://crbug.com/579363
+    @FlakyTest(message = "https://crbug.com/579363")
     @MediumTest
     @Feature({"Omaha", "Sync"})
     public void testRunnableGetsCanceled() throws Exception {
@@ -140,7 +140,7 @@ public class PowerBroadcastReceiverTest extends ChromeTabbedActivityTestBase {
      */
     @MediumTest
     @Feature({"Omaha", "Sync"})
-    @FlakyTest  // https://crbug.com/587138
+    @FlakyTest(message = "https://crbug.com/587138")
     public void testRunnableGetsRunWhenScreenIsOn() throws Exception {
         // Claim the screen is off.
         mReceiver.setPowerManagerHelperForTests(sScreenOff);