Revert of 🔍 Don't display the search engine until First Run completes

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 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;
 
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 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.FirstRunActivity.FirstRunActivityObserver;
 import org.chromium.chrome.browser.firstrun.FirstRunFlowSequencer;
 import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
 import org.chromium.chrome.browser.preferences.Preferences;
 import org.chromium.chrome.browser.signin.AccountManagementFragment;
 import org.chromium.chrome.test.util.ActivityUtils;
 import org.chromium.chrome.test.util.browser.signin.SigninTestUtil;
 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 
-import java.util.concurrent.TimeoutException;
-
 /**
  * Tests for the first run experience.
  */
 @CommandLineFlags.Remove(ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE)
 @RetryOnFailure  // crbug.com/637448
 public class FirstRunTest extends SyncTestBase {
     private static final String TEST_ACTION = "com.artificial.package.TEST_ACTION";
 
     private static enum ShowSettings {
         YES,
         NO;
     }
 
-    private static final class TestObserver implements FirstRunActivityObserver {
-        public final CallbackHelper flowIsKnownCallback = new CallbackHelper();
-
-        @Override
-        public void onFlowIsKnown() {
-            flowIsKnownCallback.notifyCalled();
-        }
-
-        @Override
-        public void onAcceptTermsOfService() {}
-
-        @Override
-        public void onJumpToPage(int position) {}
-
-        @Override
-        public void onUpdateCachedEngineName() {}
-
-        @Override
-        public void onAbortFirstRunExperience() {}
-    }
-
-    private final TestObserver mTestObserver = new TestObserver();
     private FirstRunActivity mActivity;
 
     @Override
     public void startMainActivity() throws InterruptedException {
-        FirstRunActivity.setObserverForTest(mTestObserver);
-
         // 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());
@@ skipping 11 matching lines @@
         });
 
         // 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;
 
-        try {
-            mTestObserver.flowIsKnownCallback.waitForCallback(0);
-        } catch (TimeoutException e) {
-            fail();
-        }
+        CriteriaHelper.pollUiThread(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mActivity.isPostNativePageSequenceCreated();
+            }
+        });
 
         getInstrumentation().waitForIdleSync();
     }
 
     @Override
-    public void setUp() throws Exception {
-        super.setUp();
-    }
-
-    @Override
     public void tearDown() throws Exception {
         if (mActivity != null) mActivity.finish();
         super.tearDown();
     }
 
     // Test that signing in through FirstRun signs in and starts sync.
     /*
      * @SmallTest
      * @Feature({"Sync"})
      */
@@ skipping 86 matching lines @@
 
     private void processFirstRunOnUiThread() {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 FirstRunSignInProcessor.start(mActivity);
             }
         });
     }
 }