HttpStreamFactoryImpl::Job cleanup.

net/http/http_stream_factory_impl_job_controller.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_CONTROLLER_H_
 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_CONTROLLER_H_
 
 #include <memory>
 
 #include "net/base/host_port_pair.h"
 #include "net/base/privacy_mode.h"
 #include "net/http/http_stream_factory_impl_job.h"
 #include "net/http/http_stream_factory_impl_request.h"
+#include "net/socket/next_proto.h"
 
 namespace net {
 
 class NetLogWithSource;
 
 // HttpStreamFactoryImpl::JobController manages Request and Job(s).
 class HttpStreamFactoryImpl::JobController
     : public HttpStreamFactoryImpl::Job::Delegate,
       public HttpStreamFactoryImpl::Request::Helper {
  public:
@@ skipping 281 matching lines @@
   const bool enable_ip_based_pooling_;
 
   // Enable using alternative services for the request.
   const bool enable_alternative_services_;
 
   // |main_job_| is a job waiting to see if |alternative_job_| can reuse a
   // connection. If |alternative_job_| is unable to do so, |this| will notify
   // |main_job_| to proceed and then race the two jobs.
   std::unique_ptr<Job> main_job_;
   std::unique_ptr<Job> alternative_job_;
+  // The alternative service used by |alternative_job_|
+  // (or by |main_job_| if |is_preconnect_|.)
+  AlternativeService alternative_service_;
 
   // Net error code of the failed alternative job. Set to OK by default.
   int alternative_job_net_error_;
-  // The alternative service server that |alternative_job_| uses failed.
-  AlternativeService failed_alternative_service_;
 
   // True if a Job has ever been bound to the |request_|.
   bool job_bound_;
 
   // True if the main job has to wait for the alternative job: i.e., the main
   // job must not create a connection until it is resumed.
   bool main_job_is_blocked_;
 
   // True if the main job was blocked and has been resumed in ResumeMainJob().
   bool main_job_is_resumed_;
@@ skipping 19 matching lines @@
   HttpStreamRequest::StreamType stream_type_;
   RequestPriority priority_;
   const NetLogWithSource net_log_;
 
   base::WeakPtrFactory<JobController> ptr_factory_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_CONTROLLER_H_