Revert of Reduce buggy usage of the registry controlled domain service.

components/omnibox/browser/history_quick_provider.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/omnibox/browser/history_quick_provider.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 123 matching lines @@
               HistoryURLProvider::kScoreForBestInlineableResult;
         } else if (url_db->IsTypedHost(host) &&
              (!autocomplete_input_.parts().path.is_nonempty() ||
               ((autocomplete_input_.parts().path.len == 1) &&
                (autocomplete_input_.text()[
                    autocomplete_input_.parts().path.begin] == '/'))) &&
              !autocomplete_input_.parts().query.is_nonempty() &&
              !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;
           }
         }
       }
     }
   }
 
   // Loop over every result and add it to matches_.  In the process,
   // guarantee that scores are decreasing.  |max_match_score| keeps
   // track of the highest score we can assign to any later results we
   // see.  Also, reduce |max_match_score| if we think there will be
@@ skipping 80 matching lines @@
   match.description = info.title();
   match.description_class = SpansFromTermMatch(
       history_match.title_matches, match.description.length(), false);
 
   match.RecordAdditionalInfo("typed count", info.typed_count());
   match.RecordAdditionalInfo("visit count", info.visit_count());
   match.RecordAdditionalInfo("last visit", info.last_visit());
 
   return match;
 }