Rolling back webkit-gyp switch. r14382

chrome/test/unit/unittests.vcproj

Index: chrome/test/unit/unittests.vcproj
===================================================================
--- chrome/test/unit/unittests.vcproj	(revision 14835)
+++ chrome/test/unit/unittests.vcproj	(working copy)
@@ -368,7 +368,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.rc"
 				>
 			</File>
 			<File
@@ -564,6 +564,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\browser\autocomplete\search_provider_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\browser\login_prompt_unittest.cc"
 				>
 			</File>
@@ -676,10 +680,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\browser\autocomplete\search_provider_unittest.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\browser\sessions\session_backend_unittest.cc"
 				>
 			</File>
@@ -847,19 +847,19 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\browser\renderer_host\test_render_view_host.cc"
+					RelativePath="..\..\browser\net\test_url_fetcher_factory.cc"
 					>
 				</File>
 				<File
-					RelativePath="..\..\browser\renderer_host\test_render_view_host.h"
+					RelativePath="..\..\browser\net\test_url_fetcher_factory.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\browser\net\test_url_fetcher_factory.cc"
+					RelativePath="..\..\browser\renderer_host\test_render_view_host.cc"
 					>
 				</File>
 				<File
-					RelativePath="..\..\browser\net\test_url_fetcher_factory.h"
+					RelativePath="..\..\browser\renderer_host\test_render_view_host.h"
 					>
 				</File>
 				<File