summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_script_fetcher_unittest.cc
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_unittest.cc
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_unittest.cc')
-rw-r--r--net/proxy/proxy_script_fetcher_unittest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/proxy/proxy_script_fetcher_unittest.cc b/net/proxy/proxy_script_fetcher_unittest.cc
index 73476ed..22cb91e 100644
--- a/net/proxy/proxy_script_fetcher_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_unittest.cc
@@ -160,7 +160,7 @@ GURL GetTestFileUrl(const std::string& relpath) {
return GURL(base_url.spec() + "/" + relpath);
}
-TEST(ProxyScriptFetcherTest, FileUrl) {
+TEST(ProxyScriptFetcherTest, DISABLED_FileUrl) {
SynchFetcher pac_fetcher;
{ // Fetch a non-existent file.
@@ -177,7 +177,7 @@ TEST(ProxyScriptFetcherTest, FileUrl) {
// Note that all mime types are allowed for PAC file, to be consistent
// with other browsers.
-TEST(ProxyScriptFetcherTest, HttpMimeType) {
+TEST(ProxyScriptFetcherTest, DISABLED_HttpMimeType) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;
@@ -201,7 +201,7 @@ TEST(ProxyScriptFetcherTest, HttpMimeType) {
}
}
-TEST(ProxyScriptFetcherTest, HttpStatusCode) {
+TEST(ProxyScriptFetcherTest, DISABLED_HttpStatusCode) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;
@@ -219,7 +219,7 @@ TEST(ProxyScriptFetcherTest, HttpStatusCode) {
}
}
-TEST(ProxyScriptFetcherTest, ContentDisposition) {
+TEST(ProxyScriptFetcherTest, DISABLED_ContentDisposition) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;
@@ -231,7 +231,7 @@ TEST(ProxyScriptFetcherTest, ContentDisposition) {
EXPECT_EQ("-downloadable.pac-\n", result.bytes);
}
-TEST(ProxyScriptFetcherTest, TooLarge) {
+TEST(ProxyScriptFetcherTest, DISABLED_TooLarge) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;
@@ -264,7 +264,7 @@ TEST(ProxyScriptFetcherTest, TooLarge) {
}
}
-TEST(ProxyScriptFetcherTest, Hang) {
+TEST(ProxyScriptFetcherTest, DISABLED_Hang) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;