Reduce buggy usage of the registry controlled domain service.

chrome/browser/android/history_report/delta_file_commons.cc

 // Copyright 2015 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 "chrome/browser/android/history_report/delta_file_commons.h"
 
 #include <stddef.h>
 
 #include <iomanip>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "crypto/sha2.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 
 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 {
 
 const int kBookmarkScoreBonusMultiplier = 3;
 const size_t kIdLengthLimit = 256;
 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) {
   std::string www_prefix("www.");
   std::string ww2_prefix("ww2.");
   if (host->compare(0, www_prefix.size(), www_prefix) == 0) {
     host->erase(0, www_prefix.size());
   } else if (host->compare(0, ww2_prefix.size(), ww2_prefix) == 0) {
     host->erase(0, ww2_prefix.size());
   }
@@ skipping 103 matching lines @@
   is_bookmark_ = true;
   bookmark_title_ = bookmark.title;
 }
 
 // static
 bool DeltaFileEntryWithData::IsValidId(const std::string& url) {
   return url.size() <= kIdLengthLimit;
 }
 
 }  // namespace history_report