Reduce buggy usage of the registry controlled domain service.

chrome/browser/android/history_report/delta_file_commons.cc

Index: chrome/browser/android/history_report/delta_file_commons.cc
diff --git a/chrome/browser/android/history_report/delta_file_commons.cc b/chrome/browser/android/history_report/delta_file_commons.cc
index 183fb200b7146a0c8b3fead22bece4288b8ad29c..8b6789ac91641610e9338a4d210634bc3e63e658 100644
--- a/chrome/browser/android/history_report/delta_file_commons.cc
+++ b/chrome/browser/android/history_report/delta_file_commons.cc
@@ -16,7 +16,7 @@
 using bookmarks::BookmarkModel;
 using net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES;
 using net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES;
-using net::registry_controlled_domains::GetRegistryLength;
+using net::registry_controlled_domains::GetCanonicalHostRegistryLength;

[Peter Kasting, 2016/10/22 05:04:18]

Nit: I'd just qualify the name directly below, but whatever (same comment
applies in other files)

[brettw, 2016/10/24 21:45:23]

I left as-is. I wouldn't personally have done the usings, but the call is pretty
icky with them so I'm inclined not to mess with it.

 
 namespace {
 
@@ -26,11 +26,11 @@ const int kSHA256ByteSize = 32;
 const size_t kUrlLengthLimit = 20 * 1024 * 1024; // 20M
 const size_t kUrlLengthWidth = 8;
 
-void StripTopLevelDomain(std::string* host) {
-  size_t registry_length = GetRegistryLength(
-      *host, EXCLUDE_UNKNOWN_REGISTRIES, EXCLUDE_PRIVATE_REGISTRIES);
+void StripTopLevelDomain(std::string* canonical_host) {
+  size_t registry_length = GetCanonicalHostRegistryLength(
+      *canonical_host, EXCLUDE_UNKNOWN_REGISTRIES, EXCLUDE_PRIVATE_REGISTRIES);
   if (registry_length != 0 && registry_length != std::string::npos)
-    host->erase(host->length() - (registry_length + 1));
+    canonical_host->erase(canonical_host->length() - (registry_length + 1));
 }
 
 void StripCommonSubDomains(std::string* host) {