Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(394)

Unified Diff: net/http/http_stream_factory_impl_job.h

Issue 1054413002: Remove the "alternate_url" outparam from (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix preconnect Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_stream_factory_impl.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b54623eb27946b33f98a0a8fc5fdf75f3d0a43e0..07fe5f525e3efb957cb72ded88cd6af87ffe8f37 100644
--- a/net/http/http_stream_factory_impl_job.h
+++ b/net/http/http_stream_factory_impl_job.h
@@ -55,12 +55,9 @@ class HttpStreamFactoryImpl::Job {
int RestartTunnelWithProxyAuth(const AuthCredentials& credentials);
LoadState GetLoadState() const;
- // 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,
- AlternativeService alternative_service);
+ // Marks this Job as the "alternate" job, from Alternate-Protocol or Alt-Svc
+ // using the specified alternate service.
+ void MarkAsAlternate(AlternativeService alternative_service);
// Tells |this| to wait for |job| to resume it.
void WaitFor(Job* job);
@@ -275,12 +272,15 @@ class HttpStreamFactoryImpl::Job {
// original request when host mapping rules are set-up.
GURL origin_url_;
- // The original URL if the Job is for an alternative service.
- GURL original_url_;
-
// AlternateProtocol for this job if this is an alternate job.
AlternativeService alternative_service_;
+ // The URL to be used for proxy resolution and socket pools. If the alternate
+ // service is SPDY, the URL will containg the host:port from
+ // |alternate_service_| and "https://" scheme. Otherwise, this will be the
+ // same as |origin_url_|.
+ GURL alternative_service_url_;
+
// AlternateProtocol for the other job if this is not an alternate job.
AlternativeService other_job_alternative_service_;
« no previous file with comments | « net/http/http_stream_factory_impl.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698