diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 21:30:35 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 21:30:35 +0000 |
| commit | a3d677d8ff537f07aba274a61e0621a3db9af074 (patch) | |
| tree | 8d53d838688c11edfafd8e100742b2d87fe8a746 /net/socket/client_socket_pool_base.h | |
| parent | fb245a0e547638deabc5cb094a38ba863ff22ec7 (diff) | |
| download | chromium_src-a3d677d8ff537f07aba274a61e0621a3db9af074.zip chromium_src-a3d677d8ff537f07aba274a61e0621a3db9af074.tar.gz chromium_src-a3d677d8ff537f07aba274a61e0621a3db9af074.tar.bz2 | |
Revert r77399 in preparation for merging a small portion of it to 696.
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
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/6681012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77864 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_base.h')
| -rw-r--r-- | net/socket/client_socket_pool_base.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h index 8fcb571..53c8fbc 100644 --- a/net/socket/client_socket_pool_base.h +++ b/net/socket/client_socket_pool_base.h @@ -283,9 +283,7 @@ class ClientSocketPoolBaseHelper return connect_job_factory_->ConnectionTimeout(); } - static bool connect_backup_jobs_enabled(); static void set_connect_backup_jobs_enabled(bool enabled); - void EnableConnectBackupJobs(); // ConnectJob::Delegate methods: |