Fix SchemeHostPort::GetURL() and add more tests

url/scheme_host_port.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 "url/scheme_host_port.h"
 
 #include <stdint.h>
 #include <string.h>
 
 #include <tuple>
@@ skipping 135 matching lines @@
   // Null checking for |parsed| in SerializeInternal is probably slower than
   // just filling it in and discarding it here.
   url::Parsed parsed;
   return SerializeInternal(&parsed);
 }
 
 GURL SchemeHostPort::GetURL() const {
   url::Parsed parsed;
   std::string serialized = SerializeInternal(&parsed);
 
+  if (IsInvalid())
+    return GURL(std::move(serialized), parsed, false);
+
   // If the serialized string is passed to GURL for parsing, it will append an
   // empty path "/". Add that here. Note: per RFC 6454 we cannot do this for
   // normal Origin serialization.
   DCHECK(!parsed.path.is_valid());
   parsed.path = Component(serialized.length(), 1);
   serialized.append("/");
   return GURL(std::move(serialized), parsed, true);
 }
 
 bool SchemeHostPort::Equals(const SchemeHostPort& other) const {
   return port_ == other.port() && scheme_ == other.scheme() &&
          host_ == other.host();
 }
 
 bool SchemeHostPort::operator<(const SchemeHostPort& other) const {
   return std::tie(port_, scheme_, host_) <
          std::tie(other.port_, other.scheme_, other.host_);
 }
 
 std::string SchemeHostPort::SerializeInternal(url::Parsed* parsed) const {
   std::string result;
   if (IsInvalid())
     return result;
 
-  parsed->scheme = Component(0, scheme_.length());
-  result.append(scheme_);
+  if (!scheme_.empty()) {
+    parsed->scheme = Component(0, scheme_.length());
+    result.append(scheme_);
+  }
 
   result.append(kStandardSchemeSeparator);
 
-  parsed->host = Component(result.length(), host_.length());
-  result.append(host_);
+  if (!host_.empty()) {
+    parsed->host = Component(result.length(), host_.length());
+    result.append(host_);
+  }
 
   if (port_ == 0)
     return result;
 
   // Omit the port component if the port matches with the default port
   // defined for the scheme, if any.
   int default_port = DefaultPortForScheme(scheme_.data(),
                                           static_cast<int>(scheme_.length()));
   if (default_port == PORT_UNSPECIFIED)
     return result;
   if (port_ != default_port) {
     result.push_back(':');
     std::string port(base::UintToString(port_));
     parsed->port = Component(result.length(), port.length());
     result.append(std::move(port));
   }
 
   return result;
 }
 
 }  // namespace url