Merge logic for SameDomainOrHost for GURLs and Origins

net/base/registry_controlled_domains/registry_controlled_domain.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.
 
 // NB: Modelled after Mozilla's code (originally written by Pamela Greene,
 // later modified by others), but almost entirely rewritten for Chrome.
 //   (netwerk/dns/src/nsEffectiveTLDService.cpp)
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ skipping 36 matching lines @@
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/lookup_string_in_fixed_set.h"
 #include "net/base/net_module.h"
 #include "net/base/url_util.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 #include "url/third_party/mozilla/url_parse.h"
+#include "url/url_util.h"
 
 namespace net {
 namespace registry_controlled_domains {
 
 namespace {
 #include "net/base/registry_controlled_domains/effective_tld_names-inc.cc"
 
 // See make_dafsa.py for documentation of the generated dafsa byte array.
 
 const unsigned char* g_graph = kDafsa;
@@ skipping 116 matching lines @@
   if (dot == std::string::npos)
     return host;
   return host.substr(dot + 1);
 }
 
 // Same as GetDomainAndRegistry, but returns the domain and registry as a
 // StringPiece that references the underlying string of the passed-in |gurl|.
 // TODO(pkalinnikov): Eliminate this helper by exposing StringPiece as the
 // interface type for all the APIs.
 base::StringPiece GetDomainAndRegistryAsStringPiece(
-    const GURL& gurl,
+    base::StringPiece host,
     PrivateRegistryFilter filter) {
-  base::StringPiece host = gurl.host_piece();
-  if (host.empty() || gurl.HostIsIPAddress())
+  if (host.empty() || url::HostIsIPAddress(host))
     return base::StringPiece();
   return GetDomainAndRegistryImpl(host, filter);
 }
 
 // These two functions append the given string as-is to the given output,
 // converting to UTF-8 if necessary.
 void AppendInvalidString(base::StringPiece str, url::CanonOutput* output) {
   output->Append(str.data(), static_cast<int>(str.length()));
 }
 void AppendInvalidString(base::StringPiece16 str, url::CanonOutput* output) {
@@ skipping 95 matching lines @@
       try_output.Complete();
       if (try_string == canonical_rcd)
         return host.length() - current_try;
     }
   }
 
   NOTREACHED();
   return canonical_rcd_len;
 }
 
+bool SameDomainOrHost(base::StringPiece host1,
+                      base::StringPiece host2,
+                      PrivateRegistryFilter filter) {
+  // Quickly reject cases where either host is empty.
+  if (host1.empty() || host2.empty())
+    return false;
+
+  // Check for exact host matches, which is faster than looking up the domain
+  // and registry.
+  if (host1 == host2)
+    return true;
+
+  // Check for a domain and registry match.
+  const base::StringPiece& domain1 =
+      GetDomainAndRegistryAsStringPiece(host1, filter);
+  return !domain1.empty() &&
+         (domain1 == GetDomainAndRegistryAsStringPiece(host2, filter));
+}
+
 }  // namespace
 
 std::string GetDomainAndRegistry(const GURL& gurl,
                                  PrivateRegistryFilter filter) {
-  return GetDomainAndRegistryAsStringPiece(gurl, filter).as_string();
+  return GetDomainAndRegistryAsStringPiece(gurl.host_piece(), filter)
+      .as_string();
 }
 
 std::string GetDomainAndRegistry(base::StringPiece host,
                                  PrivateRegistryFilter filter) {
   url::CanonHostInfo host_info;
   const std::string canon_host(CanonicalizeHost(host, &host_info));
   if (canon_host.empty() || host_info.IsIPAddress())
     return std::string();
   return GetDomainAndRegistryImpl(canon_host, filter).as_string();
 }
 
 bool SameDomainOrHost(
     const GURL& gurl1,
     const GURL& gurl2,
     PrivateRegistryFilter filter) {
-  // Quickly reject cases where either host is empty.
-  if (!gurl1.has_host() || !gurl2.has_host())
-    return false;
-
-  // Check for exact host matches, which is faster than looking up the domain
-  // and registry.
-  if (gurl1.host_piece() == gurl2.host_piece())
-    return true;
-
-  // Check for a domain and registry match.
-  const base::StringPiece& domain1 =
-      GetDomainAndRegistryAsStringPiece(gurl1, filter);
-  return !domain1.empty() &&
-         (domain1 == GetDomainAndRegistryAsStringPiece(gurl2, filter));
+  return SameDomainOrHost(gurl1.host_piece(), gurl2.host_piece(), filter);
 }
 
 bool SameDomainOrHost(const url::Origin& origin1,
                       const url::Origin& origin2,
                       PrivateRegistryFilter filter) {
-  return SameDomainOrHost(origin1.GetURL(), origin2.GetURL(), filter);
+  return SameDomainOrHost(origin1.host(), origin2.host(), filter);
 }
 
 bool SameDomainOrHost(const url::Origin& origin1,
                       const base::Optional<url::Origin>& origin2,
                       PrivateRegistryFilter filter) {
-  if (!origin2.has_value())
-    return false;
-  return SameDomainOrHost(origin1, origin2.value(), filter);
+  return origin2.has_value() &&
+         SameDomainOrHost(origin1, origin2.value(), filter);
 }
 
 size_t GetRegistryLength(
     const GURL& gurl,
     UnknownRegistryFilter unknown_filter,
     PrivateRegistryFilter private_filter) {
   return GetRegistryLengthImpl(gurl.host_piece(), unknown_filter,
                                private_filter);
 }
 
@@ skipping 59 matching lines @@
 
 void SetFindDomainGraph(const unsigned char* domains, size_t length) {
   CHECK(domains);
   CHECK_NE(length, 0u);
   g_graph = domains;
   g_graph_length = length;
 }
 
 }  // namespace registry_controlled_domains
 }  // namespace net