Add chrome.dll's resources to unit_tests.exe for "in-process" testing.

Add missing .h files in chrome_dll.vcproj.
Review URL: http://codereview.chromium.org/18605

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

3 files changed, 126 insertions, 5 deletions

diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj
index d98b7c0..2a204f1 100644
--- a/chrome/app/chrome_dll.vcproj
+++ b/chrome/app/chrome_dll.vcproj
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
-                                AdditionalManifestFiles="$(SolutionDir)\app\chrome.dll.manifest"
+				AdditionalManifestFiles="$(SolutionDir)\app\chrome.dll.manifest"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
@@ -164,6 +164,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\browser\browser_resources.h"
+				>
+			</File>
+			<File
 				RelativePath="..\browser\browser_resources.rc"
 				>
 			</File>
@@ -196,6 +200,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\common_resources.h"
+				>
+			</File>
+			<File
 				RelativePath="..\common\common_resources.rc"
 				>
 			</File>
@@ -204,6 +212,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\browser\debugger\resources\debugger_resources.h"
+				>
+			</File>
+			<File
 				RelativePath="..\browser\debugger\resources\debugger_resources.rc"
 				>
 			</File>
@@ -212,6 +224,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\renderer\renderer_resources.h"
+				>
+			</File>
+			<File
 				RelativePath="..\renderer\renderer_resources.rc"
 				>
 			</File>
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons
index 01b5492..efe4442 100644
--- a/chrome/test/unit/unit_tests.scons
+++ b/chrome/test/unit/unit_tests.scons
@@ -268,10 +268,21 @@ input_files = ChromeFileList([
     '$CHROME_DIR/renderer/mock_render_thread.h',
   ]),
   MSVSFilter('resources', [
-    '$CHROME_DIR/test/data/resource.h',
-    '$CHROME_DIR/test/data/resource.rc',
     '$CHROME_DIR/browser/browser_resources.h',
     '$CHROME_DIR/browser/browser_resources.rc',
+    '$CHROME_DIR/app/chrome_dll.rc',
+    '$CHROME_DIR/app/chrome_dll_resource.h',
+    '$CHROME_DIR/app/chrome_dll_version.rc.version',
+    '$CHROME_DIR/common/common_resources.h',
+    '$CHROME_DIR/common/common_resources.rc',
+    '$CHROME_DIR/browser/debugger/resources/debugger_resources.h',
+    '$CHROME_DIR/browser/debugger/resources/debugger_resources.rc',
+    '$TARGET_ROOT/grit_derived_sources/net_resources.res',
+    '$CHROME_DIR/renderer/renderer_resources.h',
+    '$CHROME_DIR/renderer/renderer_resources.rc',
+    '$CHROME_DIR/test/data/resource.h',
+    '$CHROME_DIR/test/data/resource.rc',
+    '$TARGET_ROOT/grit_derived_sources/webkit_resources.res',
   ]),
   MSVSFilter('test_infrastructure', [
     'chrome_test_suite.h',
@@ -341,8 +352,23 @@ if env.Bit('mac'):
 if not env.Bit('windows'):
   # Windows-specific.
   input_files.Remove(
+      '$CHROME_DIR/browser/browser_resources.h',
+      '$CHROME_DIR/browser/browser_resources.rc',
+      '$CHROME_DIR/app/chrome_dll.rc',
+      '$CHROME_DIR/app/chrome_dll_resource.h',
+      '$CHROME_DIR/app/chrome_dll_version.rc.version',
+      '$CHROME_DIR/common/common_resources.h',
+      '$CHROME_DIR/common/common_resources.rc',
+      '$CHROME_DIR/browser/debugger/resources/debugger_resources.h',
+      '$CHROME_DIR/browser/debugger/resources/debugger_resources.rc',
+      '$TARGET_ROOT/grit_derived_sources/net_resources.res',
       '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
       '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+      '$CHROME_DIR/renderer/renderer_resources.h',
+      '$CHROME_DIR/renderer/renderer_resources.rc',
+      '$CHROME_DIR/test/data/resource.h',
+      '$CHROME_DIR/test/data/resource.rc',
+      '$TARGET_ROOT/grit_derived_sources/webkit_resources.res',
   )
 
 if not env.Bit('windows'):
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index 3df2bd7..7623d3c 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -12,12 +12,15 @@
 		/>
 	</Platforms>
 	<ToolFiles>
+		<ToolFile
+			RelativePath="..\..\tools\build\win\version.rules"
+		/>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;..\..\tools\build\win\precompiled_wtl.vsprops;..\..\tools\build\win\unit_test.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\third_party\hunspell\using_hunspell.vsprops;..\..\..\third_party\npapi\using_npapi.vsprops"
+			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;..\..\tools\build\win\precompiled_wtl.vsprops;..\..\tools\build\win\unit_test.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\third_party\hunspell\using_hunspell.vsprops;..\..\..\third_party\npapi\using_npapi.vsprops;..\..\installer\util\using_util.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -79,7 +82,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;..\..\tools\build\win\unit_test.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\third_party\hunspell\using_hunspell.vsprops;..\..\..\third_party\npapi\using_npapi.vsprops"
+			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;..\..\tools\build\win\unit_test.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\third_party\hunspell\using_hunspell.vsprops;..\..\..\third_party\npapi\using_npapi.vsprops;..\..\installer\util\using_util.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -262,6 +265,10 @@
 			Name="resources"
 			>
 			<File
+				RelativePath="..\..\..\webkit\glue\resources\aliasb.cur"
+				>
+			</File>
+			<File
 				RelativePath="..\..\browser\browser_resources.h"
 				>
 			</File>
@@ -270,6 +277,58 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\webkit\glue\resources\cell.cur"
+				>
+			</File>
+			<File
+				RelativePath="..\..\app\chrome_dll.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\app\chrome_dll_resource.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\app\chrome_dll_version.rc.version"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\webkit\glue\resources\col_resize.cur"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\common_resources.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\common_resources.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\webkit\glue\resources\copy.cur"
+				>
+			</File>
+			<File
+				RelativePath="..\..\browser\debugger\resources\debugger_resources.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\browser\debugger\resources\debugger_resources.rc"
+				>
+			</File>
+			<File
+				RelativePath="$(OutDir)\grit_derived_sources\net_resources.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\renderer\renderer_resources.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\renderer\renderer_resources.rc"
+				>
+			</File>
+			<File
 				RelativePath="..\data\resource.h"
 				>
 			</File>
@@ -277,6 +336,26 @@
 				RelativePath="..\data\resource.rc"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\webkit\glue\resources\row_resize.cur"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\webkit\glue\resources\vertical_text.cur"
+				>
+			</File>
+			<File
+				RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\webkit\glue\resources\zoom_in.cur"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\webkit\glue\resources\zoom_out.cur"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="browser"