Focus the UrlBar before setting its text in setSearchQuery.

Previously, calling setSearchQuery when the UrlBar didn't yet have focus would result in autocomplete results being shown but no visible search query.

This wasn't an issue previously, as all existing callsites explicitly focused the UrlBar. With https://chromium-review.googlesource.com/c/chromium/src/+/2496031 this will no longer be the case.

Bug: 1144966
Change-Id: I6efd40b25d93704fb35665d69d07541190dd024f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518081
Commit-Queue: Josh Simmons <jds@google.com>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Patrick Noland <pnoland@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825044}

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

@@ -547,9 +547,11 @@ public class LocationBarLayout
             return;
         }
 
+        // Ensure the UrlBar has focus before entering text. If the UrlBar is not focused,
+        // autocomplete text will be updated but the visible text will not.
+        setUrlBarFocus(true, null, OmniboxFocusReason.SEARCH_QUERY);
         setUrlBarText(UrlBarData.forNonUrlText(query), UrlBar.ScrollType.NO_SCROLL,
                 SelectionState.SELECT_ALL);
-        setUrlBarFocus(true, null, OmniboxFocusReason.SEARCH_QUERY);
         mAutocompleteCoordinator.startAutocompleteForQuery(query);
         post(new Runnable() {
             @Override

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/LocationBarLayoutTest.java

@@ -247,6 +247,18 @@ public class LocationBarLayoutTest {
         });
     }
 
+    @Test
+    @SmallTest
+    public void testSetSearchQueryFocuses() {
+        final LocationBarLayout locationBar = getLocationBar();
+        final String query = "testing query";
+
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            locationBar.setSearchQuery(query);
+            Assert.assertEquals(query, locationBar.mUrlCoordinator.getTextWithoutAutocomplete());
+        });
+    }
+
     /*
      *  Search engine logo tests.
      */