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

2 files changed, 8 insertions, 8 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.
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;