Merge logic for SameDomainOrHost for GURLs and Origins

url/gurl.cc

 // Copyright 2013 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 "url/gurl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <ostream>
@@ skipping 103 matching lines @@
   url::StdStringCanonOutput output(&spec_);
   is_valid_ = url::Canonicalize(
       input_spec.data(), static_cast<int>(input_spec.length()), trim_path_end,
       NULL, &output, &parsed_);
 
   output.Complete();  // Must be done before using string.
   if (is_valid_ && SchemeIsFileSystem()) {
     inner_url_.reset(new GURL(spec_.data(), parsed_.Length(),
                               *parsed_.inner_parsed(), true));
   }
+  // Valid URLs always have non-empty specs.
+  DCHECK(!is_valid_ || !spec_.empty());
 }
 
 void GURL::InitializeFromCanonicalSpec() {
   if (is_valid_ && SchemeIsFileSystem()) {
     inner_url_.reset(
         new GURL(spec_.data(), parsed_.Length(),
                  *parsed_.inner_parsed(), true));
   }
 
 #ifndef NDEBUG
   // For testing purposes, check that the parsed canonical URL is identical to
   // what we would have produced. Skip checking for invalid URLs have no meaning
   // and we can't always canonicalize then reproducibly.
   if (is_valid_) {
+    DCHECK(!spec_.empty());
     url::Component scheme;
     // We can't do this check on the inner_url of a filesystem URL, as
     // canonical_spec actually points to the start of the outer URL, so we'd
     // end up with infinite recursion in this constructor.
     if (!url::FindAndCompareScheme(spec_.data(), spec_.length(),
                                    url::kFileSystemScheme, &scheme) ||
         scheme.begin == parsed_.scheme.begin) {
       // We need to retain trailing whitespace on path URLs, as the |parsed_|
       // spec we originally received may legitimately contain trailing white-
       // space on the path or  components e.g. if the #ref has been
@@ skipping 285 matching lines @@
     h.len -= 2;
   }
   return ComponentString(h);
 }
 
 std::string GURL::GetContent() const {
   return is_valid_ ? ComponentString(parsed_.GetContent()) : std::string();
 }
 
 bool GURL::HostIsIPAddress() const {
-  if (!is_valid_ || spec_.empty())
-     return false;
-
-  url::RawCanonOutputT<char, 128> ignored_output;
-  url::CanonHostInfo host_info;
-  url::CanonicalizeIPAddress(spec_.c_str(), parsed_.host, &ignored_output,
-                             &host_info);
-  return host_info.IsIPAddress();
+  return is_valid_ && url::HostIsIPAddress(host_piece());
 }
 
 #ifdef WIN32
 
 const GURL& GURL::EmptyGURL() {
   // Avoid static object construction/destruction on startup/shutdown.
   if (!empty_gurl) {
     // Create the string. Be careful that we don't break in the case that this
     // is being called from multiple threads.
     GURL* new_empty_gurl = new GURL;
@@ skipping 51 matching lines @@
 }
 
 bool operator==(const GURL& x, const base::StringPiece& spec) {
   DCHECK_EQ(GURL(spec).possibly_invalid_spec(), spec);
   return x.possibly_invalid_spec() == spec;
 }
 
 bool operator!=(const GURL& x, const base::StringPiece& spec) {
   return !(x == spec);
 }