Change the AlternativeServiceMap with SchemeOriginPair key.

net/base/host_port_pair.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.
 
 #include "net/base/host_port_pair.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 10 matching lines @@
     : host_(in_host), port_(in_port) {
 }
 
 // static
 HostPortPair HostPortPair::FromURL(const GURL& url) {
   return HostPortPair(url.HostNoBrackets(),
                       static_cast<uint16_t>(url.EffectiveIntPort()));
 }
 
 // static
+HostPortPair HostPortPair::FromSchemeHostPort(
+    const url::SchemeHostPort& origin) {
+  return HostPortPair(origin.host(), origin.port());
+}
+
+// static
 HostPortPair HostPortPair::FromIPEndPoint(const IPEndPoint& ipe) {
   return HostPortPair(ipe.ToStringWithoutPort(), ipe.port());
 }
 
 HostPortPair HostPortPair::FromString(const std::string& str) {
   std::vector<base::StringPiece> key_port = base::SplitStringPiece(
       str, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   if (key_port.size() != 2)
     return HostPortPair();
   int port;
@@ skipping 27 matching lines @@
   // Check to see if the host is an IPv6 address.  If so, added brackets.
   if (host_.find(':') != std::string::npos) {
     DCHECK_NE(host_[0], '[');
     return base::StringPrintf("[%s]", host_.c_str());
   }
 
   return host_;
 }
 
 }  // namespace net