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 1f33d3469d0784978dc2764ba18ddc16683a9e60..2f1a51dfdba2e83eb1cade5f83084830003fe9fb 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,9 +13,6 @@ import android.accounts.Account; |
import android.app.Activity; |
import android.os.Bundle; |
-import org.chromium.base.BaseChromiumApplication; |
-import org.chromium.base.test.util.Feature; |
-import org.chromium.testing.local.LocalRobolectricTestRunner; |
import org.junit.After; |
import org.junit.Before; |
import org.junit.Test; |
@@ -25,6 +22,10 @@ import org.robolectric.annotation.Config; |
import org.robolectric.shadows.multidex.ShadowMultiDex; |
import org.robolectric.util.ActivityController; |
+import org.chromium.base.BaseChromiumApplication; |
+import org.chromium.base.test.util.Feature; |
+import org.chromium.testing.local.LocalRobolectricTestRunner; |
+ |
/** |
* Tests FirstRunFlowSequencer which contains the core logic of what should be shown during the |
* first run. |
@@ -60,8 +61,12 @@ public class FirstRunFlowSequencerTest { |
} |
@Override |
- public void onFlowIsKnown(Bundle freProperties) { |
+ public void onFlowIsKnown(Bundle freProperties, Runnable setUpPropertiesPostNative) { |
calledOnFlowIsKnown = true; |
+ if (setUpPropertiesPostNative != null) { |
+ setUpPropertiesPostNative.run(); |
+ freProperties.remove(FirstRunActivity.POST_NATIVE_SETUP_NEEDED); |
+ } |
returnedBundle = freProperties; |
} |
@@ -122,7 +127,10 @@ public class FirstRunFlowSequencerTest { |
@Before |
public void setUp() throws Exception { |
mActivityController = Robolectric.buildActivity(Activity.class); |
- mSequencer = new TestFirstRunFlowSequencer(mActivityController.setup().get(), new Bundle()); |
+ Bundle launchProperties = new Bundle(); |
+ launchProperties.putBoolean(FirstRunActivity.EXTRA_USE_FRE_FLOW_SEQUENCER, true); |
+ mSequencer = |
+ new TestFirstRunFlowSequencer(mActivityController.setup().get(), launchProperties); |
} |
@After |