Change QuicStreamRequest::Request() to take a preferred QuicVersion so that

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"
@@ skipping 145 matching lines @@
   // for this SpdySessionKey, since we may need to wait for NPN to complete
   // before knowing if SPDY is available.
   void SetSpdySessionKey(Job* job,
                          const SpdySessionKey& spdy_session_key) override;
 
   // Remove session from the SpdySessionRequestMap.
   void RemoveRequestFromSpdySessionRequestMapForJob(Job* job) override;
 
   const NetLogWithSource* GetNetLog() const override;
 
+  const QuicVersionVector& GetAdvertisedQuicVersions() const override;
+
   void MaybeSetWaitTimeForMainJob(const base::TimeDelta& delay) override;
 
   WebSocketHandshakeStreamBase::CreateHelper*
   websocket_handshake_stream_create_helper() override;
 
   bool is_preconnect() const { return is_preconnect_; }
 
   // Returns true if |this| has a pending request that is not completed.
   bool HasPendingRequest() const { return request_ != nullptr; }
 
@@ skipping 138 matching lines @@
   // 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_;
+  AlternativeServiceInfo alternative_service_info_;
 
   // Net error code of the failed alternative job. Set to OK by default.
   int alternative_job_net_error_;
 
   // 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_;
@@ skipping 22 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_