Reverting 10250.

Rolling back since the windows module builders are failing ot find v8 project...
Review URL: http://codereview.chromium.org/27081

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10251 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 3 insertions, 136 deletions

diff --git a/net/build/net.vcproj b/net/build/net.vcproj
index ed3a769..bcc1d22 100644
--- a/net/build/net.vcproj
+++ b/net/build/net.vcproj
@@ -998,18 +998,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\proxy\proxy_resolver_v8.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\proxy\proxy_resolver_v8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\proxy\proxy_resolver_script.h"
-				>
-			</File>
-			<File
 				RelativePath="..\proxy\proxy_resolver_winhttp.cc"
 				>
 			</File>
diff --git a/net/build/net_unittests.vcproj b/net/build/net_unittests.vcproj
index 60d5742..2d9a249 100644
--- a/net/build/net_unittests.vcproj
+++ b/net/build/net_unittests.vcproj
@@ -419,10 +419,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\proxy\proxy_resolver_v8_unittest.cc"
-					>
-				</File>
-				<File
 					RelativePath="..\proxy\proxy_server_unittest.cc"
 					>
 				</File>
diff --git a/net/net.sln b/net/net.sln
index 9e8807f..fcfc249 100644
--- a/net/net.sln
+++ b/net/net.sln
@@ -59,14 +59,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_unittests", "build\net_
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
 		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
 		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
 		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
 	EndProjectSection
@@ -173,10 +171,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_resources", "build\net_
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8", "..\v8\tools\visual_studio\v8.vcproj", "{21E22961-22BF-4493-BD3A-868F93DA5179}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_base", "..\v8\tools\visual_studio\v8_base.vcproj", "{EC8B7909-62AF-470D-A75D-E1D89C837142}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -191,10 +185,6 @@ Global
 		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Win32.Build.0 = Debug|Win32
 		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Win32.ActiveCfg = Release|Win32
 		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Win32.Build.0 = Release|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Win32.ActiveCfg = Debug|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Win32.Build.0 = Debug|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Win32.ActiveCfg = Release|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Win32.Build.0 = Release|Win32
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Debug|Win32.Build.0 = Debug|Win32
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Release|Win32.ActiveCfg = Release|Win32
@@ -251,10 +241,6 @@ Global
 		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Debug|Win32.Build.0 = Debug|Win32
 		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Release|Win32.ActiveCfg = Release|Win32
 		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Release|Win32.Build.0 = Release|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Win32.Build.0 = Debug|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Win32.ActiveCfg = Release|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Win32.Build.0 = Release|Win32
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Win32.Build.0 = Debug|Win32
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Win32.ActiveCfg = Release|Win32
@@ -270,7 +256,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{0E5474AC-5996-4B13-87C0-4AE931EE0815} = {A04F65DF-D422-4E8F-B918-29EBA839363E}
 		{1832A374-8A74-4F9E-B536-69A699B3E165} = {A04F65DF-D422-4E8F-B918-29EBA839363E}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {A04F65DF-D422-4E8F-B918-29EBA839363E}
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {A04F65DF-D422-4E8F-B918-29EBA839363E}
 		{4A14E455-2B7C-4C0F-BCC2-35A9666C186F} = {E7D78B1F-F7D3-47CB-BF51-3957C646B406}
 		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {A04F65DF-D422-4E8F-B918-29EBA839363E}
@@ -281,7 +266,6 @@ Global
 		{B491C3A1-DE5F-4843-A1BB-AB8C4337187B} = {E7D78B1F-F7D3-47CB-BF51-3957C646B406}
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {A04F65DF-D422-4E8F-B918-29EBA839363E}
 		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41} = {E7D78B1F-F7D3-47CB-BF51-3957C646B406}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {A04F65DF-D422-4E8F-B918-29EBA839363E}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {A04F65DF-D422-4E8F-B918-29EBA839363E}
 		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {A04F65DF-D422-4E8F-B918-29EBA839363E}
 	EndGlobalSection
diff --git a/net/net.xcodeproj/project.pbxproj b/net/net.xcodeproj/project.pbxproj
index 636816e..e981f61 100644
--- a/net/net.xcodeproj/project.pbxproj
+++ b/net/net.xcodeproj/project.pbxproj
@@ -41,10 +41,8 @@
 		0435A47A0E8DD6F300E4DF08 /* http_auth_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0435A4790E8DD6F300E4DF08 /* http_auth_handler.cc */; };
 		0435A4800E8DD73600E4DF08 /* http_auth_handler_basic.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0435A47F0E8DD73600E4DF08 /* http_auth_handler_basic.cc */; };
 		0435A48F0E8DD74B00E4DF08 /* http_auth_handler_digest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0435A48E0E8DD74B00E4DF08 /* http_auth_handler_digest.cc */; };
-		044605E80F5350FD0058B8B1 /* proxy_resolver_v8.cc in Sources */ = {isa = PBXBuildFile; fileRef = 044605E70F5350FD0058B8B1 /* proxy_resolver_v8.cc */; };
-		044605EB0F53510A0058B8B1 /* proxy_resolver_v8_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 044605EA0F53510A0058B8B1 /* proxy_resolver_v8_unittest.cc */; };
-		044605FE0F5351DD0058B8B1 /* libjscre.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 044605CA0F5350B00058B8B1 /* libjscre.a */; };
-		044605FF0F5351DD0058B8B1 /* libv8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 044605CC0F5350B00058B8B1 /* libv8.a */; };
+		043C23D90EFC592000658F5E /* proxy_script_fetcher_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 043C23D80EFC592000658F5E /* proxy_script_fetcher_unittest.cc */; };
+		043C23DB0EFC592900658F5E /* proxy_script_fetcher.cc in Sources */ = {isa = PBXBuildFile; fileRef = 043C23DA0EFC592900658F5E /* proxy_script_fetcher.cc */; };
 		048133550ED27FEF005C5BBC /* url_request_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED33AB0E5A198600A747DB /* url_request_unittest.cc */; };
 		048268070E5B3B1000A30786 /* mime_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32AA0E5A181C00A747DB /* mime_util.cc */; };
 		048268080E5B3B3200A30786 /* http_chunked_decoder_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED33570E5A194700A747DB /* http_chunked_decoder_unittest.cc */; };
@@ -199,41 +197,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		044605C90F5350B00058B8B1 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 044605C00F5350B00058B8B1 /* v8.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 897FF1BF0E719CB600D62E90;
-			remoteInfo = jscre;
-		};
-		044605CB0F5350B00058B8B1 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 044605C00F5350B00058B8B1 /* v8.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 8970F2F00E719FB2006AE7B5;
-			remoteInfo = v8;
-		};
-		044605CD0F5350B00058B8B1 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 044605C00F5350B00058B8B1 /* v8.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 897F767A0E71B4CC007ACF34;
-			remoteInfo = v8_shell;
-		};
-		044605CF0F5350B00058B8B1 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 044605C00F5350B00058B8B1 /* v8.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 89F23C870E78D5B2006B2466;
-			remoteInfo = "v8-arm";
-		};
-		044605D10F5350B00058B8B1 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 044605C00F5350B00058B8B1 /* v8.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 89F23C950E78D5B6006B2466;
-			remoteInfo = "v8_shell-arm";
-		};
 		7B2630640E82F282001CE27F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7B2630600E82F282001CE27F /* libevent.xcodeproj */;
@@ -480,10 +443,6 @@
 		043C23D80EFC592000658F5E /* proxy_script_fetcher_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = proxy_script_fetcher_unittest.cc; path = proxy/proxy_script_fetcher_unittest.cc; sourceTree = "<group>"; };
 		043C23DA0EFC592900658F5E /* proxy_script_fetcher.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = proxy_script_fetcher.cc; path = proxy/proxy_script_fetcher.cc; sourceTree = "<group>"; };
 		043C23DC0EFC592E00658F5E /* proxy_script_fetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = proxy_script_fetcher.h; path = proxy/proxy_script_fetcher.h; sourceTree = "<group>"; };
-		044605C00F5350B00058B8B1 /* v8.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = v8.xcodeproj; path = build/v8.xcodeproj; sourceTree = "<group>"; };
-		044605E70F5350FD0058B8B1 /* proxy_resolver_v8.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = proxy_resolver_v8.cc; path = proxy/proxy_resolver_v8.cc; sourceTree = "<group>"; };
-		044605E90F5351010058B8B1 /* proxy_resolver_v8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = proxy_resolver_v8.h; path = proxy/proxy_resolver_v8.h; sourceTree = "<group>"; };
-		044605EA0F53510A0058B8B1 /* proxy_resolver_v8_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = proxy_resolver_v8_unittest.cc; path = proxy/proxy_resolver_v8_unittest.cc; sourceTree = "<group>"; };
 		04C626D50E8DE39E0067E92A /* http_auth_handler_digest_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = http_auth_handler_digest_unittest.cc; sourceTree = "<group>"; };
 		04C626D70E8DE3AA0067E92A /* http_auth_handler_basic_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = http_auth_handler_basic_unittest.cc; sourceTree = "<group>"; };
 		04C626D90E8DE3BA0067E92A /* http_auth_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = http_auth_unittest.cc; sourceTree = "<group>"; };
@@ -772,8 +731,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				044605FE0F5351DD0058B8B1 /* libjscre.a in Frameworks */,
-				044605FF0F5351DD0058B8B1 /* libv8.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -804,18 +761,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		044605C10F5350B00058B8B1 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				044605CA0F5350B00058B8B1 /* libjscre.a */,
-				044605CC0F5350B00058B8B1 /* libv8.a */,
-				044605CE0F5350B00058B8B1 /* v8_shell */,
-				044605D00F5350B00058B8B1 /* libv8-arm.a */,
-				044605D20F5350B00058B8B1 /* v8_shell-arm */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		08FB7794FE84155DC02AAC07 /* zlib */ = {
 			isa = PBXGroup;
 			children = (
@@ -1252,9 +1197,6 @@
 			children = (
 				820701030EB6611F005CD9E7 /* proxy_resolver_mac.h */,
 				820701020EB6611F005CD9E7 /* proxy_resolver_mac.cc */,
-				044605E70F5350FD0058B8B1 /* proxy_resolver_v8.cc */,
-				044605E90F5351010058B8B1 /* proxy_resolver_v8.h */,
-				044605EA0F53510A0058B8B1 /* proxy_resolver_v8_unittest.cc */,
 				043C23DA0EFC592900658F5E /* proxy_script_fetcher.cc */,
 				043C23DC0EFC592E00658F5E /* proxy_script_fetcher.h */,
 				043C23D80EFC592000658F5E /* proxy_script_fetcher_unittest.cc */,
@@ -1268,7 +1210,6 @@
 		E4AFA62D0E52409300201347 /* Projects */ = {
 			isa = PBXGroup;
 			children = (
-				044605C00F5350B00058B8B1 /* v8.xcodeproj */,
 				E4AFA6450E5241D300201347 /* base.xcodeproj */,
 				7BA016870E5A1E6E00044150 /* bzip2.xcodeproj */,
 				7B8501F10E5A372500730B43 /* googleurl.xcodeproj */,
@@ -1375,10 +1316,6 @@
 					ProjectRef = 7BA362B90E8C3D2B0023C8B9 /* sdch.xcodeproj */;
 				},
 				{
-					ProductGroup = 044605C10F5350B00058B8B1 /* Products */;
-					ProjectRef = 044605C00F5350B00058B8B1 /* v8.xcodeproj */;
-				},
-				{
 					ProductGroup = 7BA016940E5A1E8700044150 /* Products */;
 					ProjectRef = 7BA016930E5A1E8700044150 /* zlib.xcodeproj */;
 				},
@@ -1394,41 +1331,6 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		044605CA0F5350B00058B8B1 /* libjscre.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libjscre.a;
-			remoteRef = 044605C90F5350B00058B8B1 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		044605CC0F5350B00058B8B1 /* libv8.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libv8.a;
-			remoteRef = 044605CB0F5350B00058B8B1 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		044605CE0F5350B00058B8B1 /* v8_shell */ = {
-			isa = PBXReferenceProxy;
-			fileType = "compiled.mach-o.executable";
-			path = v8_shell;
-			remoteRef = 044605CD0F5350B00058B8B1 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		044605D00F5350B00058B8B1 /* libv8-arm.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = "libv8-arm.a";
-			remoteRef = 044605CF0F5350B00058B8B1 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		044605D20F5350B00058B8B1 /* v8_shell-arm */ = {
-			isa = PBXReferenceProxy;
-			fileType = "compiled.mach-o.executable";
-			path = "v8_shell-arm";
-			remoteRef = 044605D10F5350B00058B8B1 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		7B2630650E82F282001CE27F /* libevent.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1685,7 +1587,6 @@
 				821F20A50E5CD414003C7E38 /* url_request_view_cache_job.cc in Sources */,
 				82113BBD0E892E5800E3848F /* x509_certificate.cc in Sources */,
 				827E139D0E81611D00183614 /* x509_certificate_mac.cc in Sources */,
-				044605E80F5350FD0058B8B1 /* proxy_resolver_v8.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1742,7 +1643,6 @@
 				7BA361450E8C341F0023C8B9 /* test_completion_callback_unittest.cc in Sources */,
 				048133550ED27FEF005C5BBC /* url_request_unittest.cc in Sources */,
 				82113A1D0E8434EE00E3848F /* x509_certificate_unittest.cc in Sources */,
-				044605EB0F53510A0058B8B1 /* proxy_resolver_v8_unittest.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/net/proxy/proxy_resolver_v8_unittest.cc b/net/proxy/proxy_resolver_v8_unittest.cc
index bad4161..b576aa9 100644
--- a/net/proxy/proxy_resolver_v8_unittest.cc
+++ b/net/proxy/proxy_resolver_v8_unittest.cc
@@ -229,5 +229,4 @@ TEST(ProxyResolverV8Test, NoSetPacScript) {
   InitWithScriptFromDisk(&resolver, "direct.js");
   result = resolver.GetProxyForURL(kQueryUrl, kPacUrl, &proxy_info);
   EXPECT_EQ(net::OK, result);
-}
-
+}
\ No newline at end of file