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-12 23:11:32 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-12 23:11:32 +0000
commit6e136398f5a2f4e97c968b8be72d64ffa639ac53 (patch)
treeb6b52cf5c94005d009ea37a475f66c5a8673499b /net/proxy/proxy_script_fetcher.h
parent0d74f1e8fe44154ab7842812443b3138b2993c8c (diff)
downloadchromium_src-6e136398f5a2f4e97c968b8be72d64ffa639ac53.zip
chromium_src-6e136398f5a2f4e97c968b8be72d64ffa639ac53.tar.gz
chromium_src-6e136398f5a2f4e97c968b8be72d64ffa639ac53.tar.bz2
Add back proxy_script_fetcher[_unittest.cc] to the build -- mark the tests as DISABLED_ instead, until have resolved the purify builder error.
Review URL: http://codereview.chromium.org/14081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6949 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.