Reduce buggy usage of the registry controlled domain service.

components/search_engines/template_url_service.cc

 // Copyright 2014 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/search_engines/template_url_service.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 135 matching lines @@
     if (it->second > 1)
       num_dupes++;
   }
 
   UMA_HISTOGRAM_COUNTS_100("Search.SearchEngineDuplicateCounts", num_dupes);
 }
 
 // Returns the length of the registry portion of a hostname.  For example,
 // www.google.co.uk will return 5 (the length of co.uk).
 size_t GetRegistryLength(const base::string16& host) {
-  return net::registry_controlled_domains::GetRegistryLength(
+  // TODO(bug 657199) this is wrong! This function converts UTF-16 to UTF-8
+  // then it gets canonicalized by the registry controlled domain function, and
+  // then the length in the canonicalized string is returned. This length is
+  // not the length in UTF-8 or even UTF-16 in the input!
+  return net::registry_controlled_domains::BuggyGetHostRegistryLength(
       base::UTF16ToUTF8(host),
       net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
       net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
 }
 
 // Returns the domain name (including registry) of a hostname.  For example,
 // www.google.co.uk will return google.co.uk.
 base::string16 GetDomainAndRegistry(const base::string16& host) {
   return base::UTF8ToUTF16(
       net::registry_controlled_domains::GetDomainAndRegistry(
@@ skipping 2307 matching lines @@
 
   if (most_recently_intalled_default) {
     base::AutoReset<DefaultSearchChangeOrigin> change_origin(
         &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION);
     default_search_manager_.SetExtensionControlledDefaultSearchEngine(
         most_recently_intalled_default->data());
   } else {
     default_search_manager_.ClearExtensionControlledDefaultSearchEngine();
   }
 }