Change HttpStreamFactoryImpl::Job to take a AlternativeServiceInfo

net/http/http_stream_factory_impl_job_controller.cc

 // Copyright (c) 2016 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_job_controller.h"
 
 #include <string>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 760 matching lines @@
 }
 
 int HttpStreamFactoryImpl::JobController::DoCreateJobs() {
   DCHECK(!main_job_);
   DCHECK(!alternative_job_);
 
   HostPortPair destination(HostPortPair::FromURL(request_info_.url));
   GURL origin_url = ApplyHostMappingRules(request_info_.url, &destination);
 
   // Create an alternative job if alternative service is set up for this domain.
-  const AlternativeService alternative_service =
-      GetAlternativeServiceInfoFor(request_info_, delegate_, stream_type_)
-          .alternative_service;
+  const AlternativeServiceInfo alternative_service_info =
+      GetAlternativeServiceInfoFor(request_info_, delegate_, stream_type_);
 
   if (is_preconnect_) {
     // Due to how the socket pools handle priorities and idle sockets, only IDLE
     // priority currently makes sense for preconnects. The priority for
     // preconnects is currently ignored (see RequestSocketsForPool()), but could
     // be used at some point for proxy resolution or something.
     main_job_ = job_factory_->CreateAltSvcJob(
         this, PRECONNECT, session_, request_info_, IDLE, proxy_info_,
         server_ssl_config_, proxy_ssl_config_, destination, origin_url,
-        alternative_service, enable_ip_based_pooling_, session_->net_log());
+        alternative_service_info, enable_ip_based_pooling_,
+        session_->net_log());
     main_job_->Preconnect(num_streams_);
     return OK;
   }
   main_job_ = job_factory_->CreateMainJob(
       this, MAIN, session_, request_info_, priority_, proxy_info_,
       server_ssl_config_, proxy_ssl_config_, destination, origin_url,
       enable_ip_based_pooling_, net_log_.net_log());
   // Alternative Service can only be set for HTTPS requests while Alternative
   // Proxy is set for HTTP requests.
-  if (alternative_service.protocol != kProtoUnknown) {
+  if (alternative_service_info.alternative_service.protocol != kProtoUnknown) {
     // Never share connection with other jobs for FTP requests.
-    DVLOG(1) << "Selected alternative service (host: "
-             << alternative_service.host_port_pair().host()
-             << " port: " << alternative_service.host_port_pair().port() << ")";
+    DVLOG(1)
+        << "Selected alternative service (host: "
+        << alternative_service_info.alternative_service.host_port_pair().host()
+        << " port: "
+        << alternative_service_info.alternative_service.host_port_pair().port()
+        << ")";
 
     DCHECK(!request_info_.url.SchemeIs(url::kFtpScheme));
-    HostPortPair alternative_destination(alternative_service.host_port_pair());
+    HostPortPair alternative_destination(
+        alternative_service_info.alternative_service.host_port_pair());
     ignore_result(
         ApplyHostMappingRules(request_info_.url, &alternative_destination));
 
     alternative_job_ = job_factory_->CreateAltSvcJob(
         this, ALTERNATIVE, session_, request_info_, priority_, proxy_info_,
         server_ssl_config_, proxy_ssl_config_, alternative_destination,
-        origin_url, alternative_service, enable_ip_based_pooling_,
+        origin_url, alternative_service_info, enable_ip_based_pooling_,
         net_log_.net_log());
 
     main_job_is_blocked_ = true;
     alternative_job_->Start(request_->stream_type());
   } else {
     ProxyServer alternative_proxy_server;
     if (ShouldCreateAlternativeProxyServerJob(proxy_info_, request_info_.url,
                                               &alternative_proxy_server)) {
       DCHECK(!main_job_is_blocked_);
       ProxyInfo alternative_proxy_info;
@@ skipping 453 matching lines @@
     // If ReconsiderProxyAfterError() failed synchronously, it means
     // there was nothing left to fall-back to, so fail the transaction
     // with the last connection error we got.
     // TODO(eroman): This is a confusing contract, make it more obvious.
     rv = error;
   }
   return rv;
 }
 
 }  // namespace net