Omnibox: Slight optimization for OmniboxEditModel::CurrentTextIsURL

Previously, we skipped the match classification process if
user_input_in_progress_ was false and we were not in Query in Omnibox
mode.

Actually, we can always skip the classification process if
user_input_in_progress_ is false.

This CL implements that slight optimization.

Bug: NONE
Change-Id: Iabde52481e199b60874434f034733f7275af8f92
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1534282Reviewed-by: Kevin Bailey <krb@chromium.org>
Commit-Queue: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#644477}

components/omnibox/browser/omnibox_edit_model.cc

@@ -342,14 +342,17 @@ void OmniboxEditModel::GetDataForURLExport(GURL* url,
 }
 
 bool OmniboxEditModel::CurrentTextIsURL() const {
-  // If !user_input_in_progress_ and we are not showing a Query in Omnibox,
-  // then the URL is showing as the permanent display text, and no further
-  // checking is needed.  By avoiding checking in this case, we avoid calling
-  // into the autocomplete providers, and thus initializing the history system,
-  // as long as possible, which speeds startup.
-  LocationBarModel* location_bar_model = controller()->GetLocationBarModel();
-  if (!user_input_in_progress_ &&
-      !location_bar_model->GetDisplaySearchTerms(nullptr)) {
+  // If !user_input_in_progress_, we can determine if the text is a URL without
+  // starting the autocomplete system. This speeds browser startup.
+  if (!user_input_in_progress_) {
+    // If we are displaying Query in Omnibox, and the user has not clicked
+    // "Show URL", then the text must be search terms, and not a URL.
+    if (controller()->GetLocationBarModel()->GetDisplaySearchTerms(nullptr) &&
+        view_->GetText() == display_text_) {
+      return false;
+    }
+
+    // In all other cases, the text must be a URL.
     return true;
   }
 

components/omnibox/browser/omnibox_edit_model_unittest.cc

@@ -286,6 +286,7 @@ TEST_F(OmniboxEditModelTest, CurrentMatch) {
   location_bar_model()->set_url(GURL("http://localhost/"));
   location_bar_model()->set_url_for_display(base::ASCIIToUTF16("localhost"));
   model()->ResetDisplayTexts();
+  model()->Revert();
 
   // Tests that we use the formatted full URL instead of the elided URL to
   // generate matches.
@@ -299,6 +300,7 @@ TEST_F(OmniboxEditModelTest, CurrentMatch) {
   // query, instead of the full formatted URL.
   location_bar_model()->set_display_search_terms(base::ASCIIToUTF16("foobar"));
   model()->ResetDisplayTexts();
+  model()->Revert();
 
   {
     AutocompleteMatch match = model()->CurrentMatch(nullptr);