diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-15 05:21:44 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-15 05:21:44 +0000 |
| commit | 554c6eff8a5fabf281ca314293fbec2f23f8311d (patch) | |
| tree | 7c0ad3a2480b5738c3a0bdf54b452ff4d939b7c5 /net/proxy/proxy_script_fetcher.h | |
| parent | 7f13213046692e4811ff9aaa0a90ed1c99e5603d (diff) | |
| download | chromium_src-554c6eff8a5fabf281ca314293fbec2f23f8311d.zip chromium_src-554c6eff8a5fabf281ca314293fbec2f23f8311d.tar.gz chromium_src-554c6eff8a5fabf281ca314293fbec2f23f8311d.tar.bz2 | |
Reverting 6977.
TBR=erikkay
Review URL: http://codereview.chromium.org/14111
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_script_fetcher.h')
| -rw-r--r-- | net/proxy/proxy_script_fetcher.h | 4 |
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. |