Add AlternateProtocolInfo to HttpStreamFactoryImpl::Job.

net/http/http_stream_factory_impl_job.h

Index: net/http/http_stream_factory_impl_job.h
diff --git a/net/http/http_stream_factory_impl_job.h b/net/http/http_stream_factory_impl_job.h
index 55bfeecc9f96376a318803faa54a3039d5773c96..68b369a5f5277bd0d91523e796271ebb8836469d 100644
--- a/net/http/http_stream_factory_impl_job.h
+++ b/net/http/http_stream_factory_impl_job.h
@@ -41,7 +41,8 @@ class HttpStreamFactoryImpl::Job {
       RequestPriority priority,
       const SSLConfig& server_ssl_config,
       const SSLConfig& proxy_ssl_config,
-      NetLog* net_log);
+      NetLog* net_log,
+      AlternateProtocolInfo alternate_protocol);

[Ryan Hamilton, 2015/01/30 23:12:51]

I'm not sure that I'm a fan of moving this to the constructor. Since only
alternate jobs (those which have had MarkAsAlternate called) should have
alternatives it seems odd to pass in here, instead of when marking it alternate.

Or, I guess, you could add both of these arguments to the constructor, but that
doesn't feel super awesome?

[Bence, 2015/01/31 00:32:01]

Well, if you look at
https://codereview.chromium.org/665083009/diff/400001/net/http/http_stream_fa...,
you can see that both the alternate job and the non-alternate one must keep a
copy of alternate_protocol, because they will need to pass it to
SetBrokenAlternateProtocol().  This is because each server will be allowed to
have multiple AlternateProtocols, and SetBrokenAlternateProtocol() will need to
know which one to mark as broken.

[Ryan Hamilton, 2015/01/31 01:17:48]

I'm not sure that's the best way to accomplish this. It seems like that change
makes alternate_protocol_ mean two different things. it's either the protocol
being used by this jobs (if it's an alternate job) or else is that alternate
protocol being used but the other job (if this is a main job). Instead, it might
make more sense to change MarkOtherJobComplete() so that it takes the
AlternateProtocol (if any) from the other job and then save it in a member like
other_job_alternate_protocol_.

[Bence, 2015/02/02 15:08:17]

Excellent idea!  Done.

   ~Job();
 
   // Start initiates the process of creating a new HttpStream. |request| will be
@@ -57,10 +58,8 @@ class HttpStreamFactoryImpl::Job {
 
   // Marks this Job as the "alternate" job, from Alternate-Protocol. Tracks the
   // original url so we can mark the Alternate-Protocol as broken if
-  // we fail to connect.  |alternate| specifies the alternate protocol to use
-  // and alternate port to connect to.
-  void MarkAsAlternate(const GURL& original_url,
-                       AlternateProtocolInfo alternate);
+  // we fail to connect.
+  void MarkAsAlternate(const GURL& original_url);
 
   // Tells |this| to wait for |job| to resume it.
   void WaitFor(Job* job);
@@ -275,6 +274,10 @@ class HttpStreamFactoryImpl::Job {
   // and will specify the original URL.
   scoped_ptr<GURL> original_url_;
 
+  // AlternateProtocol for the alternate job (regardless of whether it is this
+  // job or not).
+  AlternateProtocolInfo alternate_protocol_;
+
   // This is the Job we're dependent on. It will notify us if/when it's OK to
   // proceed.
   Job* blocking_job_;