diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 01:39:00 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 01:39:00 +0000 |
| commit | 106c27f45f6510c0bfdf305956821aab1056cdef (patch) | |
| tree | 9fcaa8199e596c46dd3a59b67457e30b1348aedd /net/http/http_response_info.h | |
| parent | 134d74a0d65ef932d51adef62868612aec1ef9e0 (diff) | |
| download | chromium_src-106c27f45f6510c0bfdf305956821aab1056cdef.zip chromium_src-106c27f45f6510c0bfdf305956821aab1056cdef.tar.gz chromium_src-106c27f45f6510c0bfdf305956821aab1056cdef.tar.bz2 | |
Reland r77075,r77077.
They were reverted due to flaky tests, especially on valgrind. Basically, we kept hitting the backup socket timer (500ms) which would create another socket, which the tests don't expect, so they crash. I disabled the backup socket timer completely for the SPDY tests, because they make it too hard to handle the parallel alternate protocol jobs.
I also deleted the HTTP fallback test from SpdyNetworkTransactionTest, because it had a similar problem. Also, it was already being tested in HttpNetworkTransactionTest.
BUG=69688,75000
TEST=Try connecting to belshe.com with various proxy configurations. Should work still.
Review URL: http://codereview.chromium.org/6635047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_response_info.h')
| -rw-r--r-- | net/http/http_response_info.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/http/http_response_info.h b/net/http/http_response_info.h index e13f288..c925aa9 100644 --- a/net/http/http_response_info.h +++ b/net/http/http_response_info.h @@ -52,10 +52,6 @@ class HttpResponseInfo { // True if the npn was negotiated for this request. bool was_npn_negotiated; - // True if response could use alternate protocol. However, browser - // will ingore the alternate protocol if spdy is not enabled. - bool was_alternate_protocol_available; - // True if the request was fetched via an explicit proxy. The proxy could // be any type of proxy, HTTP or SOCKS. Note, we do not know if a // transparent proxy may have been involved. |