Reduce buggy usage of the registry controlled domain service.

components/omnibox/browser/history_quick_provider.cc

Index: components/omnibox/browser/history_quick_provider.cc
diff --git a/components/omnibox/browser/history_quick_provider.cc b/components/omnibox/browser/history_quick_provider.cc
index eeab8c16886261eaeb169b2c85a87920fec88657..b751693f1fd52d5851f30f0fed294c553ab975ee 100644
--- a/components/omnibox/browser/history_quick_provider.cc
+++ b/components/omnibox/browser/history_quick_provider.cc
@@ -141,19 +141,18 @@ void HistoryQuickProvider::DoAutocomplete() {
              !autocomplete_input_.parts().ref.is_nonempty()) {
           // Not visited, but we've seen the host before.
           will_have_url_what_you_typed_match_first = true;
-          const size_t registry_length =
-              net::registry_controlled_domains::GetRegistryLength(
+          if (net::registry_controlled_domains::HostHasRegistryControlledDomain(
                   host,
                   net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
-                  net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
-          if (registry_length == 0) {
-            // Known intranet hosts get one score.
+                  net::registry_controlled_domains::
+                      EXCLUDE_PRIVATE_REGISTRIES)) {
+            // Known internet host.
             url_what_you_typed_match_score =
-                HistoryURLProvider::kScoreForUnvisitedIntranetResult;
+                HistoryURLProvider::kScoreForWhatYouTypedResult;
           } else {
-            // Known internet hosts get another.
+            // Probably an intranet host.
             url_what_you_typed_match_score =
-                HistoryURLProvider::kScoreForWhatYouTypedResult;
+                HistoryURLProvider::kScoreForUnvisitedIntranetResult;
           }
         }
       }