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 507f6d44eef187a03432a47d25195ed9280f1a38..059783253002e3810beb012acd3cc6def210b09c 100644 |
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/PowerBroadcastReceiverTest.java |
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/PowerBroadcastReceiverTest.java |
@@ -8,6 +8,7 @@ import android.content.Context; |
import android.content.Intent; |
import android.test.suitebuilder.annotation.MediumTest; |
+import org.chromium.base.ThreadUtils; |
import org.chromium.base.test.util.Feature; |
import org.chromium.base.test.util.FlakyTest; |
import org.chromium.base.test.util.RetryOnFailure; |
@@ -15,6 +16,8 @@ import org.chromium.chrome.test.ChromeTabbedActivityTestBase; |
import org.chromium.chrome.test.util.ApplicationTestUtils; |
import org.chromium.content.browser.test.util.CallbackHelper; |
+import java.util.concurrent.Callable; |
+ |
/** |
* Tests for the PowerBroadcastReceiver. |
*/ |
@@ -84,8 +87,13 @@ public class PowerBroadcastReceiverTest extends ChromeTabbedActivityTestBase { |
public void setUp() throws Exception { |
super.setUp(); |
- ChromeApplication application = (ChromeApplication) getActivity().getApplication(); |
- mReceiver = application.getPowerBroadcastReceiver(); |
+ mReceiver = ThreadUtils.runOnUiThreadBlocking(new Callable<PowerBroadcastReceiver>() { |
+ @Override |
+ public PowerBroadcastReceiver call() throws Exception { |
+ return ChromeActivitySessionTracker.getInstance() |
+ .getPowerBroadcastReceiverForTesting(); |
+ } |
+ }); |
// Set up our mock runnable. |
mRunnable = new MockServiceRunnable(); |