| 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..de9f13e9696cf1be51a0fa8cb5c3c8a094ef870f 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);
|
| ~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,9 @@ class HttpStreamFactoryImpl::Job {
|
| // and will specify the original URL.
|
| scoped_ptr<GURL> original_url_;
|
|
|
| + // The alternate protocol regardless of whether this job is alternate 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_;
|
|
|