🔍 More consistent first run triggering

chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java
index a09735cdcc27a66b6f243b777c54f51f019c1511..ca0ab6569be36e69765e257c3e81720e0f0533cb 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java
@@ -5,6 +5,11 @@
 package org.chromium.chrome.browser.sync;
 
 import android.accounts.Account;
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.app.Instrumentation.ActivityMonitor;
+import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.test.filters.SmallTest;
 
@@ -15,7 +20,9 @@ import org.chromium.base.test.util.FlakyTest;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.firstrun.FirstRunActivity;
+import org.chromium.chrome.browser.firstrun.FirstRunFlowSequencer;
 import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
+import org.chromium.chrome.browser.firstrun.FirstRunStatus;
 import org.chromium.chrome.browser.preferences.Preferences;
 import org.chromium.chrome.browser.signin.AccountManagementFragment;
 import org.chromium.chrome.test.util.ActivityUtils;
@@ -30,16 +37,68 @@ import org.chromium.content.browser.test.util.CriteriaHelper;
 @CommandLineFlags.Remove(ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE)

[Ted C, 2017/04/21 04:41:42]

Hmm...we have this and yet we start first run.  Why?  Is it because
ChromeTabbedActivity forces first run to complete?  Should we just change the
logic or whether FRE needs to be completed in
AsyncInitActivity/ChromeTabbedActivity to check for this?

[gone, 2017/04/21 17:05:06]

Little lost... are you asking why this flag is being removed?  I was looking
into why this suite screwed up some other things, like why I have to explicitly
mark First Run as being incomplete in setUp().  That check is performed after
the command line check.

[Ted C, 2017/04/21 17:13:12]

No, I'm confused why we have this flag and then do a bunch of stuff that
seems to undo it.

I guess, what was failing in this suite?  I don't see why your changes should
have broken anything.

[gone, 2017/04/21 17:15:55]

Oh.  It's a SyncTestBase subclass.  It extends
ChromeActivityTestCaseBase<ChromeTabbedActivity>, so it tries to start up
ChromeTabbedActivity, which automatically shuts itself back down.  It never
actually _needed_ to, though, so now I'm making it start FirstRunActivity. 
Ideally I'd make the base class run FirstRunActivity instead, but it's used
elsewhere.  The alternative is refactor the base class to pull out all of its
functions into something else.

[Ted C, 2017/04/21 21:47:19]

BAH...I thought this file was ADDing the command line switch but it is in fact
removing it.  So previously, this worked because CTA would start an FRE on top
of itself?  But now it kills itself and triggers an FRE instead.  Gotcha.

 @RetryOnFailure  // crbug.com/637448
 public class FirstRunTest extends SyncTestBase {
-    private static final String TAG = "FirstRunTest";
+    private static final String TEST_ACTION = "com.artificial.package.TEST_ACTION";
 
-    private enum ShowSettings {
+    private static enum ShowSettings {
         YES,
         NO;
     }
 
+    private FirstRunActivity mActivity;
+
+    @Override
+    public void setUp() throws Exception {
+        FirstRunStatus.setFirstRunFlowComplete(false);
+        super.setUp();
+    }
+
     @Override
     public void startMainActivity() throws InterruptedException {
-        startMainActivityFromLauncher();
+        // Starts up and waits for the FirstRunActivity to be ready.
+        // This isn't exactly what startMainActivity is supposed to be doing, but short of a
+        // refactoring of SyncTestBase to use something other than ChromeTabbedActivity, it's the
+        // only way to reuse the rest of the setup and initialization code inside of it.
+        final Instrumentation instrumentation = getInstrumentation();
+        final Context context = instrumentation.getTargetContext();
+
+        // Create an Intent that causes Chrome to run.
+        final Intent intent = new Intent(TEST_ACTION);
+        intent.setPackage(context.getPackageName());
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        // Start the FRE.
+        final ActivityMonitor freMonitor =
+                new ActivityMonitor(FirstRunActivity.class.getName(), null, false);
+        instrumentation.addMonitor(freMonitor);
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                FirstRunFlowSequencer.launch(context, intent, false);
+            }
+        });
+
+        // Wait for the FRE to be ready to use.
+        Activity activity =
+                freMonitor.waitForActivityWithTimeout(CriteriaHelper.DEFAULT_MAX_TIME_TO_POLL);
+        instrumentation.removeMonitor(freMonitor);
+
+        assertTrue(activity instanceof FirstRunActivity);
+        mActivity = (FirstRunActivity) activity;
+
+        CriteriaHelper.pollUiThread(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mActivity.isPostNativePageSequenceCreated();
+            }
+        });
+
+        getInstrumentation().waitForIdleSync();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        if (mActivity != null) mActivity.finish();
+        super.tearDown();
     }
 
     // Test that signing in through FirstRun signs in and starts sync.
@@ -138,7 +197,7 @@ public class FirstRunTest extends SyncTestBase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                FirstRunSignInProcessor.start(getActivity());
+                FirstRunSignInProcessor.start(mActivity);
             }
         });
     }