Revert "Reland "[Omnibox] Use ActivityState to check if we are in browser mode""

This reverts commit 5ae112d1.

Reason for revert: still flaky
https://test-results.appspot.com/dashboards/flakiness_dashboard.html#showAllRuns=true&testType=chrome_public_test_apk%20(with%20patch)&tests=org.chromium.chrome.browser.omnibox.suggestions.SwitchToTabTest%23testSwitchToTabInSearchActivity

Original change's description:
> Reland "[Omnibox] Use ActivityState to check if we are in browser mode"
> 
> This is a reland of be1e9636
> 
> Update the test to run on UI thread.
> 
> Original change's description:
> > [Omnibox] Use ActivityState to check if we are in browser mode
> >
> >
> > In multi windows mode, check if we are in browser mode by WindowAndroid
> > is not working, should check ActivityState instead.
> >
> > Bug: 1102640
> > Change-Id: I35a720a2aa6f337cc9f9ae43e39d83c9368fcb5a
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2286478
> > Commit-Queue: Gang Wu <gangwu@chromium.org>
> > Reviewed-by: Ted Choc <tedchoc@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#786636}
> 
> Bug: 1102640
> Change-Id: Iefba5a5d0c181535bd7fb86cf0e073be2ebdbcdb
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2293074
> Reviewed-by: Ted Choc <tedchoc@chromium.org>
> Commit-Queue: Gang Wu <gangwu@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#788816}

TBR=tedchoc@chromium.org,gangwu@chromium.org

Change-Id: Ie40eb459891875511457c2f0ddf86a8452db396e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1102640
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2301283Reviewed-by: Gang Wu <gangwu@chromium.org>
Commit-Queue: Gang Wu <gangwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788916}

chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java

@@ -20,7 +20,6 @@ import androidx.annotation.Px;
 import androidx.annotation.StringRes;
 import androidx.annotation.VisibleForTesting;
 
-import org.chromium.base.ActivityState;
 import org.chromium.base.Callback;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.IntentUtils;
@@ -579,8 +578,7 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, StartStopWi
         // When invoked directly from a browser, we want to trigger switch to tab animation.
         // If invoded from other activitiies, ex. searchActivity, we do not need to trigger the
         // animation since Android will show the animation for switching apps.
-        if (tab.getWindowAndroid().getActivityState() != ActivityState.STOPPED
-                && tab.getWindowAndroid().getActivityState() != ActivityState.DESTROYED) {
+        if (mWindowAndroid.equals(tab.getWindowAndroid())) {
             // TODO(1097292):  Do not use Activity to get TabModelSelector.
             assert tab.getWindowAndroid().getActivity().get() instanceof ChromeActivity;
 
@@ -591,13 +589,13 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, StartStopWi
             chromeActivity.getTabModelSelector().getCurrentModel().setIndex(
                     tabIndex, TabSelectionType.FROM_OMNIBOX);
         } else {
-            // Browser is in background, bring to to foreground and switch to the tab.
             Intent newIntent = ChromeIntentUtil.createBringTabToFrontIntent(tab.getId());
             if (newIntent != null) {
                 newIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 IntentUtils.safeStartActivity(ContextUtils.getApplicationContext(), newIntent);
             }
         }
+
         recordMetrics(position, WindowOpenDisposition.SWITCH_TO_TAB, suggestion);
     }
 

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/suggestions/SwitchToTabTest.java

@@ -8,6 +8,7 @@ import android.app.Activity;
 import android.app.Instrumentation;
 import android.app.Instrumentation.ActivityMonitor;
 import android.content.Intent;
+import android.os.Build;
 import android.support.test.InstrumentationRegistry;
 import android.util.Pair;
 import android.view.ViewGroup;
@@ -23,9 +24,8 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.chromium.base.ActivityState;
-import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.base.test.util.DisableIf;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
@@ -42,7 +42,6 @@ import org.chromium.chrome.test.util.WaitForFocusHelper;
 import org.chromium.chrome.test.util.browser.Features.EnableFeatures;
 import org.chromium.content_public.browser.test.util.Criteria;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
-import org.chromium.content_public.browser.test.util.CriteriaNotSatisfiedException;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.content_public.browser.test.util.TestTouchUtils;
 import org.chromium.net.test.EmbeddedTestServer;
@@ -95,47 +94,30 @@ public class SwitchToTabTest {
      *
      * @param activity The Activity which url_bar is in.
      * @param locationBarLayout The layout which omnibox suggestions will show in.
-     * @param input The text will be typed into url_bar.
-     * @param expectedMatchUrl The expected url to visit after clicking tab switch button.
+     * @param text The text will be typed into url_bar.
      */
-    private void typeAndClickMatchingTabMatchSuggestion(Activity activity,
-            LocationBarLayout locationBarLayout, String input, String expectedMatchUrl)
-            throws InterruptedException {
+    private void typeAndWaitForTabMatchSuggestions(Activity activity,
+            LocationBarLayout locationBarLayout, String input) throws InterruptedException {
         typeInOmnibox(activity, input);
 
         OmniboxTestUtils.waitForOmniboxSuggestions(locationBarLayout);
         // waitForOmniboxSuggestions only wait until one suggestion shows up, we need to wait util
         // autocomplete return more suggestions.
         CriteriaHelper.pollUiThread(() -> {
-            Pair<Integer, OmniboxSuggestion> matchSuggestion =
-                    findFirstTabMatchOmniboxSuggestion(locationBarLayout);
-
-            Criteria.checkThat(matchSuggestion.first, Matchers.not(INVALID_INDEX));
-            Criteria.checkThat(
-                    matchSuggestion.second.getUrl().getSpec(), Matchers.is(expectedMatchUrl));
-
-            OmniboxSuggestionsDropdown suggestionsDropdown =
-                    AutocompleteCoordinatorTestUtils.getSuggestionsDropdown(
-                            locationBarLayout.getAutocompleteCoordinator());
-            try {
-                clickSuggestionActionAt(suggestionsDropdown, matchSuggestion.first);
-            } catch (InterruptedException e) {
-                throw new CriteriaNotSatisfiedException(e);
-            }
+            Criteria.checkThat(findFirstTabMatchOmniboxSuggestion(locationBarLayout).first,
+                    Matchers.not(INVALID_INDEX));
         });
     }
 
     /**
      * Find the first switch to tab suggestion in the omnibox suggestion list, and return the
-     * suggestion and its index. This method needs to run on the UI thread.
+     * suggestion and its index.
      *
      * @param locationBarLayout The layout which omnibox suggestions will show in.
-     * @return The first switch to tab suggestion's index, and the suggesstion.
+     * @return The the first switch to tab suggestion's index, and the suggesstion.
      */
     private Pair<Integer, OmniboxSuggestion> findFirstTabMatchOmniboxSuggestion(
             LocationBarLayout locationBarLayout) {
-        ThreadUtils.assertOnUiThread();
-
         OmniboxSuggestionsDropdown suggestionsDropdown =
                 AutocompleteCoordinatorTestUtils.getSuggestionsDropdown(
                         locationBarLayout.getAutocompleteCoordinator());
@@ -189,6 +171,9 @@ public class SwitchToTabTest {
 
     @Test
     @MediumTest
+    @DisableIf.Build(message = "https://crbug.com/1101433",
+            sdk_is_greater_than = Build.VERSION_CODES.LOLLIPOP_MR1,
+            sdk_is_less_than = Build.VERSION_CODES.N)
     @EnableFeatures("OmniboxTabSwitchSuggestions")
     public void
     testSwitchToTabSuggestion() throws InterruptedException {
@@ -204,8 +189,20 @@ public class SwitchToTabTest {
 
         LocationBarLayout locationBarLayout =
                 (LocationBarLayout) mActivityTestRule.getActivity().findViewById(R.id.location_bar);
-        typeAndClickMatchingTabMatchSuggestion(
-                mActivityTestRule.getActivity(), locationBarLayout, "about", testHttpsUrl1);
+        typeAndWaitForTabMatchSuggestions(
+                mActivityTestRule.getActivity(), locationBarLayout, "about");
+
+        Pair<Integer, OmniboxSuggestion> matchSuggestion =
+                findFirstTabMatchOmniboxSuggestion(locationBarLayout);
+
+        Assert.assertNotEquals(INVALID_INDEX, (int) matchSuggestion.first);
+        Assert.assertNotNull("No Switch to Tab suggestion returned.", matchSuggestion.second);
+        Assert.assertEquals(matchSuggestion.second.getUrl().getSpec(), testHttpsUrl1);
+
+        OmniboxSuggestionsDropdown suggestionsDropdown =
+                AutocompleteCoordinatorTestUtils.getSuggestionsDropdown(
+                        locationBarLayout.getAutocompleteCoordinator());
+        clickSuggestionActionAt(suggestionsDropdown, (int) matchSuggestion.first);
 
         CriteriaHelper.pollUiThread(() -> {
             Tab tab = mActivityTestRule.getActivity().getActivityTab();
@@ -238,18 +235,17 @@ public class SwitchToTabTest {
         mActivityTestRule.typeInOmnibox("about", false);
         OmniboxTestUtils.waitForOmniboxSuggestions(locationBarLayout);
 
-        CriteriaHelper.pollUiThread(() -> {
-            Pair<Integer, OmniboxSuggestion> matchSuggestion =
-                    findFirstTabMatchOmniboxSuggestion(locationBarLayout);
+        Pair<Integer, OmniboxSuggestion> matchSuggestion =
+                findFirstTabMatchOmniboxSuggestion(locationBarLayout);
 
-            Criteria.checkThat(matchSuggestion.first, Matchers.is(INVALID_INDEX));
-        });
+        Assert.assertNull(
+                "Should no Switch to Incognito Tab from normal tab.", matchSuggestion.second);
     }
 
     @Test
     @MediumTest
     @EnableFeatures("OmniboxTabSwitchSuggestions")
-    public void testSwitchToTabInSearchActivity() throws InterruptedException {
+    public void testSwitchToTabInSearchActiviy() throws InterruptedException {
         mTestServer = EmbeddedTestServer.createAndStartHTTPSServer(
                 InstrumentationRegistry.getInstrumentation().getContext(),
                 ServerCertificate.CERT_OK);
@@ -261,26 +257,30 @@ public class SwitchToTabTest {
         mActivityTestRule.loadUrlInNewTab(testHttpsUrl3);
 
         final SearchActivity searchActivity = startSearchActivity();
-        CriteriaHelper.pollUiThread(() -> {
-            Tab tab = mActivityTestRule.getActivity().getActivityTab();
-            Criteria.checkThat(tab, Matchers.notNullValue());
-            // Make sure chrome fully in background.
-            Criteria.checkThat(tab.getWindowAndroid().getActivityState(),
-                    Matchers.isOneOf(ActivityState.STOPPED, ActivityState.DESTROYED));
-        });
 
         final LocationBarLayout locationBarLayout =
                 (LocationBarLayout) searchActivity.findViewById(R.id.search_location_bar);
-        typeAndClickMatchingTabMatchSuggestion(
-                searchActivity, locationBarLayout, "about", testHttpsUrl1);
+        typeAndWaitForTabMatchSuggestions(searchActivity, locationBarLayout, "about");
+
+        Pair<Integer, OmniboxSuggestion> matchSuggestion =
+                findFirstTabMatchOmniboxSuggestion(locationBarLayout);
+
+        Assert.assertNotEquals(INVALID_INDEX, (int) matchSuggestion.first);
+        Assert.assertNotNull("No Switch to Tab suggestion returned.", matchSuggestion.second);
+        Assert.assertEquals(matchSuggestion.second.getUrl().getSpec(), testHttpsUrl1);
+
+        OmniboxSuggestionsDropdown suggestionsDropdown =
+                AutocompleteCoordinatorTestUtils.getSuggestionsDropdown(
+                        locationBarLayout.getAutocompleteCoordinator());
+        clickSuggestionActionAt(suggestionsDropdown, (int) matchSuggestion.first);
 
         CriteriaHelper.pollUiThread(() -> {
             Tab tab = mActivityTestRule.getActivity().getActivityTab();
-            Criteria.checkThat(tab, Matchers.notNullValue());
-            Criteria.checkThat(tab.getUrlString(), Matchers.is(testHttpsUrl1));
-            // Make sure tab is loaded and in foreground.
-            Criteria.checkThat(
-                    tab.getWindowAndroid().getActivityState(), Matchers.is(ActivityState.RESUMED));
+            if (tab == null) return false;
+            // Make sure tab is in either upload page or result page. cannot only verify one of
+            // them since on fast device tab jump to result page really quick but on slow device
+            // may stay on upload page for a really long time.
+            return tab.getUrlString().equals(testHttpsUrl1);
         });
     }
 }

content/public/test/android/javatests/src/org/chromium/content_public/browser/test/util/TestTouchUtils.java

@@ -203,7 +203,7 @@ public class TestTouchUtils {
      * @param v The view to call performClick on.
      */
     public static void performClickOnMainSync(Instrumentation instrumentation, final View v) {
-        TestThreadUtils.runOnUiThreadBlocking(() -> { v.performClick(); });
+        instrumentation.runOnMainSync(() -> v.performClick());
     }
 
     /**