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

6 files changed, 22 insertions, 8 deletions

diff --git a/net/build/net.vcproj b/net/build/net.vcproj
index 4530a27..0371f78 100644
--- a/net/build/net.vcproj
+++ b/net/build/net.vcproj
@@ -1029,6 +1029,14 @@
 				>

 			</File>

 			<File

+				RelativePath="..\proxy\proxy_script_fetcher.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\proxy\proxy_script_fetcher.h"

+				>

+			</File>

+			<File

 				RelativePath="..\proxy\proxy_service.cc"

 				>

 			</File>

diff --git a/net/build/net_unittests.vcproj b/net/build/net_unittests.vcproj
index 2739355..faa6f83 100644
--- a/net/build/net_unittests.vcproj
+++ b/net/build/net_unittests.vcproj
@@ -415,6 +415,10 @@
 				Name="proxy"

 				>

 				<File

+					RelativePath="..\proxy\proxy_script_fetcher_unittest.cc"

+					>

+				</File>

+				<File

 					RelativePath="..\proxy\proxy_service_unittest.cc"

 					>

 				</File>

diff --git a/net/net_lib.scons b/net/net_lib.scons
index 9f080586..972dd31 100644
--- a/net/net_lib.scons
+++ b/net/net_lib.scons
@@ -79,6 +79,7 @@ input_files = [
     'http/http_vary_data.cc',
     'http/winhttp_request_throttle.cc',
     'proxy/proxy_resolver_fixed.cc',
+    'proxy/proxy_script_fetcher.cc',
     'proxy/proxy_service.cc',
     'url_request/mime_sniffer_proxy.cc',
     'url_request/url_request.cc',
diff --git a/net/net_unittests.scons b/net/net_unittests.scons
index 3535850..713505c 100644
--- a/net/net_unittests.scons
+++ b/net/net_unittests.scons
@@ -80,6 +80,7 @@ input_files = [
     'http/http_transaction_unittest.cc',
     'http/http_util_unittest.cc',
     'http/http_vary_data_unittest.cc',
+    'proxy/proxy_script_fetcher_unittest.cc',
     'proxy/proxy_service_unittest.cc',
     'url_request/url_request_unittest.cc',
 ]
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;