summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_script_fetcher.h
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-17 03:50:05 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-17 03:50:05 +0000
commit4bed5d848f83fdd740f533459fa7b6a1e7508f8c (patch)
tree3e04c773dc97147b14083f56764b6a8a5e3143f4 /net/proxy/proxy_script_fetcher.h
parent7534d489ea13fe9fcacc881b7abfe760b3a5513d (diff)
downloadchromium_src-4bed5d848f83fdd740f533459fa7b6a1e7508f8c.zip
chromium_src-4bed5d848f83fdd740f533459fa7b6a1e7508f8c.tar.gz
chromium_src-4bed5d848f83fdd740f533459fa7b6a1e7508f8c.tar.bz2
Reverting 7125.
removing the experiment Review URL: http://codereview.chromium.org/14188 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_script_fetcher.h')
-rw-r--r--net/proxy/proxy_script_fetcher.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/proxy/proxy_script_fetcher.h b/net/proxy/proxy_script_fetcher.h
index fddbd7b..3792cab 100644
--- a/net/proxy/proxy_script_fetcher.h
+++ b/net/proxy/proxy_script_fetcher.h
@@ -50,8 +50,8 @@ class ProxyScriptFetcher {
// Testing helpers (only available to unit-tests).
// --------------------------------------------------------------------------
private:
- FRIEND_TEST(ProxyScriptFetcherTest, Hang);
- FRIEND_TEST(ProxyScriptFetcherTest, TooLarge);
+ FRIEND_TEST(ProxyScriptFetcherTest, DISABLED_Hang);
+ FRIEND_TEST(ProxyScriptFetcherTest, DISABLED_TooLarge);
// Sets the maximum duration for a fetch to |timeout_ms|. Returns the previous
// bound.