diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 05:54:06 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 05:54:06 +0000 |
| commit | 70b923496d2efe796adb5b714be06a72447fb35f (patch) | |
| tree | e6304ccf384bb4dc9b64d36375cf22a91d2b3f2e /net/proxy | |
| parent | d7a7173f296d9511ca33f77295c18fa3375d5573 (diff) | |
| download | chromium_src-70b923496d2efe796adb5b714be06a72447fb35f.zip chromium_src-70b923496d2efe796adb5b714be06a72447fb35f.tar.gz chromium_src-70b923496d2efe796adb5b714be06a72447fb35f.tar.bz2 | |
Reland fix for OCSP startup race.
This is a revert of r62107 which is a revert of r62105 which is a revert of r60753 which is a revert of r60739 which is a revert of r60025 which is a revert of r59972 which is a revert of r59570 which is a revert of r59511 which is a revert of r59299 which is a revert of r59289.
The most recent reverts have all been due to ChromiumOS leaks which I believe to be fixed after fixing bug 58572, since I tested the combined fix in r62105 which was green on all ChromiumOS valgrind bots.
BUG=55940
TEST=Run a debug build on Linux. 10% or so of startups used to crash on startup. Shouldn't happen anymore.
Review URL: http://codereview.chromium.org/3660010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_script_fetcher.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/proxy/proxy_script_fetcher.cc b/net/proxy/proxy_script_fetcher.cc index 0398134..0856430 100644 --- a/net/proxy/proxy_script_fetcher.cc +++ b/net/proxy/proxy_script_fetcher.cc @@ -412,4 +412,5 @@ size_t ProxyScriptFetcher::SetSizeConstraintForUnittest(size_t size_bytes) { return prev; } + } // namespace net |