Update from https://crrev.com/305340

net/spdy/hpack_huffman_aggregator.cc

 // Copyright 2014 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/spdy/hpack_huffman_aggregator.h"
 
 #include "base/metrics/bucket_ranges.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sample_vector.h"
 #include "base/stl_util.h"
@@ skipping 31 matching lines @@
 }
 
 void HpackHuffmanAggregator::AggregateTransactionCharacterCounts(
     const HttpRequestInfo& request,
     const HttpRequestHeaders& request_headers,
     const ProxyServer& proxy,
     const HttpResponseHeaders& response_headers) {
   if (IsCrossOrigin(request)) {
     return;
   }
-  HostPortPair endpoint = HostPortPair(request.url.HostNoBrackets(),
-                                       request.url.EffectiveIntPort());
-  HpackEncoder* encoder = ObtainEncoder(
-      SpdySessionKey(endpoint, proxy, request.privacy_mode));
+  HpackEncoder* encoder = ObtainEncoder(SpdySessionKey(
+      HostPortPair::FromURL(request.url), proxy, request.privacy_mode));
 
   // Convert and encode the request and response header sets.
   {
     SpdyHeaderBlock headers;
     CreateSpdyHeadersFromHttpRequest(
         request, request_headers, SPDY4, false, &headers);
 
     std::string tmp_out;
     encoder->EncodeHeaderSet(headers, &tmp_out);
   }
@@ skipping 35 matching lines @@
       (*headers_out)[name] += std::string(1, '\0') + value;
     }
   }
   (*headers_out)[":status"] = base::IntToString(headers.response_code());
 }
 
 // static
 bool HpackHuffmanAggregator::IsCrossOrigin(const HttpRequestInfo& request) {
   // Require that the request is top-level, or that it shares
   // an origin with its referer.
-  HostPortPair endpoint = HostPortPair(request.url.HostNoBrackets(),
-                                       request.url.EffectiveIntPort());
   if ((request.load_flags & LOAD_MAIN_FRAME) == 0) {
     std::string referer_str;
     if (!request.extra_headers.GetHeader(HttpRequestHeaders::kReferer,
                                          &referer_str)) {
       // Require a referer.
       return true;
     }
     GURL referer(referer_str);
-    HostPortPair referer_endpoint = HostPortPair(referer.HostNoBrackets(),
-                                                 referer.EffectiveIntPort());
-    if (!endpoint.Equals(referer_endpoint)) {
+    if (!HostPortPair::FromURL(request.url).Equals(
+        HostPortPair::FromURL(referer))) {
       // Cross-origin request.
       return true;
     }
   }
   return false;
 }
 
 HpackEncoder* HpackHuffmanAggregator::ObtainEncoder(const SpdySessionKey& key) {
   for (OriginEncoders::iterator it = encoders_.begin();
        it != encoders_.end(); ++it) {
@@ skipping 40 matching lines @@
       base::LinearHistogram::FactoryGet(
           kHistogramName, kRangeMin, kRangeMax, kBucketCount,
           base::HistogramBase::kUmaTargetedHistogramFlag));
 
   // Clear counts.
   counts_.assign(counts_.size(), 0);
   total_counts_ = 0;
 }
 
 }  // namespace net