Revert of 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 ea045ad37532f8057b98549775281066ed7d24d5..eeab8c16886261eaeb169b2c85a87920fec88657 100644
--- a/components/omnibox/browser/history_quick_provider.cc
+++ b/components/omnibox/browser/history_quick_provider.cc
@@ -141,18 +141,19 @@
              !autocomplete_input_.parts().ref.is_nonempty()) {
           // Not visited, but we've seen the host before.
           will_have_url_what_you_typed_match_first = true;
-          if (net::registry_controlled_domains::HostHasRegistryControlledDomain(
+          const size_t registry_length =
+              net::registry_controlled_domains::GetRegistryLength(
                   host,
                   net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
-                  net::registry_controlled_domains::
-                      EXCLUDE_PRIVATE_REGISTRIES)) {
-            // Known internet host.
+                  net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+          if (registry_length == 0) {
+            // Known intranet hosts get one score.
+            url_what_you_typed_match_score =
+                HistoryURLProvider::kScoreForUnvisitedIntranetResult;
+          } else {
+            // Known internet hosts get another.
             url_what_you_typed_match_score =
                 HistoryURLProvider::kScoreForWhatYouTypedResult;
-          } else {
-            // An intranet host.
-            url_what_you_typed_match_score =
-                HistoryURLProvider::kScoreForUnvisitedIntranetResult;
           }
         }
       }