| Index: chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java
|
| diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java
|
| index 4b4d403a97467520cf4a30f9a05592fae7b756f8..c220361df0c0079cd1b22f28ae6d215d16dbe2a7 100644
|
| --- a/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java
|
| +++ b/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java
|
| @@ -13,7 +13,10 @@
|
| import android.app.Activity;
|
| import android.os.Bundle;
|
|
|
| +import org.chromium.base.ActivityState;
|
| +import org.chromium.base.ApplicationStatus;
|
| import org.chromium.base.BaseChromiumApplication;
|
| +import org.chromium.base.test.shadows.ShadowMultiDex;
|
| import org.chromium.base.test.util.Feature;
|
| import org.chromium.testing.local.LocalRobolectricTestRunner;
|
| import org.junit.After;
|
| @@ -22,7 +25,6 @@
|
| import org.junit.runner.RunWith;
|
| import org.robolectric.Robolectric;
|
| import org.robolectric.annotation.Config;
|
| -import org.robolectric.shadows.multidex.ShadowMultiDex;
|
| import org.robolectric.util.ActivityController;
|
|
|
| /**
|
| @@ -128,6 +130,11 @@
|
| @After
|
| public void tearDown() {
|
| mActivityController.pause().stop().destroy();
|
| +
|
| + // TODO(jbudorick): Remove this once we roll to Robolectric 3.0, which should contain
|
| + // https://github.com/robolectric/robolectric/pull/1479
|
| + ApplicationStatus.onStateChangeForTesting(mActivityController.get(),
|
| + ActivityState.DESTROYED);
|
| }
|
|
|
| @Test
|
|
|