Make GetAlternateProtocolRequestFor return AlternativeService.

net/http/http_stream_factory_impl.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/http/http_stream_factory_impl.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 87 matching lines @@
     HttpStreamRequest::Delegate* delegate,
     WebSocketHandshakeStreamBase::CreateHelper*
         websocket_handshake_stream_create_helper,
     const BoundNetLog& net_log) {
   Request* request = new Request(request_info.url,
                                  this,
                                  delegate,
                                  websocket_handshake_stream_create_helper,
                                  net_log);
 
   GURL alternate_url;

[Ryan Hamilton, 2015/03/17 13:53:09]

nit: At some point we really should get rid of this "alternate_url" business...
but we can do that later. How about adding a TODO?

[Bence, 2015/03/17 14:40:52]

Done.

-  AlternateProtocolInfo alternate =
-      GetAlternateProtocolRequestFor(request_info.url, &alternate_url);
+  AlternativeService alternative_service =
+      GetAlternativeServiceRequestFor(request_info.url, &alternate_url);
   Job* alternate_job = NULL;
-  if (alternate.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL) {
+  if (alternative_service.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL) {
     // Never share connection with other jobs for FTP requests.
     DCHECK(!request_info.url.SchemeIs("ftp"));
 
     HttpRequestInfo alternate_request_info = request_info;
     alternate_request_info.url = alternate_url;
     alternate_job =
         new Job(this, session_, alternate_request_info, priority,
                 server_ssl_config, proxy_ssl_config, net_log.net_log());
     request->AttachJob(alternate_job);
-    alternate_job->MarkAsAlternate(request_info.url, alternate);
+    alternate_job->MarkAsAlternate(request_info.url, alternative_service);
   }
 
   Job* job = new Job(this, session_, request_info, priority,
                      server_ssl_config, proxy_ssl_config, net_log.net_log());
   request->AttachJob(job);
   if (alternate_job) {
     // Never share connection with other jobs for FTP requests.
     DCHECK(!request_info.url.SchemeIs("ftp"));
 
     job->WaitFor(alternate_job);
@@ skipping 10 matching lines @@
 }
 
 void HttpStreamFactoryImpl::PreconnectStreams(
     int num_streams,
     const HttpRequestInfo& request_info,
     RequestPriority priority,
     const SSLConfig& server_ssl_config,
     const SSLConfig& proxy_ssl_config) {
   DCHECK(!for_websockets_);
   GURL alternate_url;
-  AlternateProtocolInfo alternate =
-      GetAlternateProtocolRequestFor(request_info.url, &alternate_url);
+  AlternativeService alternative_service =
+      GetAlternativeServiceRequestFor(request_info.url, &alternate_url);
   Job* job = NULL;
-  if (alternate.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL) {
+  if (alternative_service.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL) {
     HttpRequestInfo alternate_request_info = request_info;
     alternate_request_info.url = alternate_url;
     job = new Job(this, session_, alternate_request_info, priority,
                   server_ssl_config, proxy_ssl_config, session_->net_log());
-    job->MarkAsAlternate(request_info.url, alternate);
+    job->MarkAsAlternate(request_info.url, alternative_service);
   } else {
     job = new Job(this, session_, request_info, priority,
                   server_ssl_config, proxy_ssl_config, session_->net_log());
   }
   preconnect_job_set_.insert(job);
   job->Preconnect(num_streams);
 }
 
 const HostMappingRules* HttpStreamFactoryImpl::GetHostMappingRules() const {
   return session_->params().host_mapping_rules;
 }
 
-AlternateProtocolInfo HttpStreamFactoryImpl::GetAlternateProtocolRequestFor(
+AlternativeService HttpStreamFactoryImpl::GetAlternativeServiceRequestFor(
     const GURL& original_url,
     GURL* alternate_url) {
-  const AlternateProtocolInfo kNoAlternateProtocol;
+  const AlternativeService kNoAlternativeService;
 
   if (!session_->params().use_alternate_protocols)
-    return kNoAlternateProtocol;
+    return kNoAlternativeService;
 
   if (original_url.SchemeIs("ftp"))
-    return kNoAlternateProtocol;
+    return kNoAlternativeService;
 
   HostPortPair origin = HostPortPair::FromURL(original_url);
   HttpServerProperties& http_server_properties =
       *session_->http_server_properties();
   const AlternateProtocolInfo alternate =
       http_server_properties.GetAlternateProtocol(origin);
 
   if (alternate.protocol == UNINITIALIZED_ALTERNATE_PROTOCOL)
-    return kNoAlternateProtocol;
+    return kNoAlternativeService;
   const AlternativeService alternative_service(alternate.protocol,
                                                origin.host(), alternate.port);
   if (http_server_properties.IsAlternativeServiceBroken(alternative_service)) {
     HistogramAlternateProtocolUsage(ALTERNATE_PROTOCOL_USAGE_BROKEN);
-    return kNoAlternateProtocol;
+    return kNoAlternativeService;
   }
   if (!IsAlternateProtocolValid(alternate.protocol)) {
     NOTREACHED();
-    return kNoAlternateProtocol;
+    return kNoAlternativeService;
   }
 
   // Some shared unix systems may have user home directories (like
   // http://foo.com/~mike) which allow users to emit headers.  This is a bad
   // idea already, but with Alternate-Protocol, it provides the ability for a
   // single user on a multi-user system to hijack the alternate protocol.
   // These systems also enforce ports <1024 as restricted ports.  So don't
   // allow protocol upgrades to user-controllable ports.
   const int kUnrestrictedPort = 1024;
   if (!session_->params().enable_user_alternate_protocol_ports &&
       (alternate.port >= kUnrestrictedPort &&
        origin.port() < kUnrestrictedPort))
-    return kNoAlternateProtocol;
+    return kNoAlternativeService;
 
   origin.set_port(alternate.port);
   if (alternate.protocol >= NPN_SPDY_MINIMUM_VERSION &&
       alternate.protocol <= NPN_SPDY_MAXIMUM_VERSION) {
     if (!HttpStreamFactory::spdy_enabled())
-      return kNoAlternateProtocol;
+      return kNoAlternativeService;
 
     if (session_->HasSpdyExclusion(origin))
-      return kNoAlternateProtocol;
+      return kNoAlternativeService;
 
     *alternate_url = UpgradeUrlToHttps(original_url, alternate.port);
   } else {
     DCHECK_EQ(QUIC, alternate.protocol);
     if (!session_->params().enable_quic)
-      return kNoAlternateProtocol;
+      return kNoAlternativeService;
 
     // TODO(rch):  Figure out how to make QUIC iteract with PAC
     // scripts.  By not re-writing the URL, we will query the PAC script
     // for the proxy to use to reach the original URL via TCP.  But
     // the alternate request will be going via UDP to a different port.
     *alternate_url = original_url;
   }
-  return alternate;
+  return AlternativeService(alternate.protocol, origin.host(), alternate.port);
 }
 
 void HttpStreamFactoryImpl::OrphanJob(Job* job, const Request* request) {
   DCHECK(ContainsKey(request_map_, job));
   DCHECK_EQ(request_map_[job], request);
   DCHECK(!ContainsKey(orphaned_job_set_, job));
 
   request_map_.erase(job);
 
   orphaned_job_set_.insert(job);
@@ skipping 48 matching lines @@
   delete job;
 }
 
 void HttpStreamFactoryImpl::OnPreconnectsComplete(const Job* job) {
   preconnect_job_set_.erase(job);
   delete job;
   OnPreconnectsCompleteInternal();
 }
 
 }  // namespace net