Change HttpStreamFactoryImpl::Job to take a AlternativeServiceInfo

net/http/http_stream_factory_impl_job_controller.cc

Index: net/http/http_stream_factory_impl_job_controller.cc
diff --git a/net/http/http_stream_factory_impl_job_controller.cc b/net/http/http_stream_factory_impl_job_controller.cc
index ba5896a8794695fd9f575b3623af122e55cfe00c..e1eff6784eefb146b136785bb1833c0891aad73b 100644
--- a/net/http/http_stream_factory_impl_job_controller.cc
+++ b/net/http/http_stream_factory_impl_job_controller.cc
@@ -778,9 +778,8 @@ int HttpStreamFactoryImpl::JobController::DoCreateJobs() {
   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
@@ -790,7 +789,8 @@ int HttpStreamFactoryImpl::JobController::DoCreateJobs() {
     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;
   }
@@ -800,21 +800,25 @@ int HttpStreamFactoryImpl::JobController::DoCreateJobs() {
       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;