From 106c27f45f6510c0bfdf305956821aab1056cdef Mon Sep 17 00:00:00 2001 From: "willchan@chromium.org" Date: Wed, 9 Mar 2011 01:39:00 +0000 Subject: 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 --- net/url_request/url_request.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'net/url_request') diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h index 72ab4d1..b98282a 100644 --- a/net/url_request/url_request.h +++ b/net/url_request/url_request.h @@ -406,12 +406,6 @@ class URLRequest : public base::NonThreadSafe { return response_info_.was_npn_negotiated; } - // Returns true if the URLRequest was delivered when the alternate protocol - // is available. - bool was_alternate_protocol_available() const { - return response_info_.was_alternate_protocol_available; - } - // Returns true if the URLRequest was delivered through a proxy. bool was_fetched_via_proxy() const { return response_info_.was_fetched_via_proxy; -- cgit v1.1