Generate all chrome .vcproj files:

* Path name translation (/ to \) of various MSVSTool attributes.
* Explicit keyword= arguments to MSVSProject.  This will likely
  go away eventually in favor of uniform behavior.
* Add a relative_path_substitutions array that can be used
  to substitute in Visual Studio variable like $(OutDir).
* Add a local_directory_prefix that can be set to './' to only
  affect files in the current directory.
* Additional Keyword ordering in Tool attributes to continue to
  match the default order Visual Studio generates.
* Add a Derived() proxy class that can wrap a File node to tell
  the .vcproj generation that we want the derived file, not its
  source(s), in the file list.
* In the individual *.scons files, add the necessary files (mostly
  .h files) to file lists, and update MSVSProject() calls with
  the additional necessary information.

Result is identical .vcproj files modulo the following differences:

* Four locales .vcproj files (da, en-US, he and zh-TW) with
  source file orders that don't match the other locale .vcproj
  files have re-ordered file lists to match the rest.
* Cosmetic XML changes (white space, ending tags) in:
    chrome/app/chrome_dll.vcproj
    chrome/app/generated_resources.vcproj
    net/build/net_resources.vcproj
* Removal or addition of ./ prefixes from various files that don't
  match the other file specifications within their individual
  .vcproj files:
    chrome/installer/util/util.vcproj
    net/build/net.vcproj
    net/build/net_unittests.vcproj
* Add missing empty sections (<ToolFiles>, <References>, <Globals>)
  for consistency with other .vcproj files:
    chrome/tools/test/image_diff/image_diff.vcproj
    third_party/libpng/libpng.vcproj
    third_party/zlib/zlib.vcproj
* Add missing RootNameSpace attribute:
    chrome/test/automation/automation.vcproj
    testing/gtest.vcproj
* Use && instead of \r\n as a command separator, to sidestep
  XML-generation problems:
    chrome/app/chrome_exe.vcproj
* Remove unnecessary (?) duplicate files in the file list:
    chrome/browser/views/browser_views.vcproj
      (event_utils.cc and event_utils.h were duplicated)
  
Review URL: http://codereview.chromium.org/17603

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

base/base_lib.scons

@@ -219,8 +219,8 @@ input_files = ChromeFileList([
     'system_monitor.h',
     'system_monitor_win.cc',
     'task.h',
-    'test_file_util_win.cc',
     'test_file_util.h',
+    'test_file_util_win.cc',
     'thread.cc',
     'thread.h',
     'thread_collision_warner.cc',
@@ -246,8 +246,9 @@ input_files = ChromeFileList([
     'values.cc',
     'values.h',
     'waitable_event.h',
-    'waitable_event_win.cc',
+    'waitable_event_watcher.h',
     'waitable_event_watcher_win.cc',
+    'waitable_event_win.cc',
     'watchdog.cc',
     'watchdog.h',
     'win_util.cc',
@@ -388,6 +389,7 @@ env.ChromeLibrary('base', input_files)
 p = env.ChromeMSVSProject('build/base.vcproj',
                           dest='$CHROME_SRC_DIR/base/build/base.vcproj',
                           guid='{1832A374-8A74-4F9E-B536-69A699B3E165}',
+                          keyword='Win32Proj',
                           dependencies=[
                               'build/debug_message.vcproj',
                               # Necessary for chrome.sln.

base/debug_message.scons

@@ -28,12 +28,11 @@ if env.Bit('windows'):
   # if it's really Windows-specific.
   env.ChromeProgram('debug_message', input_files)
 
-env.ChromeMSVSProject('$BASE_DIR/build/debug_message.vcproj',
-                guid='{0E5474AC-5996-4B13-87C0-4AE931EE0815}')
-
 p = env.ChromeMSVSProject('build/debug_message.vcproj',
-                          dest='$CHROME_SRC_DIR/base/build/debug_message.vcproj',
+                          dest=('$CHROME_SRC_DIR/base/'
+                                + 'build/debug_message.vcproj'),
                           guid='{0E5474AC-5996-4B13-87C0-4AE931EE0815}',
+                          keyword='Win32Proj',
                           files=input_files,
                           root_namespace='DebugMessage',
                           tools = [

base/gfx/base_gfx.scons

@@ -61,6 +61,7 @@ env.ChromeLibrary('base_gfx', input_files)
 p = env.ChromeMSVSProject('../build/base_gfx.vcproj',
                           dest='$CHROME_SRC_DIR/base/build/base_gfx.vcproj',
                           guid='{A508ADD3-CECE-4E0F-8448-2F5E454DF551}',
+                          keyword='Win32Proj',
                           files=input_files,
                           tools=[
                               'VCPreBuildEventTool',

chrome/SConscript

@@ -58,6 +58,74 @@ if env_res.Bit('windows'):
       webkit_res,
   ]
 
+##############################################################################
+# TODO(sgk):  move to separate .scons file for generated_resources ###########
+
+# TODO(sgk): make a pseudo-Builder for these
+import sys
+sys.path.append(env.Dir('$CHROME_SRC_DIR/tools/grit').abspath)
+
+env_grd = env.Clone()
+env_grd.Tool('scons', toolpath=[env_grd.Dir('$CHROME_SRC_DIR/tools/grit/grit')])
+
+# NOTE: fake target gets replaced with real targets from reading .grd
+generated = env_grd.GRIT(
+    '$TARGET_ROOT/grit_derived_sources/fake_generated_target',
+    '$CHROME_SRC_DIR/chrome/app/generated_resources.grd')
+grit_files.extend(generated)
+
+# NOTE: fake target gets replaced with real targets from reading .grd
+chromium = env_grd.GRIT(
+    '$TARGET_ROOT/grit_derived_sources/fake_chromium_target',
+    '$CHROME_SRC_DIR/chrome/app/chromium_strings.grd')
+grit_files.extend(chromium)
+
+# NOTE: fake target gets replaced with real targets from reading .grd
+google_chrome = env_grd.GRIT(
+    '$TARGET_ROOT/grit_derived_sources/fake_google_chrome_target',
+    '$CHROME_SRC_DIR/chrome/app/google_chrome_strings.grd')
+grit_files.extend(google_chrome)
+
+input_files = ChromeFileList([
+    'app/generated_resources.grd',
+    'app/google_chrome_strings.grd',
+    'app/chromium_strings.grd',
+    Derived(env.File('$TARGET_ROOT/grit_derived_sources/'
+                     + 'generated_resources.h')),
+])
+
+p = env.ChromeMSVSProject('app/generated_resources.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'app/generated_resources.vcproj'),
+                          guid='{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_substitutions = [
+                            ('../../../grit_derived_sources', '$(IntDir)'),
+                          ],
+                          local_directory_prefix='./',
+                          ConfigurationType='10')
+
+p.AddToolFile('../tools/grit/build/grit_localized_resources.rules')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+            ])
+
+##############################################################################
+# TODO(sgk):  move to separate .scons file for chrome.dll ####################
+
 env_dll = env.Clone()
 
 env_dll.ApplySConscript([
@@ -190,47 +258,43 @@ if env_dll.Bit('windows'):
       ],
   )
 
-input_files = []
-
-if env_dll.Bit('windows'):
-  input_files.extend([
-      'app/chrome_dll_main.cc',
-      '$V8_DIR/snapshot-empty$OBJSUFFIX',
-  ])
-
-
-
-# TODO(sgk): make a pseudo-Builder for these
-import sys
-sys.path.append(env.Dir('$CHROME_SRC_DIR/tools/grit').abspath)
-
-env_grd = env.Clone()
-env_grd.Tool('scons', toolpath=[env_grd.Dir('$CHROME_SRC_DIR/tools/grit/grit')])
-
-# NOTE: fake target gets replaced with real targets from reading .grd
-generated = env_grd.GRIT(
-    '$TARGET_ROOT/grit_derived_sources/fake_generated_target',
-    '$CHROME_SRC_DIR/chrome/app/generated_resources.grd')
-grit_files.extend(generated)
-
-# NOTE: fake target gets replaced with real targets from reading .grd
-chromium = env_grd.GRIT(
-    '$TARGET_ROOT/grit_derived_sources/fake_chromium_target',
-    '$CHROME_SRC_DIR/chrome/app/chromium_strings.grd')
-grit_files.extend(chromium)
-
-# NOTE: fake target gets replaced with real targets from reading .grd
-google_chrome = env_grd.GRIT(
-    '$TARGET_ROOT/grit_derived_sources/fake_google_chrome_target',
-    '$CHROME_SRC_DIR/chrome/app/google_chrome_strings.grd')
-grit_files.extend(google_chrome)
-
-
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('resources', [
+    '$WEBKIT_DIR/glue/resources/aliasb.cur',
+    'browser/browser_resources.rc',
+    '$WEBKIT_DIR/glue/resources/cell.cur',
+    'app/check_dependents.bat',
+    'app/chrome.dll.deps',
+    'app/chrome_dll.rc',
+    'app/chrome_dll_resource.h',
+    'app/chrome_dll_version.rc.version',
+    '$WEBKIT_DIR/glue/resources/col_resize.cur',
+    'common/common_resources.rc',
+    '$WEBKIT_DIR/glue/resources/copy.cur',
+    'browser/debugger/resources/debugger_resources.rc',
+    Derived(env_dll.File('$TARGET_ROOT/grit_derived_sources/net_resources.rc')),
+    'renderer/renderer_resources.rc',
+    '$WEBKIT_DIR/glue/resources/row_resize.cur',
+    '$WEBKIT_DIR/glue/resources/vertical_text.cur',
+    Derived(env_dll.File('$TARGET_ROOT/'
+                         + 'grit_derived_sources/webkit_resources.rc')),
+    '$WEBKIT_DIR/glue/resources/zoom_in.cur',
+    '$WEBKIT_DIR/glue/resources/zoom_out.cur',
+  ]),
+    'app/chrome_dll_main.cc',
+])
 
 # TODO(port)
 if env_dll.Bit('windows'):
-  dll_targets = env_dll.ChromeSharedLibrary('chrome_dll/chrome',
-                                            dll_resources + input_files,
+  additional = [
+      '$V8_DIR/snapshot-empty$OBJSUFFIX'
+  ]
+  dll_targets = env_dll.ChromeSharedLibrary('app/chrome_dll/chrome',
+                                            #dll_resources + input_files,
+                                            input_files + additional,
                                             PDB='chrome_dll.pdb')
   install_targets.extend(dll_targets)
 
@@ -260,47 +324,134 @@ if env_dll.Bit('windows'):
   install_targets.extend(chrome_dll_version_rc)
   install_targets.extend(chrome_dll_version_res)
 
-env.ChromeMSVSProject('$CHROME_DIR/app/chrome_dll.vcproj',
-                dependencies = [
-                    '$BASE_DIR/build/base.vcproj',
-                    '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
-                    '$CHROME_DIR/plugin/plugin.vcproj',
-                    '$LIBJPEG_DIR/libjpeg.vcproj',
-                    '$BZIP2_DIR/bzip2.vcproj',
-                    '$NET_DIR/build/net.vcproj',
-                    ('$WEBKIT_DIR/build/JavaScriptCore/' +
-                         'JavaScriptCore_pcre.vcproj'),
-                    '$WEBKIT_DIR/build/port/port.vcproj',
-                    '$CHROME_DIR/browser/debugger/debugger.vcproj',
-                    '$WEBKIT_DIR/default_plugin/default_plugin.vcproj',
-                    '$CHROME_DIR/browser/browser.vcproj',
-                    '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
-                    '$SQLITE_DIR/sqlite.vcproj',
-                    '$CHROME_DIR/views/views.vcproj',
-                    '$MODP_B64_DIR/modp_b64.vcproj',
-                    '$ZLIB_DIR/zlib.vcproj',
-                    '$CHROME_DIR/common/common.vcproj',
-                    '$ICU38_DIR/build/icu.vcproj',
-                    '$CHROME_DIR/renderer/renderer.vcproj',
-                    '$BASE_DIR/build/base_gfx.vcproj',
-                    '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
-                    '$CHROME_DIR/browser/resources/browser_resources.vcproj',
-                    '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj',
-                    '$LIBPNG_DIR/libpng.vcproj',
-                    '$WEBKIT_DIR/build/glue/glue.vcproj',
-                    '$SKIA_DIR/skia.vcproj',
-                    '$CHROME_DIR/third_party/hunspell/hunspell.vcproj',
-                    '$GEARS_DIR/gears.vcproj',
-                    '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                    '$CHROME_DIR/installer/util/util.vcproj',
-                    '$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
-                    '$SDCH_DIR/sdch.vcproj',
-                    '$CHROME_DIR/browser/views/browser_views.vcproj',
-                    '$LIBXSLT_DIR/build/libxslt.vcproj',
-                ],
-                guid='{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}')
+p = env.ChromeMSVSProject('app/chrome_dll.vcproj',
+                          dest='$CHROME_SRC_DIR/chrome/app/chrome_dll.vcproj',
+                          guid='{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$BASE_DIR/build/base.vcproj',
+                              '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
+                              '$CHROME_DIR/plugin/plugin.vcproj',
+                              '$LIBJPEG_DIR/libjpeg.vcproj',
+                              '$BZIP2_DIR/bzip2.vcproj',
+                              '$NET_DIR/build/net.vcproj',
+                              ('$WEBKIT_DIR/build/JavaScriptCore/' +
+                                   'JavaScriptCore_pcre.vcproj'),
+                              '$WEBKIT_DIR/build/port/port.vcproj',
+                              '$CHROME_DIR/browser/debugger/debugger.vcproj',
+                              '$WEBKIT_DIR/default_plugin/default_plugin.vcproj',
+                              '$CHROME_DIR/browser/browser.vcproj',
+                              '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
+                              '$SQLITE_DIR/sqlite.vcproj',
+                              '$CHROME_DIR/views/views.vcproj',
+                              '$MODP_B64_DIR/modp_b64.vcproj',
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$CHROME_DIR/renderer/renderer.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
+                              ('$CHROME_DIR/browser/'
+                               + 'resources/browser_resources.vcproj'),
+                              '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj',
+                              '$LIBPNG_DIR/libpng.vcproj',
+                              '$WEBKIT_DIR/build/glue/glue.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                              '$CHROME_DIR/third_party/hunspell/hunspell.vcproj',
+                              '$GEARS_DIR/gears.vcproj',
+                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                              '$CHROME_DIR/installer/util/util.vcproj',
+                              '$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
+                              '$SDCH_DIR/sdch.vcproj',
+                              '$CHROME_DIR/browser/views/browser_views.vcproj',
+                              '$LIBXSLT_DIR/build/libxslt.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          relative_path_substitutions = [
+                              ('../../..', '$(OutDir)'),
+                          ],
+                          ConfigurationType='2')
+
+p.AddToolFile('tools/build/win/version.rules')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/debug.vsprops',
+                './chrome_dll.vsprops',
+                '../installer/util/using_util.vsprops',
+            ],
+            tools=[
+                'VCPreBuildEventTool',
+                'VCCustomBuildTool',
+                'Version',
+                'VCXMLDataGeneratorTool',
+                'VCWebServiceProxyGeneratorTool',
+                'VCMIDLTool',
+                'VCCLCompilerTool',
+                'VCManagedResourceCompilerTool',
+                'VCResourceCompilerTool',
+                'VCPreLinkEventTool',
+                MSVSTool('VCLinkerTool',
+                         OutputFile='$(IntDir)/chrome.dll',
+                         ImportLibrary='$(OutDir)/lib/$(ProjectName).lib'),
+                'VCALinkTool',
+                MSVSTool('VCManifestTool',
+                         AdditionalManifestFiles=('$(SolutionDir)/app/'
+                                                  + 'chrome.dll.manifest')),
+                'VCXDCMakeTool',
+                'VCBscMakeTool',
+                'VCFxCopTool',
+                'VCAppVerifierTool',
+                'VCWebDeploymentTool',
+                MSVSTool('VCPostBuildEventTool',
+                         CommandLine=('call '
+                                      + '$(SolutionDir)/tools/build/'
+                                      + 'win/hardlink_failsafe.bat '
+                                      + '"$(TargetPath)" '
+                                      + '"$(OutDir)/$(TargetFileName)"')),
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/release.vsprops',
+                './chrome_dll.vsprops',
+                '../installer/util/using_util.vsprops',
+            ],
+            tools=[
+                'VCPreBuildEventTool',
+                'VCCustomBuildTool',
+                'Version',
+                'VCXMLDataGeneratorTool',
+                'VCWebServiceProxyGeneratorTool',
+                'VCMIDLTool',
+                'VCCLCompilerTool',
+                'VCManagedResourceCompilerTool',
+                'VCResourceCompilerTool',
+                'VCPreLinkEventTool',
+                MSVSTool('VCLinkerTool',
+                         OutputFile='$(OutDir)/chrome.dll',
+                         ImportLibrary='$(OutDir)/lib/$(ProjectName).lib'),
+                'VCALinkTool',
+                MSVSTool('VCManifestTool',
+                         AdditionalManifestFiles=('$(SolutionDir)/app/'
+                                                  + 'chrome.dll.manifest')),
+                'VCXDCMakeTool',
+                'VCBscMakeTool',
+                'VCFxCopTool',
+                'VCAppVerifierTool',
+                'VCWebDeploymentTool',
+                MSVSTool('VCPostBuildEventTool',
+                         CommandLine=('check_dependents.bat '
+                                      + '$(TargetPath) chrome.dll.deps')),
+            ])
 
 
+##############################################################################
+# TODO(sgk):  move to separate .scons file for chrome.exe ####################
 
 env_exe = env.Clone()
 
@@ -341,18 +492,33 @@ env_exe.Append(
     ],
 )
 
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('resources', [
+    'app/check_dependents.bat',
+    'app/chrome.exe.deps',
+    'app/chrome_exe.rc',
+    'app/chrome_exe_resource.h',
+    'app/chrome_exe_version.rc.version',
+  ]),
+    'app/breakpad.cc',
+    'app/breakpad.h',
+    'app/chrome_exe_main.cc',
+    'common/chrome_switches$OBJSUFFIX',
+    'app/client_util.cc',
+    'app/client_util.h',
+    'common/env_vars$OBJSUFFIX',
+    'common/env_vars.h',
+    'app/google_update_client.cc',
+    'app/google_update_client.h',
+    'app/result_codes.h',
+])
+
 # TODO(port)
 if env.Bit('windows'):
-  chrome_exe = env_exe.ChromeProgram(
-      'chrome_exe/chrome',
-      [
-          chrome_exe_res,
-          'app/breakpad.cc',
-          'app/chrome_exe_main.cc',
-          'app/client_util.cc',
-          'app/google_update_client.cc',
-      ]
-  )
+  chrome_exe = env_exe.ChromeProgram('chrome_exe/chrome', input_files)
 
   install_targets.append(chrome_exe[0])
 
@@ -373,19 +539,115 @@ if env.Bit('windows'):
   #                  ('$PYTHON tools/build/win/dependencies.py ' +
   #                       '$(TargetPath) chrome.exe.deps'))
 
-env.ChromeMSVSProject('$CHROME_DIR/app/chrome_exe.vcproj',
-                dependencies = [
-                    '$BASE_DIR/build/base.vcproj',
-                    '$SANDBOX_DIR/src/sandbox.vcproj',
-                    '$CHROME_DIR/tools/crash_service/crash_service.vcproj',
-                    '$BREAKPAD_DIR/breakpad_handler.vcproj',
-                    '$CHROME_DIR/app/chrome_dll.vcproj',
-                    '$CHROME_DIR/app/locales/en-US.vcproj',
-                    '$CHROME_DIR/installer/util/util.vcproj',
-                    '$CHROME_DIR/app/theme/theme_dll.vcproj',
-                ],
-                guid='{7B219FAA-E360-43C8-B341-804A94EEFFAC}')
+p = env.ChromeMSVSProject('app/chrome_exe.vcproj',
+                          dest='$CHROME_SRC_DIR/chrome/app/chrome_exe.vcproj',
+                          guid='{7B219FAA-E360-43C8-B341-804A94EEFFAC}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$BASE_DIR/build/base.vcproj',
+                              '$SANDBOX_DIR/src/sandbox.vcproj',
+                              ('$CHROME_DIR/tools/'
+                               + 'crash_service/crash_service.vcproj'),
+                              '$BREAKPAD_DIR/breakpad_handler.vcproj',
+                              '$CHROME_DIR/app/chrome_dll.vcproj',
+                              '$CHROME_DIR/app/locales/en-US.vcproj',
+                              '$CHROME_DIR/installer/util/util.vcproj',
+                              '$CHROME_DIR/app/theme/theme_dll.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          ConfigurationType='1')
 
+p.AddToolFile('tools/build/win/version.rules')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                './chrome_exe.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+            ],
+            tools=[
+                'VCPreBuildEventTool',
+                'VCCustomBuildTool',
+                'Version',
+                'VCXMLDataGeneratorTool',
+                'VCWebServiceProxyGeneratorTool',
+                'VCMIDLTool',
+                MSVSTool('VCCLCompilerTool',
+                         BasicRuntimeChecks='0',
+                         BufferSecurityCheck='false'),
+                'VCManagedResourceCompilerTool',
+                'VCResourceCompilerTool',
+                'VCPreLinkEventTool',
+                MSVSTool('VCLinkerTool',
+                         ImportLibrary='$(OutDir)/lib/$(ProjectName).lib'),
+                'VCALinkTool',
+                MSVSTool('VCManifestTool',
+                         AdditionalManifestFiles=('$(SolutionDir)/app/'
+                                                  + 'chrome.exe.manifest')),
+                'VCXDCMakeTool',
+                'VCBscMakeTool',
+                'VCFxCopTool',
+                'VCAppVerifierTool',
+                'VCWebDeploymentTool',
+                MSVSTool('VCPostBuildEventTool',
+                         CommandLine=('copy '
+                                      + '$(ProjectDir)/FirstRun '
+                                      + '$(OutDir)/"First Run"'),
+                         Description='Copy first run complete sentinel file'),
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                './chrome_exe.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+            ],
+            tools=[
+                'VCPreBuildEventTool',
+                'VCCustomBuildTool',
+                'Version',
+                'VCXMLDataGeneratorTool',
+                'VCWebServiceProxyGeneratorTool',
+                'VCMIDLTool',
+                'VCCLCompilerTool',
+                'VCManagedResourceCompilerTool',
+                'VCResourceCompilerTool',
+                'VCPreLinkEventTool',
+                MSVSTool('VCLinkerTool',
+                         ImportLibrary='$(OutDir)/lib/$(ProjectName).lib'),
+                'VCALinkTool',
+                MSVSTool('VCManifestTool',
+                         AdditionalManifestFiles=('$(SolutionDir)/app/'
+                                                  + 'chrome.exe.manifest')),
+                'VCXDCMakeTool',
+                'VCBscMakeTool',
+                'VCFxCopTool',
+                'VCAppVerifierTool',
+                'VCWebDeploymentTool',
+                MSVSTool('VCPostBuildEventTool',
+                         # TODO(sgk): figure out how to get \r\n through
+                         # Python's XML generation?
+                         #CommandLine=('copy '
+                         #             + '$(ProjectDir)/FirstRun '
+                         #             + '$(OutDir)/"First Run"\r\n'
+                         #             + 'check_dependents.bat '
+                         #             + '$(TargetPath) '
+                         #             + 'chrome.exe.deps\r\n'),
+                         CommandLine=('copy '
+                                      + '$(ProjectDir)/FirstRun '
+                                      + '$(OutDir)/"First Run" '
+                                      + '&& '
+                                      + 'check_dependents.bat '
+                                      + '$(TargetPath) '
+                                      + 'chrome.exe.deps'),
+                         Description='Copy first run complete sentinel file'),
+            ])
+
+
+##############################################################################
+# TODO(sgk):  move to separate .scons file for browser_resources #############
 
 env_flat = env.Clone(
     BROWSER_RESOURCES = Dir('browser_resources'),
@@ -406,7 +668,7 @@ env_flat['BUILDERS']['FlatHtml'] = Builder(action='$FLATTEN_HTML_COM',
                                            source_suffix='.html',
                                            emitter=FlatHtmlEmitter)
 
-flats = [
+input_files = ChromeFileList([
     'browser/resources/about_credits.html',
     'browser/resources/about_memory.html',
     'browser/resources/about_stats.html',
@@ -418,18 +680,57 @@ flats = [
     'browser/resources/safe_browsing_phishing_block.html',
     'browser/security/resources/ssl_error.html',
     'browser/security/resources/ssl_roadblock.html',
-]
+    'browser/security/resources/ssl_roadblock_background.png',
+    'browser/security/resources/ssl_roadblock_icon.png',
+])
 
 # TODO(port)
 if env_flat.Bit('windows'):
   flats_out = []
-  for i in flats:
-    flats_out.extend(env_flat.FlatHtml(i))
+  for i in input_files:
+    if str(i).endswith('.html'):
+      flats_out.extend(env_flat.FlatHtml(i))
 
   # TODO(sgk):  Remove when we upgrade to SCons 1.1.0, which
   # determines implicit dependencies from .rc files.
   env_flat.Depends(browser_res, flats_out)
 
+p = env.ChromeMSVSProject('browser/resources/browser_resources.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'browser/resources/browser_resources.vcproj'),
+                          guid='{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'Flattened HTML Resource',
+                              'VCCustomBuildTool',
+                              'VCMIDLTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='10')
+
+p.AddToolFile('tools/build/win/flattened_html_file.rules')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+            ])
+
+
+##############################################################################
+# TODO(sgk):  move to separate .scons file for browser_resources #############
+
 sconscript_files = [
     'views/SConscript',
 ]

chrome/app/locales/locales.scons

@@ -14,7 +14,8 @@ def ChromiumLocaleProject(name, guid):
                                '$WEBKIT_DIR/build/localized_strings/localized_strings.vcproj',
                                '$CHROME_DIR/app/generated_resources.vcproj',
                            ],
-                           guid=guid)
+                           guid=guid,
+                           keyword='Win32Proj')
 
 ChromiumLocaleProject('$CHROME_DIR/app/locales/ar.vcproj',
                       guid='{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}')

chrome/app/resources/SConscript

@@ -96,11 +96,68 @@ locale_list = [
     'zh-TW',
 ]
 
+# TODO(sgk): remove these when we no longer want to worry about
+# consistent GUIDs in the .vcproj files from checkin to checkin.
+locale_GUIDMap = {
+    'ar' : '{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}',
+    'bg' : '{5BDB7EE1-A1FD-410C-9598-21519A1B7952}',
+    'bn' : '{4B60E8B8-416F-40B2-8A54-F75970A21992}',
+    'ca' : '{F7790A54-4078-4E4A-8231-818BE9FB1F94}',
+    'cs' : '{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}',
+    'da' : '{A493331B-3180-49FE-8D0E-D121645E63AD}',
+    'de' : '{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}',
+    'el' : '{D314F1B3-9299-4866-8362-08BF811B0FA3}',
+    'en-GB' : '{34231B28-C51C-4C1C-AF07-C763668B1404}',
+    'en-US' : '{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}',
+    'es-419' : '{FA660037-EB40-4A43-AA9D-9653C57F2789}',
+    'es' : '{5AEA4BF6-27CD-47FC-9370-D87771CFA196}',
+    'et' : '{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}',
+    'fi' : '{64D81334-DE73-457D-8FC1-9492508A2663}',
+    'fil' : '{3A932C39-AFA9-4BDC-B775-F71A426D04BF}',
+    'fr' : '{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}',
+    'gu' : '{256DECCE-9886-4C21-96A5-EE47DF5E07E9}',
+    'he' : '{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}',
+    'hi' : '{228DD844-9926-420E-B193-6973BF2A4D0B}',
+    'hr' : '{CE1426F6-7D2B-4574-9929-58387BF7B05F}',
+    'hu' : '{AFF332BF-AF3D-4D35-86FC-42A727F01D36}',
+    'id' : '{E3DF045F-2174-4685-9CF7-0630A79F324B}',
+    'it' : '{275F2993-EE9B-4E00-9C85-10A182FD423A}',
+    'ja' : '{B2D715CE-4CBB-415A-A032-E700C90ADF91}',
+    'kn' : '{3E6B24F6-9FA9-4066-859E-BF747FA3080A}',
+    'ko' : '{32167995-4014-4E4C-983B-F7E17C24EB25}',
+    'lt' : '{80E37CB5-059D-4F4B-AEF6-08265468D368}',
+    'lv' : '{A5C5D801-4026-49F2-BBF1-250941855306}',
+    'ml' : '{CAB69303-0F02-4C68-A12E-FFE55DB52526}',
+    'mr' : '{A464166F-8507-49B4-9B02-5CB77C498B25}',
+    'nb' : '{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}',
+    'nl' : '{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}',
+    'or' : '{E07D267C-34C3-4DDB-8B41-94697808714A}',
+    'pl' : '{9F53807E-9382-47BD-8371-E5D04F517E9C}',
+    'pt-BR' : '{2F914112-2657-49EC-8EA6-3BA63340DE27}',
+    'pt-PT' : '{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}',
+    'ro' : '{C70D3509-57C4-4326-90C1-2EC0AE34848D}',
+    'ru' : '{7D456640-3619-4D23-A56D-E0084400CCBF}',
+    'sk' : '{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}',
+    'sl' : '{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}',
+    'sr' : '{300C6A09-663E-48B6-8E07-A0D50CAF8F25}',
+    'sv' : '{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}',
+    'ta' : '{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}',
+    'te' : '{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}',
+    'th' : '{226B3533-1FF3-42F6-A8E3-C4DDBC955290}',
+    'tr' : '{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}',
+    'uk' : '{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}',
+    'vi' : '{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}',
+    'zh-CN' : '{C0C7DA58-C90D-4BDE-AE44-588997339F5D}',
+    'zh-TW' : '{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}',
+}
+
 gcs_rc = '$TARGET_ROOT/grit_derived_sources/google_chrome_strings_%s.rc'
 cs_rc = '$TARGET_ROOT/grit_derived_sources/chromium_strings_%s.rc'
 gr_res = '$TARGET_ROOT/grit_derived_sources/generated_resources_%s.res'
 ws_res = '$TARGET_ROOT/grit_derived_sources/webkit_strings_%s.res'
 
+dest_vcproj = '$CHROME_SRC_DIR/chrome/app/locales/%s.vcproj'
+
 locale_dlls = []
 
 for locale in locale_list:
@@ -112,9 +169,61 @@ for locale in locale_list:
 
   dll = env_dll.ChromeSharedLibrary(locale,
                                     [ gr_res % locale,
-                                      ws_res % locale,
-                                      res ])
+                                      res,
+                                      ws_res % locale])
   locale_dlls.append(dll)
 
+  p = env.ChromeMSVSProject('../locales/%s.vcproj' % locale,
+                            dest=dest_vcproj % locale,
+                            guid=locale_GUIDMap.get(locale),
+                            buildtargets=dll,
+                            relative_path_substitutions = [
+                              ('../../../..', '$(OutDir)'),
+                            ],
+                            tools=[
+                                'VCPreBuildEventTool',
+                                'VCCustomBuildTool',
+                                'VCXMLDataGeneratorTool',
+                                'VCWebServiceProxyGeneratorTool',
+                                'VCMIDLTool',
+                                'VCCLCompilerTool',
+                                'VCManagedResourceCompilerTool',
+                                'VCResourceCompilerTool',
+                                'VCPreLinkEventTool',
+                                'VCLinkerTool',
+                                'VCALinkTool',
+                                'VCManifestTool',
+                                'VCXDCMakeTool',
+                                'VCBscMakeTool',
+                                'VCFxCopTool',
+                                'VCAppVerifierTool',
+                                'VCWebDeploymentTool',
+                                'VCPostBuildEventTool',
+                            ],
+                            ConfigurationType='2')
+
+  if locale == 'en-US':
+    kw = {'CharacterSet' : '1'}
+  else:
+    kw = {}
+
+  p.AddConfig('Debug|Win32',
+              InheritedPropertySheets=[
+                  '$(SolutionDir)../build/common.vsprops',
+                  '$(SolutionDir)../build/debug.vsprops',
+                  '../../tools/build/win/data_dll.vsprops',
+                  '../../tools/build/win/language_dll.vsprops',
+              ],
+              **kw)
+
+  p.AddConfig('Release|Win32',
+              InheritedPropertySheets=[
+                  '$(SolutionDir)../build/common.vsprops',
+                  '$(SolutionDir)../build/release.vsprops',
+                  '../../tools/build/win/data_dll.vsprops',
+                  '../../tools/build/win/language_dll.vsprops',
+              ],
+              **kw)
+
 i = env.Install('$DESTINATION_ROOT/locales/', locale_dlls)
 env.Alias('chrome_locales', i)

chrome/app/theme/SConscript

@@ -17,12 +17,6 @@ env_res.Append(
     ],
 )
 
-res = [
-    env_res.RES('theme_resources.rc'),
-    env_res.RES('distribution_resources.rc'),
-]
-
-
 
 env.Append(
     LINKFLAGS = [
@@ -42,8 +36,59 @@ env.Append(
     ],
 )
 
+input_files = ChromeFileList([
+    'theme_resources.h',
+    'theme_resources.rc',
+    'distribution_resources.rc',
+])
+
+res = []
+res.extend(env_res.RES('theme_resources.rc'))
+res.extend(env_res.RES('distribution_resources.rc'))
+
 themes_default = env.ChromeSharedLibrary("default", res)
 env.Install("$DESTINATION_ROOT/themes", themes_default)
 
-# TODO(bradnelson): figure out why this was needed
-#env.AddPostAction(themes_default[1], Touch(themes_default[1:]))
+p = env.ChromeMSVSProject('theme_dll.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'app/theme/theme_dll.vcproj'),
+                          guid='{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLinkerTool',
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='2')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/debug.vsprops',
+                './theme_dll.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/release.vsprops',
+                './theme_dll.vsprops',
+            ])

chrome/browser/browser.scons

@@ -37,105 +37,640 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = []
-
-input_files.extend([
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Autocomplete', [
+    'autocomplete/autocomplete.cc',
+    'autocomplete/autocomplete.h',
+    'autocomplete/autocomplete_accessibility.cc',
+    'autocomplete/autocomplete_accessibility.h',
+    'autocomplete/autocomplete_edit.cc',
+    'autocomplete/autocomplete_edit.h',
+    'autocomplete/autocomplete_popup.cc',
+    'autocomplete/autocomplete_popup.h',
+    'autocomplete/edit_drop_target.cc',
+    'autocomplete/edit_drop_target.h',
+    'autocomplete/history_contents_provider.cc',
+    'autocomplete/history_contents_provider.h',
+    'autocomplete/history_url_provider.cc',
+    'autocomplete/history_url_provider.h',
     'autocomplete/keyword_provider.cc',
-    'automation/automation_resource_tracker.cc',
-    'automation/url_request_failed_dns_job.cc',
-    'automation/url_request_mock_http_job.cc',
-    'automation/url_request_mock_net_error_job.cc',
-    'automation/url_request_slow_download_job.cc',
-    'bookmarks/bookmark_codec.cc',
-    'bookmarks/bookmark_html_writer.cc',
+    'autocomplete/keyword_provider.h',
+    'autocomplete/search_provider.cc',
+    'autocomplete/search_provider.h',
+  ]),
+  MSVSFilter('Base', [
+    'alternate_nav_url_fetcher.cc',
+    'alternate_nav_url_fetcher.h',
+    'browser_about_handler.cc',
+    'browser_about_handler.h',
+    'browser_init.cc',
+    'browser_init.h',
+    'browser_main.cc',
+    'browser_main_win.cc',
+    'browser_prefs.cc',
+    'browser_prefs.h',
     'browser_process.cc',
-    'browser_trial.cc',
+    'browser_process.h',
+    'browser_process_impl.cc',
+    'browser_process_impl.h',
+    'browser_resources.h',
+    'browser_shutdown.cc',
+    'browser_shutdown.h',
+    'browser_url_handler.cc',
+    'browser_url_handler.h',
+    'browsing_data_remover.cc',
+    'browsing_data_remover.h',
+    'browsing_instance.cc',
+    'browsing_instance.h',
+    'cache_manager_host.cc',
+    'cache_manager_host.h',
     'cancelable_request.cc',
-    'chrome_plugin_browsing_context.cc',
+    'cancelable_request.h',
+    'character_encoding.cc',
+    'character_encoding.h',
     'chrome_thread.cc',
+    'chrome_thread.h',
     'cross_site_request_manager.cc',
-    'dom_ui/chrome_url_data_manager.cc',
-    'download/save_file.cc',
-    'extensions/extension.cc',
-    'extensions/extensions_service.cc',
-    'extensions/user_script_master.cc',
+    'cross_site_request_manager.h',
+    'fav_icon_helper.cc',
+    'fav_icon_helper.h',
+    'first_run.cc',
+    'first_run.h',
     'google_url_tracker.cc',
+    'google_url_tracker.h',
     'google_util.cc',
-    'history/archived_database.cc',
-    'history/download_database.cc',
-    'history/expire_history_backend.cc',
-    'history/history_backend.cc',
-    'history/history_database.cc',
-    'history/history_types.cc',
-    'history/in_memory_database.cc',
-    'history/in_memory_history_backend.cc',
-    'history/page_usage_data.cc',
-    'history/query_parser.cc',
-    'history/snippet.cc',
-    'history/starred_url_database.cc',
-    'history/text_database.cc',
-    'history/text_database_manager.cc',
-    'history/thumbnail_database.cc',
-    'history/url_database.cc',
-    'history/visit_database.cc',
-    'history/visit_tracker.cc',
-    'history/visitsegment_database.cc',
-    'history_model.cc',
-    'importer/firefox2_importer.cc',
-    'importer/firefox3_importer.cc',
-    'importer/firefox_profile_lock.cc',
-    'importer/mork_reader.cc',
+    'google_util.h',
+    'icon_loader.cc',
+    'icon_loader.h',
+    'icon_manager.cc',
+    'icon_manager.h',
+    'ime_input.cc',
+    'ime_input.h',
+    'jankometer.cc',
+    'jankometer.h',
+    'memory_details.cc',
+    'memory_details.h',
     'meta_table_helper.cc',
-    'metrics/metrics_log.cc',
-    'metrics/metrics_response.cc',
-    'metrics/user_metrics.cc',
-    'net/chrome_url_request_context.cc',
-    'net/dns_host_info.cc',
-    'net/referrer.cc',
-    'net/sdch_dictionary_fetcher.cc',
-    'net/url_fetcher.cc',
-    'net/url_fetcher_protect.cc',
-    'page_state.cc',
-    'printing/page_number.cc',
-    'printing/page_range.cc',
-    'printing/page_setup.cc',
-    'printing/units.cc',
-    'tab_contents/provisional_load_details.cc',
-    'renderer_host/async_resource_handler.cc',
-    'renderer_host/buffered_resource_handler.cc',
-    'renderer_host/download_resource_handler.cc',
-    'renderer_host/download_throttling_resource_handler.cc',
-    'renderer_host/safe_browsing_resource_handler.cc',
-    'renderer_host/save_file_resource_handler.cc',
-    'renderer_host/sync_resource_handler.cc',
-    'renderer_security_policy.cc',
-    'safe_browsing/bloom_filter.cc',
-    'safe_browsing/chunk_range.cc',
-    'safe_browsing/protocol_parser.cc',
-    'safe_browsing/safe_browsing_database.cc',
-    'safe_browsing/safe_browsing_database_bloom.cc',
-    'safe_browsing/safe_browsing_database_impl.cc',
-    'safe_browsing/safe_browsing_util.cc',
-    'search_engines/template_url.cc',
-    'search_engines/template_url_model.cc',
-    'search_engines/template_url_parser.cc',
+    'meta_table_helper.h',
+    'plugin_process_host.cc',
+    'plugin_process_host.h',
+    'plugin_process_info.h',
+    'plugin_service.cc',
+    'plugin_service.h',
+    '../tools/build/win/precompiled_wtl.cc',
+    '../tools/build/win/precompiled_wtl.h',
+    'profile.cc',
+    'profile.h',
+    'profile_manager.cc',
+    'profile_manager.h',
+    'render_view_host.cc',
+    'render_view_host.h',
+    'render_view_host_delegate.h',
+    'render_widget_helper.cc',
+    'render_widget_helper.h',
+    'render_widget_host.cc',
+    'render_widget_host.h',
+    'render_widget_host_view.h',
+    'render_widget_host_view_win.cc',
+    'render_widget_host_view_win.h',
+    'resource_message_filter.cc',
+    'resource_message_filter.h',
+    'resource_request_details.h',
     'session_startup_pref.cc',
-    'sessions/session_command.cc',
-    'sessions/session_id.cc',
+    'session_startup_pref.h',
+    'shell_dialogs.h',
+    'shell_integration.cc',
+    'shell_integration.h',
     'spellcheck_worditerator.cc',
-    'ssl/ssl_error_info.cc',
+    'spellcheck_worditerator.h',
+    'spellchecker.cc',
+    'spellchecker.h',
+    'user_data_manager.cc',
+    'user_data_manager.h',
+    'visitedlink_master.cc',
+    'visitedlink_master.h',
+    'web_app.cc',
+    'web_app.h',
+    'web_app_launcher.cc',
+    'web_app_launcher.h',
+  ]),
+  MSVSFilter('Bookmarks', [
+    'bookmarks/bookmark_codec.cc',
+    'bookmarks/bookmark_codec.h',
+    'bookmarks/bookmark_context_menu.cc',
+    'bookmarks/bookmark_context_menu.h',
+    'bookmarks/bookmark_drag_data.cc',
+    'bookmarks/bookmark_drag_data.h',
+    'bookmarks/bookmark_drop_info.cc',
+    'bookmarks/bookmark_drop_info.h',
+    'bookmarks/bookmark_folder_tree_model.cc',
+    'bookmarks/bookmark_folder_tree_model.h',
+    'bookmarks/bookmark_html_writer.cc',
+    'bookmarks/bookmark_html_writer.h',
+    'bookmarks/bookmark_model.cc',
+    'bookmarks/bookmark_model.h',
+    'bookmarks/bookmark_service.h',
+    'bookmarks/bookmark_storage.cc',
+    'bookmarks/bookmark_storage.h',
+    'bookmarks/bookmark_table_model.cc',
+    'bookmarks/bookmark_table_model.h',
+    'bookmarks/bookmark_utils.cc',
+    'bookmarks/bookmark_utils.h',
+  ]),
+  MSVSFilter('Tab Contents (Old)', [
+    'render_view_context_menu.cc',
+    'render_view_context_menu.h',
+    'render_view_context_menu_controller.cc',
+    'render_view_context_menu_controller.h',
+    'render_view_host_manager.cc',
+    'render_view_host_manager.h',
+    'security_style.h',
+  ]),
+  MSVSFilter('Browser Window', [
+    'app_modal_dialog_queue.cc',
+    'app_modal_dialog_queue.h',
+    'back_forward_menu_model.cc',
+    'back_forward_menu_model.h',
+    'browser.cc',
+    'browser.h',
+    'browser_list.cc',
+    'browser_list.h',
+    'browser_window.h',
+    'controller.cc',
+    'controller.h',
+    'dock_info.cc',
+    'dock_info.h',
+    'find_notification_details.h',
+    'js_before_unload_handler.cc',
+    'js_before_unload_handler.h',
+    'jsmessage_box_handler.cc',
+    'jsmessage_box_handler.h',
+    'load_from_memory_cache_details.h',
+    'load_notification_details.h',
+    'login_prompt.cc',
+    'login_prompt.h',
+    'options_window.h',
+    'repost_form_warning_dialog.cc',
+    'repost_form_warning_dialog.h',
+    'task_manager.cc',
+    'task_manager.h',
+    'task_manager_resource_providers.cc',
+    'task_manager_resource_providers.h',
+    'web_app_icon_manager.cc',
+    'web_app_icon_manager.h',
+    'window_sizer.cc',
+    'window_sizer.h',
+  ]),
+  MSVSFilter('Policy', [
+    'renderer_security_policy.cc',
+    'renderer_security_policy.h',
+  ]),
+  MSVSFilter('Destination', [
+    'base_history_model.cc',
+    'base_history_model.h',
+    'views/download_tab_view.cc',
+    'views/download_tab_view.h',
+    'history_model.cc',
+    'history_model.h',
+    'history_view.cc',
+    'history_view.h',
+  ]),
+  MSVSFilter('Automation', [
+    'automation/automation_autocomplete_edit_tracker.h',
+    'automation/automation_browser_tracker.h',
+    'automation/automation_constrained_window_tracker.h',
+    'automation/automation_provider.cc',
+    'automation/automation_provider.h',
+    'automation/automation_provider_list.cc',
+    'automation/automation_provider_list.h',
+    'automation/automation_resource_tracker.cc',
+    'automation/automation_resource_tracker.h',
+    'automation/automation_tab_tracker.h',
+    'automation/automation_window_tracker.h',
+    'automation/ui_controls.cc',
+    'automation/ui_controls.h',
+    'automation/url_request_failed_dns_job.cc',
+    'automation/url_request_failed_dns_job.h',
+    'automation/url_request_mock_http_job.cc',
+    'automation/url_request_mock_http_job.h',
+    'automation/url_request_mock_net_error_job.cc',
+    'automation/url_request_mock_net_error_job.h',
+    'automation/url_request_slow_download_job.cc',
+    'automation/url_request_slow_download_job.h',
+    'view_ids.h',
+  ]),
+  MSVSFilter('History', [
+    'history/archived_database.cc',
+    'history/archived_database.h',
+    'history/download_database.cc',
+    'history/download_database.h',
+    'history/download_types.h',
+    'history/expire_history_backend.cc',
+    'history/expire_history_backend.h',
+    'history/history.cc',
+    'history/history.h',
+    'history/history_backend.cc',
+    'history/history_backend.h',
+    'history/history_database.cc',
+    'history/history_database.h',
+    'history/history_indexer.idl',
+    'history/history_marshaling.h',
+    'history/history_notifications.h',
+    'history/history_publisher.cc',
+    'history/history_publisher.h',
+    'history/history_types.cc',
+    'history/history_types.h',
+    'history/in_memory_database.cc',
+    'history/in_memory_database.h',
+    'history/in_memory_history_backend.cc',
+    'history/in_memory_history_backend.h',
+    'history/page_usage_data.cc',
+    'history/page_usage_data.h',
+    'history/query_parser.cc',
+    'history/query_parser.h',
+    'history/snippet.cc',
+    'history/snippet.h',
+    'history/starred_url_database.cc',
+    'history/starred_url_database.h',
+    'history/text_database.cc',
+    'history/text_database.h',
+    'history/text_database_manager.cc',
+    'history/text_database_manager.h',
+    'history/thumbnail_database.cc',
+    'history/thumbnail_database.h',
+    'history/url_database.cc',
+    'history/url_database.h',
+    'history/visit_database.cc',
+    'history/visit_database.h',
+    'history/visit_tracker.cc',
+    'history/visit_tracker.h',
+    'history/visitsegment_database.cc',
+    'history/visitsegment_database.h',
+    MSVSFilter('HangMonitor', [
+      'hang_monitor/hung_plugin_action.cc',
+      'hang_monitor/hung_plugin_action.h',
+      'hang_monitor/hung_window_detector.cc',
+      'hang_monitor/hung_window_detector.h',
+    ]),
+  ]),
+  MSVSFilter('Sessions and Tab Restore', [
+    'sessions/base_session_service.cc',
+    'sessions/base_session_service.h',
+    'sessions/session_backend.cc',
+    'sessions/session_backend.h',
+    'sessions/session_command.cc',
+    'sessions/session_command.h',
+    'sessions/session_id.cc',
+    'sessions/session_id.h',
+    'sessions/session_restore.cc',
+    'sessions/session_restore.h',
+    'sessions/session_service.cc',
+    'sessions/session_service.h',
+    'sessions/session_types.cc',
+    'sessions/session_types.h',
+    'sessions/tab_restore_service.cc',
+    'sessions/tab_restore_service.h',
+  ]),
+  MSVSFilter('WebData', [
+    'webdata/web_data_service.cc',
+    'webdata/web_data_service.h',
     'webdata/web_database.cc',
-
+    'webdata/web_database.h',
+    'webdata/web_database_win.cc',
+  ]),
+  MSVSFilter('Importer', [
+    'importer/firefox2_importer.cc',
+    'importer/firefox2_importer.h',
+    'importer/firefox3_importer.cc',
+    'importer/firefox3_importer.h',
+    'importer/firefox_importer_utils.cc',
+    'importer/firefox_importer_utils.h',
+    'importer/firefox_profile_lock.cc',
+    'importer/firefox_profile_lock.h',
+    'importer/firefox_profile_lock_win.cc',
+    'importer/ie_importer.cc',
+    'importer/ie_importer.h',
+    'importer/importer.cc',
+    'importer/importer.h',
+    'importer/mork_reader.cc',
+    'importer/mork_reader.h',
+    'importer/toolbar_importer.cc',
+    'importer/toolbar_importer.h',
+  ]),
+  MSVSFilter('Drag & Drop', [
+    'drag_utils.cc',
+    'drag_utils.h',
+  ]),
+  MSVSFilter('Tabs', [
+    'tabs/tab_strip_model.cc',
+    'tabs/tab_strip_model.h',
+    'tabs/tab_strip_model_order_controller.cc',
+    'tabs/tab_strip_model_order_controller.h',
+  ]),
+  MSVSFilter('Printing', [
+    'printing/page_number.cc',
+    'printing/page_number.h',
+    'printing/page_overlays.cc',
+    'printing/page_overlays.h',
+    'printing/page_range.cc',
+    'printing/page_range.h',
+    'printing/page_setup.cc',
+    'printing/page_setup.h',
+    'printing/print_job.cc',
+    'printing/print_job.h',
+    'printing/print_job_manager.cc',
+    'printing/print_job_manager.h',
+    'printing/print_job_worker.cc',
+    'printing/print_job_worker.h',
+    'printing/print_job_worker_owner.h',
+    'printing/print_settings.cc',
+    'printing/print_settings.h',
+    'printing/print_view_manager.cc',
+    'printing/print_view_manager.h',
+    'printing/printed_document.cc',
+    'printing/printed_document.h',
+    'printing/printed_page.cc',
+    'printing/printed_page.h',
+    'printing/printed_pages_source.h',
+    'printing/printer_query.cc',
+    'printing/printer_query.h',
+    'printing/units.cc',
+    'printing/units.h',
+    'printing/win_printing_context.cc',
+    'printing/win_printing_context.h',
+  ]),
+  MSVSFilter('Sandbox', [
+    'sandbox_policy.cc',
+    'sandbox_policy.h',
+  ]),
+  MSVSFilter('Password Manager', [
+    'password_manager/encryptor.cc',
+    'password_manager/encryptor.h',
+    'password_manager/ie7_password.cc',
+    'password_manager/ie7_password.h',
+    'password_manager/password_form_manager.cc',
+    'password_manager/password_form_manager.h',
+    'password_manager/password_manager.cc',
+    'password_manager/password_manager.h',
+  ]),
+  MSVSFilter('External Tab', [
+    'external_tab_container.cc',
+    'external_tab_container.h',
+  ]),
+  MSVSFilter('DOM UI', [
+    'dom_ui/chrome_url_data_manager.cc',
+    'dom_ui/chrome_url_data_manager.h',
+    'dom_ui/dom_ui.cc',
+    'dom_ui/dom_ui.h',
+    'dom_ui/dom_ui_contents.cc',
+    'dom_ui/dom_ui_contents.h',
+    'dom_ui/dom_ui_host.cc',
+    'dom_ui/dom_ui_host.h',
+    'dom_ui/history_ui.cc',
+    'dom_ui/history_ui.h',
+    'dom_ui/html_dialog_contents.cc',
+    'dom_ui/html_dialog_contents.h',
+    'dom_ui/new_tab_ui.cc',
+    'dom_ui/new_tab_ui.h',
+  ]),
+  MSVSFilter('NativeUI', [
+    'history_tab_ui.cc',
+    'history_tab_ui.h',
+  ]),
+  MSVSFilter('Net', [
+    'net/chrome_url_request_context.cc',
+    'net/chrome_url_request_context.h',
+    'net/dns_global.cc',
+    'net/dns_global.h',
+    'net/dns_host_info.cc',
+    'net/dns_host_info.h',
+    'net/dns_master.cc',
+    'net/dns_master.h',
+    'net/dns_slave.cc',
+    'net/dns_slave.h',
+    'net/referrer.cc',
+    'net/referrer.h',
+    'net/sdch_dictionary_fetcher.cc',
+    'net/sdch_dictionary_fetcher.h',
+    'net/url_fetcher.cc',
+    'net/url_fetcher.h',
+    'net/url_fetcher_protect.cc',
+    'net/url_fetcher_protect.h',
+    'net/url_fixer_upper.cc',
+    'net/url_fixer_upper.h',
+  ]),
+  MSVSFilter('RLZ', [
+    'rlz/rlz.cc',
+    'rlz/rlz.h',
+  ]),
+  MSVSFilter('Safe Browsing', [
+    'safe_browsing/bloom_filter.cc',
+    'safe_browsing/bloom_filter.h',
+    'safe_browsing/chunk_range.cc',
+    'safe_browsing/chunk_range.h',
+    'safe_browsing/protocol_manager.cc',
+    'safe_browsing/protocol_manager.h',
+    'safe_browsing/protocol_parser.cc',
+    'safe_browsing/protocol_parser.h',
+    'safe_browsing/safe_browsing_blocking_page.cc',
+    'safe_browsing/safe_browsing_blocking_page.h',
+    'safe_browsing/safe_browsing_database.cc',
+    'safe_browsing/safe_browsing_database.h',
+    'safe_browsing/safe_browsing_database_bloom.cc',
+    'safe_browsing/safe_browsing_database_bloom.h',
+    'safe_browsing/safe_browsing_database_impl.cc',
+    'safe_browsing/safe_browsing_database_impl.h',
+    'safe_browsing/safe_browsing_service.cc',
+    'safe_browsing/safe_browsing_service.h',
+    'safe_browsing/safe_browsing_util.cc',
+    'safe_browsing/safe_browsing_util.h',
+  ]),
+  MSVSFilter('Accessibility', [
+    'browser_accessibility.cc',
+    'browser_accessibility.h',
+    'browser_accessibility_manager.cc',
+    'browser_accessibility_manager.h',
+    'iaccessible_function_ids.h',
+  ]),
+  MSVSFilter('Download', [
+    'download/download_exe.cc',
+    'download/download_file.cc',
+    'download/download_file.h',
+    'download/download_item_model.cc',
+    'download/download_item_model.h',
+    'download/download_manager.cc',
+    'download/download_manager.h',
+    'download/download_request_manager.cc',
+    'download/download_request_manager.h',
+    'download/download_util.cc',
+    'download/download_util.h',
+  ]),
+  MSVSFilter('Save Page', [
+    'download/save_file.cc',
+    'download/save_file.h',
+    'download/save_file_manager.cc',
+    'download/save_file_manager.h',
+    'download/save_item.cc',
+    'download/save_item.h',
+    'download/save_package.cc',
+    'download/save_package.h',
+    'download/save_page_model.cc',
+    'download/save_page_model.h',
+    'download/save_types.h',
+  ]),
+  MSVSFilter('Autofill', [
+    'autofill_manager.cc',
+    'autofill_manager.h',
+  ]),
+  MSVSFilter('Extensions', [
+    'extensions/extension.cc',
+    'extensions/extension.h',
+    'extensions/extension_protocols.cc',
+    'extensions/extension_protocols.h',
+    'extensions/extensions_service.cc',
+    'extensions/extensions_service.h',
+    'extensions/user_script_master.cc',
+    'extensions/user_script_master.h',
+  ]),
+  MSVSFilter('Renderer Host', [
+    'renderer_host/async_resource_handler.cc',
+    'renderer_host/async_resource_handler.h',
+    'renderer_host/browser_render_process_host.cc',
+    'renderer_host/browser_render_process_host.h',
+    'renderer_host/buffered_resource_handler.cc',
+    'renderer_host/buffered_resource_handler.h',
+    'renderer_host/cross_site_resource_handler.cc',
+    'renderer_host/cross_site_resource_handler.h',
+    'renderer_host/download_resource_handler.cc',
+    'renderer_host/download_resource_handler.h',
+    'renderer_host/download_throttling_resource_handler.cc',
+    'renderer_host/download_throttling_resource_handler.h',
+    'renderer_host/render_process_host.cc',
+    'renderer_host/render_process_host.h',
+    'renderer_host/resource_dispatcher_host.cc',
+    'renderer_host/resource_dispatcher_host.h',
+    'renderer_host/resource_handler.h',
+    'renderer_host/safe_browsing_resource_handler.cc',
+    'renderer_host/safe_browsing_resource_handler.h',
+    'renderer_host/save_file_resource_handler.cc',
+    'renderer_host/save_file_resource_handler.h',
+    'renderer_host/sync_resource_handler.cc',
+    'renderer_host/sync_resource_handler.h',
+  ]),
+  MSVSFilter('Tab Contents', [
+    'tab_contents/about_internets_status_view.cc',
+    'tab_contents/about_internets_status_view.h',
+    'tab_contents/constrained_window.h',
+    'tab_contents/infobar_delegate.cc',
+    'tab_contents/infobar_delegate.h',
+    'tab_contents/interstitial_page.cc',
+    'tab_contents/interstitial_page.h',
+    'tab_contents/ipc_status_view.cc',
+    'tab_contents/ipc_status_view.h',
+    'tab_contents/native_ui_contents.cc',
+    'tab_contents/native_ui_contents.h',
+    'tab_contents/navigation_controller.cc',
+    'tab_contents/navigation_controller.h',
+    'tab_contents/navigation_entry.cc',
+    'tab_contents/navigation_entry.h',
+    'tab_contents/network_status_view.cc',
+    'tab_contents/network_status_view.h',
+    'tab_contents/page_navigator.h',
+    'tab_contents/provisional_load_details.cc',
+    'tab_contents/provisional_load_details.h',
+    'tab_contents/site_instance.cc',
+    'tab_contents/site_instance.h',
+    'tab_contents/status_view.cc',
+    'tab_contents/status_view.h',
+    'tab_contents/tab_contents.cc',
+    'tab_contents/tab_contents.h',
+    'tab_contents/tab_contents_delegate.h',
+    'tab_contents/tab_contents_factory.cc',
+    'tab_contents/tab_contents_factory.h',
+    'tab_contents/tab_contents_type.h',
+    'tab_contents/tab_util.cc',
+    'tab_contents/tab_util.h',
+    'tab_contents/view_source_contents.cc',
+    'tab_contents/view_source_contents.h',
+    'tab_contents/web_contents.cc',
+    'tab_contents/web_contents.h',
+    'tab_contents/web_contents_view.cc',
+    'tab_contents/web_contents_view.h',
+    'tab_contents/web_contents_view_win.cc',
+    'tab_contents/web_contents_view_win.h',
+    'tab_contents/web_drag_source.cc',
+    'tab_contents/web_drag_source.h',
+    'tab_contents/web_drop_target.cc',
+    'tab_contents/web_drop_target.h',
+  ]),
+  MSVSFilter('Search Engines', [
+    'search_engines/template_url.cc',
+    'search_engines/template_url.h',
+    'search_engines/template_url_fetcher.cc',
+    'search_engines/template_url_fetcher.h',
+    'search_engines/template_url_model.cc',
+    'search_engines/template_url_model.h',
+    'search_engines/template_url_parser.cc',
+    'search_engines/template_url_parser.h',
+    'search_engines/template_url_prepopulate_data.cc',
+    'search_engines/template_url_prepopulate_data.h',
+  ]),
+  MSVSFilter('Metrics', [
+    'metrics/metrics_log.cc',
+    'metrics/metrics_log.h',
+    'metrics/metrics_response.cc',
+    'metrics/metrics_response.h',
+    'metrics/metrics_service.cc',
+    'metrics/metrics_service.h',
+    'metrics/user_metrics.cc',
+    'metrics/user_metrics.h',
+  ]),
+  MSVSFilter('SSL', [
+    'ssl/ssl_blocking_page.cc',
+    'ssl/ssl_blocking_page.h',
+    'ssl/ssl_error_info.cc',
+    'ssl/ssl_error_info.h',
+    'ssl/ssl_manager.cc',
+    'ssl/ssl_manager.h',
+    'ssl/ssl_policy.cc',
+    'ssl/ssl_policy.h',
+  ]),
+    'browser_trial.cc',
+    'browser_trial.h',
+    'cert_store.cc',
+    'cert_store.h',
+    'chrome_plugin_browsing_context.cc',
+    'chrome_plugin_browsing_context.h',
+    'chrome_plugin_host.cc',
+    'encoding_menu_controller_delegate.cc',
+    'encoding_menu_controller_delegate.h',
+    'external_protocol_handler.cc',
+    'external_protocol_handler.h',
+    'gears_integration.cc',
+    'gears_integration.h',
+    'google_update.cc',
+    'google_update.h',
+    'modal_html_dialog_delegate.cc',
+    'modal_html_dialog_delegate.h',
+    'page_state.cc',
+    'page_state.h',
+    'plugin_installer.cc',
+    'plugin_installer.h',
+    'toolbar_model.cc',
+    'toolbar_model.h',
 ])
 
-if not env.Bit('mac'):
-  input_files.extend([
+if env.Bit('mac'):
+  input_files.Remove(
       'spellchecker.cc',
-  ])
+  )
 
-if env.Bit('windows'):
+if not env.Bit('windows'):
   # TODO: Port these.
-  input_files.extend([
+  input_files.Remove(
       'autofill_manager.cc',
       'alternate_nav_url_fetcher.cc',
       'app_modal_dialog_queue.cc',
@@ -300,38 +835,133 @@ if env.Bit('windows'):
       'task_manager_resource_providers.cc',
       'toolbar_model.cc',
       'user_data_manager.cc',
+      'views/download_tab_view.cc',
       'visitedlink_master.cc',
       'web_app.cc',
       'web_app_icon_manager.cc',
       'web_app_launcher.cc',
       'webdata/web_data_service.cc',
       'window_sizer.cc',
-  ])
+  )
 
-  env.TypeLibrary('history/history_indexer.idl')
-
-  input_files.extend([
+  input_files.Remove(
       'browser_main_win.cc',
       'importer/firefox_profile_lock_win.cc',
       'render_widget_host_view_win.cc',
       'tab_contents/web_contents_view_win.cc',
       'webdata/web_database_win.cc',
-  ])
+      '../tools/build/win/precompiled_wtl.cc',
+      '../tools/build/win/precompiled_wtl.h',
+  )
 
-if env.Bit('posix'):
-  input_files.extend([
+if env.Bit('windows'):
+  env.TypeLibrary('history/history_indexer.idl')
+
+if not env.Bit('posix'):
+  input_files.Remove(
       'importer/firefox_profile_lock_posix.cc',
-  ])
+  )
 
 if not env.Bit('mac'):
   # TODO: This should work for all platforms.
   env.ChromeLibrary('browser', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/browser/browser.vcproj',
-                dependencies = [
-                    '$LIBXML_DIR/build/libxml_config.vcproj',
-                    '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj',
-                    '$NET_DIR/build/net_resources.vcproj',
-                    '$CHROME_DIR/app/generated_resources.vcproj',
-                ],
-                guid='{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}')
+p = env.ChromeMSVSProject('browser.vcproj',
+                          dest='$CHROME_SRC_DIR/chrome/browser/browser.vcproj',
+                          guid='{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}',
+                          keyword='Win32Proj',
+                          root_namespace='Browser',
+                          dependencies = [
+                              '$LIBXML_DIR/build/libxml_config.vcproj',
+                              '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj',
+                              '$NET_DIR/build/net_resources.vcproj',
+                              '$CHROME_DIR/app/generated_resources.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'Resource text file copy',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+p.AddToolFile('../tools/build/win/resource_text_file_copy.rules')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                './browser.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../tools/build/win/precompiled_wtl.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                './browser.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)/tools/build/win/js_engine.vsprops',
+            ])
+
+p.AddFileConfig('../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])
+
+p.AddFileConfig('../tools/build/win/precompiled_wtl.cc',
+                'Release|Win32',
+                ExcludedFromBuild='true',
+                tools=[
+                    'VCCLCompilerTool',
+                ])
+
+xmldoc_files = [
+    'net/url_fetcher.cc',
+    'net/url_fetcher_protect.cc',
+    'net/url_fixer_upper.cc',
+    'password_manager/encryptor.cc',
+    'search_engines/template_url.cc',
+    'search_engines/template_url_fetcher.cc',
+    'search_engines/template_url_model.cc',
+    'search_engines/template_url_parser.cc',
+    'search_engines/template_url_prepopulate_data.cc',
+    'ssl/ssl_blocking_page.cc',
+    'ssl/ssl_error_info.cc',
+    'ssl/ssl_manager.cc',
+    'ssl/ssl_policy.cc',
+    'tab_contents/interstitial_page.cc',
+    'tab_contents/native_ui_contents.cc',
+    'tab_contents/navigation_controller.cc',
+    'tab_contents/navigation_entry.cc',
+    'tab_contents/provisional_load_details.cc',
+    'tab_contents/site_instance.cc',
+    'tab_contents/web_drag_source.cc',
+    'tab_contents/web_drop_target.cc',
+]
+
+xmldoc_tool_list = [
+    MSVSTool('VCCLCompilerTool',
+             XMLDocumentationFileName=('$(IntDir)/$(InputName)1.xdc'),
+             ObjectFile='$(IntDir)/$(InputName)1.obj'),
+]
+
+for filename in xmldoc_files:
+  p.AddFileConfig(filename, 'Debug|Win32', xmldoc_tool_list)
+  p.AddFileConfig(filename, 'Release|Win32', xmldoc_tool_list)

chrome/browser/debugger/debugger.scons

@@ -25,49 +25,158 @@ env.Prepend(
     ],
 )
 
-input_files = [
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('resources', [
+    'resources/debugger.css',
+    'resources/debugger.html',
+    'resources/debugger.js',
+    'resources/debugger_shell.js',
+  ]),
     'debugger_contents.cc',
+    'debugger_contents.h',
+    'debugger_host.h',
     'debugger_host_impl.cpp',
+    'debugger_host_impl.h',
+    'debugger_io.h',
     'debugger_io_socket.cc',
+    'debugger_io_socket.h',
     'debugger_node.cc',
+    'debugger_node.h',
     'debugger_shell.cc',
+    'debugger_shell.h',
+    'resources/debugger_resources.h',
     'debugger_view.cc',
+    'debugger_view.h',
     'debugger_window.cc',
+    'debugger_window.h',
     'debugger_wrapper.cc',
-]
+    'debugger_wrapper.h',
+])
 
 if env.Bit('linux'):
   # TODO(port): Port these.
-  remove_list = [
+  input_files.Remove(
       'debugger_contents.cc',
       'debugger_host_impl.cpp',
       'debugger_node.cc',
       'debugger_shell.cc',
       'debugger_view.cc',
       'debugger_window.cc',
-  ]
-  for file in remove_list:
-    input_files.remove(file)
+  )
 
 if env.Bit('mac'):
   # TODO(port): Port these.
-  remove_list = [
+  input_files.Remove(
       'debugger_contents.cc',
       'debugger_host_impl.cpp',
       'debugger_node.cc',
       'debugger_shell.cc',
       'debugger_view.cc',
       'debugger_window.cc',
-  ]
-  for file in remove_list:
-    input_files.remove(file)
+  )
 
 if not env.Bit('mac'):
   # TODO(port): Enable for Mac.
   env.ChromeLibrary('debugger', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/browser/debugger/debugger.vcproj',
-                dependencies = [
-                    '$CHROME_DIR/app/generated_resources.vcproj',
-                ],
-                guid='{57823D8C-A317-4713-9125-2C91FDFD12D6}')
+
+p = env.ChromeMSVSProject('debugger.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'browser/debugger/debugger.vcproj'),
+                          guid='{57823D8C-A317-4713-9125-2C91FDFD12D6}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$CHROME_DIR/app/generated_resources.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                './debugger.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                './debugger.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+            ])
+
+##############################################################################
+# TODO(sgk):  move to a separate debugger_disabled.scons file? ###############
+
+input_files = ChromeFileList([
+  'debugger_contents.cc',
+  'debugger_contents.h',
+  'debugger_shell.h',
+  'debugger_window.cc',
+  'debugger_window.h',
+  'debugger_wrapper.cc',
+  'debugger_wrapper.h',
+])
+
+p = env.ChromeMSVSProject('debugger_disabled.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'browser/debugger/debugger_disabled.vcproj'),
+                          guid='{369B9881-3F2C-464D-A96C-E281405DF8F6}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/debug.vsprops',
+                './debugger_disabled.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/release.vsprops',
+                './debugger_disabled.vsprops',
+            ])

chrome/browser/views/SConscript

@@ -50,99 +50,250 @@ env.Append(
     ],
 )
 
-input_files = [
-    'about_chrome_view.cc',
-    'blocked_popup_container.cc',
-    'bookmark_bar_view.cc',
-    'bookmark_bubble_view.cc',
-    'bookmark_editor_view.cc',
-    'bookmark_folder_tree_view.cc',
-    'bookmark_manager_view.cc',
-    'bookmark_table_view.cc',
-    'bug_report_view.cc',
-    'clear_browsing_data.cc',
-    'constrained_window_impl.cc',
-    'delay_view.cc',
-    'dom_view.cc',
-    'download_item_view.cc',
-    'download_shelf_view.cc',
-    'download_started_animation.cc',
-    'download_tab_view.cc',
-    'edit_keyword_controller.cc',
-    'event_utils.cc',
-    'external_protocol_dialog.cc',
-    'find_bar_view.cc',
-    'first_run_bubble.cc',
-    'first_run_customize_view.cc',
-    'first_run_view.cc',
-    'first_run_view_base.cc',
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Frame', [
     'frame/aero_glass_frame.cc',
+    'frame/aero_glass_frame.h',
     'frame/aero_glass_non_client_view.cc',
+    'frame/aero_glass_non_client_view.h',
+    'frame/browser_frame.h',
     'frame/browser_view.cc',
+    'frame/browser_view.h',
     'frame/browser_window_factory.cc',
     'frame/opaque_frame.cc',
+    'frame/opaque_frame.h',
     'frame/opaque_non_client_view.cc',
-    'go_button.cc',
-    'html_dialog_view.cc',
-    'hung_renderer_view.cc',
-    'hwnd_html_view.cc',
-    'importer_lock_view.cc',
-    'importer_view.cc',
-    'importing_progress_view.cc',
-    'info_bubble.cc',
+    'frame/opaque_non_client_view.h',
+  ]),
+  MSVSFilter('Info Bars', [
     'infobars/infobar_container.cc',
+    'infobars/infobar_container.h',
     'infobars/infobars.cc',
-    'input_window.cc',
-    'keyword_editor_view.cc',
-    'location_bar_view.cc',
-    'login_view.cc',
-    'new_profile_dialog.cc',
+    'infobars/infobars.h',
+  ]),
+  MSVSFilter('Options', [
     'options/advanced_contents_view.cc',
+    'options/advanced_contents_view.h',
     'options/advanced_page_view.cc',
+    'options/advanced_page_view.h',
     'options/content_page_view.cc',
+    'options/content_page_view.h',
     'options/cookies_view.cc',
+    'options/cookies_view.h',
     'options/fonts_languages_window_view.cc',
+    'options/fonts_languages_window_view.h',
     'options/fonts_page_view.cc',
+    'options/fonts_page_view.h',
     'options/general_page_view.cc',
+    'options/general_page_view.h',
     'options/language_combobox_model.cc',
+    'options/language_combobox_model.h',
     'options/languages_page_view.cc',
+    'options/languages_page_view.h',
     'options/options_group_view.cc',
+    'options/options_group_view.h',
     'options/options_page_view.cc',
+    'options/options_page_view.h',
     'options/options_window_view.cc',
-    'page_info_window.cc',
-    'password_manager_view.cc',
-    'restart_message_box.cc',
-    'sad_tab_view.cc',
-    'select_profile_dialog.cc',
-    'shelf_item_dialog.cc',
-    'shell_dialogs.cc',
-    'star_toggle.cc',
-    'status_bubble.cc',
+  ]),
+  MSVSFilter('Tabs', [
     'tabs/dragged_tab_controller.cc',
+    'tabs/dragged_tab_controller.h',
     'tabs/dragged_tab_view.cc',
+    'tabs/dragged_tab_view.h',
     'tabs/hwnd_photobooth.cc',
+    'tabs/hwnd_photobooth.h',
     'tabs/tab.cc',
+    'tabs/tab.h',
     'tabs/tab_renderer.cc',
+    'tabs/tab_renderer.h',
     'tabs/tab_strip.cc',
-    'tab_icon_view.cc',
+    'tabs/tab_strip.h',
+  ]),
+  MSVSFilter('Find Bar', [
+    'find_bar_view.cc',
+    'find_bar_view.h',
+    'find_bar_win.cc',
+    'find_bar_win.h',
+  ]),
+    'about_chrome_view.cc',
+    'about_chrome_view.h',
+    'blocked_popup_container.cc',
+    'blocked_popup_container.h',
+    'bookmark_bar_view.cc',
+    'bookmark_bar_view.h',
+    'bookmark_bubble_view.cc',
+    'bookmark_bubble_view.h',
+    'bookmark_editor_view.cc',
+    'bookmark_editor_view.h',
+    'bookmark_folder_tree_view.cc',
+    'bookmark_folder_tree_view.h',
+    'bookmark_manager_view.cc',
+    'bookmark_manager_view.h',
+    'bookmark_table_view.cc',
+    'bookmark_table_view.h',
+    'bug_report_view.cc',
+    'bug_report_view.h',
+    'clear_browsing_data.cc',
+    'clear_browsing_data.h',
+    'constrained_window_impl.cc',
+    'constrained_window_impl.h',
+    'delay_view.cc',
+    'delay_view.h',
+    'dom_view.cc',
+    'dom_view.h',
+    'download_item_view.cc',
+    'download_item_view.h',
+    'download_shelf_view.cc',
+    'download_shelf_view.h',
+    'download_started_animation.cc',
+    'download_started_animation.h',
+    'edit_keyword_controller.cc',
+    'edit_keyword_controller.h',
+    'event_utils.cc',
+    'event_utils.h',
+    'external_protocol_dialog.cc',
+    'external_protocol_dialog.h',
+    'first_run_bubble.cc',
+    'first_run_bubble.h',
+    'first_run_customize_view.cc',
+    'first_run_customize_view.h',
+    'first_run_view.cc',
+    'first_run_view.h',
+    'first_run_view_base.cc',
+    'first_run_view_base.h',
+    'go_button.cc',
+    'go_button.h',
+    'html_dialog_view.cc',
+    'html_dialog_view.h',
+    'hung_renderer_view.cc',
+    'hung_renderer_view.h',
+    'hwnd_html_view.cc',
+    'hwnd_html_view.h',
+    'importer_lock_view.cc',
+    'importer_lock_view.h',
+    'importer_view.cc',
+    'importer_view.h',
+    'importing_progress_view.cc',
+    'importing_progress_view.h',
+    'info_bubble.cc',
+    'info_bubble.h',
+    'input_window.cc',
+    'input_window.h',
+    'keyword_editor_view.cc',
+    'keyword_editor_view.h',
+    'location_bar_view.cc',
+    'location_bar_view.h',
+    'login_view.cc',
+    'login_view.h',
+    'new_profile_dialog.cc',
+    'new_profile_dialog.h',
+    'page_info_window.cc',
+    'page_info_window.h',
+    'password_manager_view.cc',
+    'password_manager_view.h',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+    'restart_message_box.cc',
+    'restart_message_box.h',
+    'sad_tab_view.cc',
+    'sad_tab_view.h',
+    'select_profile_dialog.cc',
+    'select_profile_dialog.h',
+    'shelf_item_dialog.cc',
+    'shelf_item_dialog.h',
+    'shell_dialogs.cc',
+    'standard_layout.h',
+    'star_toggle.cc',
+    'star_toggle.h',
+    'status_bubble.cc',
+    'status_bubble.h',
     'tab_contents_container_view.cc',
+    'tab_contents_container_view.h',
+    'tab_icon_view.cc',
+    'tab_icon_view.h',
     'theme_helpers.cc',
+    'theme_helpers.h',
     'toolbar_star_toggle.cc',
+    'toolbar_star_toggle.h',
     'toolbar_view.cc',
+    'toolbar_view.h',
     'user_data_dir_dialog.cc',
-]
+    'user_data_dir_dialog.h',
+])
 
-if env.Bit('windows'):
-  input_files.extend([
+if not env.Bit('windows'):
+  input_files.Remove(
       'find_bar_win.cc',
-  ])
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+  )
 
 env.ChromeLibrary('browser_views', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/browser/views/browser_views.vcproj',
-                dependencies = [
-                    '$LIBXML_DIR/build/libxml_config.vcproj',
-                    '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj',
-                    '$CHROME_DIR/app/generated_resources.vcproj',
-                ],
-                guid='{FA537565-7B03-4FFC-AF15-F7A979B72E22}')
+p = env.ChromeMSVSProject('browser_views.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'browser/views/browser_views.vcproj'),
+                          root_namespace='Browser_views',
+                          guid='{FA537565-7B03-4FFC-AF15-F7A979B72E22}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$LIBXML_DIR/build/libxml_config.vcproj',
+                              '$GOOGLE_UPDATE_DIR/ondemand_updates.vcproj',
+                              '$CHROME_DIR/app/generated_resources.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '../browser.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../../tools/build/win/precompiled_wtl.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '../browser.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)/tools/build/win/js_engine.vsprops',
+            ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Release|Win32',
+                ExcludedFromBuild='true',
+                tools=[
+                    'VCCLCompilerTool',
+                ])

chrome/chrome.scons

@@ -12,6 +12,7 @@ Import('env')
 env.Append(
     COMPONENT_PROGRAM_GROUPS = ['chrome'],
     COMPONENT_TEST_PROGRAM_GROUPS = ['chrome'],
+    STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME = 1,
 )
 
 
@@ -19,7 +20,8 @@ env.Append(
 def chrome_version_emitter(target, source, env):
     source.append(env.File('$CHROME_SRC_DIR/chrome/VERSION'))
     # TODO(sgk):  parameterize for chromium-vs.-google_chrome
-    source.append(env.File('$CHROME_SRC_DIR/chrome/app/theme/google_chrome/BRANDING'))
+    source.append(env.File('$CHROME_SRC_DIR/chrome/'
+                           + 'app/theme/google_chrome/BRANDING'))
     return target, source
 
 b = Builder(action = '$CHROME_VERSION_RC_COM',
@@ -49,8 +51,12 @@ sconscript_files = env.ChromiumLoadComponentSConscripts(
     debugger            = 'browser/debugger/debugger.scons',
     common              = 'common/common.scons',
     ipc_tests           = 'common/ipc_tests.scons',
+    #gcapi_dll           = 'installer/gcapi/gcapi_dll.scons',
+    #gcapi_lib           = 'installer/gcapi/gcapi_lib.scons',
+    #gcapi_test          = 'installer/gcapi/gcapi_test.scons',
     mini_installer      = 'installer/mini_installer/mini_installer.scons',
     setup               = 'installer/setup/setup.scons',
+    #installer_unittests = 'installer/util/installer_unittests.scons',
     util                = 'installer/util/util.scons',
     installer_unittests = 'installer/util/installer_unittests.scons',
     plugin              = 'plugin/plugin.scons',

chrome/common/common.scons

@@ -39,57 +39,177 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = []
-
-input_files.extend([
-  'animation.cc',
-  'chrome_constants.cc',
-  'chrome_counters.cc',
-  'chrome_paths.cc',
-  'chrome_switches.cc',
-  'common_glue.cc',
-  'debug_flags.cc',
-  'env_vars.cc',
-  'gfx/chrome_canvas.cc',
-  'gfx/color_utils.cc',
-  'ipc_channel_proxy.cc',
-  'ipc_message.cc',
-  'ipc_message_utils.cc',
-  'ipc_sync_channel.cc',
-  'ipc_sync_message.cc',
-  'jpeg_codec.cc',
-  'json_value_serializer.cc',
-  'l10n_util.cc',
-  'libxml_utils.cc',
-  'logging_chrome.cc',
-  'message_router.cc',
-  'net/cookie_monster_sqlite.cc',
-  'net/url_request_intercept_job.cc',
-  'notification_registrar.cc',
-  'notification_service.cc',
-  'pref_member.cc',
-  'pref_names.cc',
-  'pref_service.cc',
-  'property_bag.cc',
-  'render_messages.cc',
-  'resource_bundle.cc',
-  'resource_dispatcher.cc',
-  'sandbox_init_wrapper.cc',
-  'slide_animation.cc',
-  'sqlite_compiled_statement.cc',
-  'sqlite_utils.cc',
-  'task_queue.cc',
-  'throb_animation.cc',
-  'time_format.cc',
-  'thumbnail_score.cc',
-  'unzip.cc',
-  'visitedlink_common.cc',
-  'worker_thread_ticker.cc',
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('net', [
+    'net/cookie_monster_sqlite.cc',
+    'net/cookie_monster_sqlite.h',
+    'net/dns.h',
+    'net/url_request_intercept_job.cc',
+    'net/url_request_intercept_job.h',
+  ]),
+  MSVSFilter('gfx', [
+    'gfx/chrome_canvas.cc',
+    'gfx/chrome_canvas.h',
+    'gfx/chrome_canvas_skia.cc',
+    'gfx/chrome_canvas_win.cc',
+    'gfx/chrome_font.h',
+    'gfx/chrome_font_gtk.cc',
+    'gfx/chrome_font_skia.cc',
+    'gfx/chrome_font_win.cc',
+    'gfx/color_utils.cc',
+    'gfx/color_utils.h',
+    'gfx/emf.cc',
+    'gfx/emf.h',
+    'gfx/favicon_size.h',
+    'gfx/icon_util.cc',
+    'gfx/icon_util.h',
+    'gfx/insets.h',
+    'gfx/path.cc',
+    'gfx/path.h',
+    'gfx/text_elider.cc',
+    'gfx/text_elider.h',
+    'gfx/utils.h',
+  ]),
+  MSVSFilter('ipc', [
+    'ipc_channel.h',
+    'ipc_channel_posix.cc',
+    'ipc_channel_proxy.cc',
+    'ipc_channel_proxy.h',
+    'ipc_channel_win.cc',
+    'ipc_logging.cc',
+    'ipc_logging.h',
+    'ipc_message.cc',
+    'ipc_message.h',
+    'ipc_message_macros.h',
+    'ipc_message_utils.cc',
+    'ipc_message_utils.h',
+    'ipc_sync_channel.cc',
+    'ipc_sync_channel.h',
+    'ipc_sync_message.cc',
+    'ipc_sync_message.h',
+    'plugin_messages.cc',
+    'plugin_messages.h',
+    'plugin_messages_internal.h',
+    'render_messages.cc',
+    'render_messages.h',
+    'render_messages_internal.h',
+  ]),
+    'animation.cc',
+    'animation.h',
+    'child_process.cc',
+    'child_process.h',
+    'chrome_constants.cc',
+    'chrome_constants.h',
+    'chrome_counters.cc',
+    'chrome_counters.h',
+    'chrome_paths.cc',
+    'chrome_paths.h',
+    'chrome_plugin_api.h',
+    'chrome_plugin_lib.cc',
+    'chrome_plugin_lib.h',
+    'chrome_plugin_util.cc',
+    'chrome_plugin_util.h',
+    'chrome_process_filter.cc',
+    'chrome_process_filter.h',
+    'chrome_switches.cc',
+    'chrome_switches.h',
+    'classfactory.cc',
+    'classfactory.h',
+    'clipboard_service.h',
+    'common_glue.cc',
+    'common_resources.h',
+    'debug_flags.cc',
+    'debug_flags.h',
+    'drag_drop_types.cc',
+    'drag_drop_types.h',
+    'env_vars.cc',
+    'env_vars.h',
+    'filter_policy.h',
+    'gears_api.h',
+    'jpeg_codec.cc',
+    'jpeg_codec.h',
+    'json_value_serializer.cc',
+    'json_value_serializer.h',
+    'jstemplate_builder.cc',
+    'jstemplate_builder.h',
+    'l10n_util.cc',
+    'l10n_util.h',
+    'libxml_utils.cc',
+    'libxml_utils.h',
+    'logging_chrome.cc',
+    'logging_chrome.h',
+    'main_function_params.h',
+    'message_router.cc',
+    'message_router.h',
+    'mru_cache.h',
+    'navigation_types.h',
+    'notification_details.h',
+    'notification_registrar.cc',
+    'notification_registrar.h',
+    'notification_service.cc',
+    'notification_service.h',
+    'notification_source.h',
+    'notification_types.h',
+    'os_exchange_data.cc',
+    'os_exchange_data.h',
+    'page_transition_types.h',
+    'page_zoom.h',
+    '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled.h',
+    'pref_member.cc',
+    'pref_member.h',
+    'pref_names.cc',
+    'pref_names.h',
+    'pref_service.cc',
+    'pref_service.h',
+    'process_watcher.cc',
+    'process_watcher.h',
+    'property_bag.cc',
+    'property_bag.h',
+    'ref_counted_util.h',
+    'resource_bundle.cc',
+    'resource_bundle.h',
+    'resource_bundle_win.cc',
+    'resource_dispatcher.cc',
+    'resource_dispatcher.h',
+    'sandbox_init_wrapper.cc',
+    'sandbox_init_wrapper.h',
+    'scoped_vector.h',
+    'security_filter_peer.cc',
+    'security_filter_peer.h',
+    'slide_animation.cc',
+    'slide_animation.h',
+    'sqlite_compiled_statement.cc',
+    'sqlite_compiled_statement.h',
+    'sqlite_utils.cc',
+    'sqlite_utils.h',
+    'stl_util-inl.h',
+    'task_queue.cc',
+    'task_queue.h',
+    'throb_animation.cc',
+    'throb_animation.h',
+    'thumbnail_score.cc',
+    'thumbnail_score.h',
+    'time_format.cc',
+    'time_format.h',
+    'unzip.cc',
+    'unzip.h',
+    'visitedlink_common.cc',
+    'visitedlink_common.h',
+    'win_safe_util.cc',
+    'win_safe_util.h',
+    'win_util.cc',
+    'win_util.h',
+    'worker_thread_ticker.cc',
+    'worker_thread_ticker.h',
 ])
 
-if env.Bit('windows'):
+if not env.Bit('windows'):
   # TODO(port): Port these.
-  input_files.extend([
+  input_files.Remove(
       'child_process.cc',
       'chrome_plugin_lib.cc',
       'chrome_plugin_util.cc',
@@ -107,37 +227,85 @@ if env.Bit('windows'):
       'security_filter_peer.cc',
       'win_safe_util.cc',
       'win_util.cc',
-  ])
+  )
 
-if env.Bit('windows'):
+if not env.Bit('windows'):
   # Windows specific files
-  input_files.extend([
+  input_files.Remove(
       'classfactory.cc',
       'gfx/chrome_canvas_win.cc',
       'gfx/chrome_font_win.cc',
       'ipc_channel_win.cc',
       'resource_bundle_win.cc',
-  ])
-elif env.Bit('linux'):
-  input_files.extend([
+      '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX',
+  )
+
+if not env.Bit('linux'):
+  # Linux specific files
+  input_files.Remove(
       'gfx/chrome_canvas_skia.cc',
       'gfx/chrome_font_gtk.cc',
       'gfx/chrome_font_skia.cc',
-  ])
+  )
 
-if env.Bit('posix'):
-  input_files.extend([
+if not env.Bit('posix'):
+  input_files.Remove(
       'ipc_channel_posix.cc',
-  ])
-
+  )
 
 if not env.Bit('mac'):
   # TODO(port): This should be enabled for all platforms.
   env.ChromeLibrary('common', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/common/common.vcproj',
-                dependencies = [
-                    '$LIBXML_DIR/build/libxml_config.vcproj',
-                    '$CHROME_DIR/app/generated_resources.vcproj',
-                ],
-                guid='{899F1280-3441-4D1F-BA04-CCD6208D9146}')
+p = env.ChromeMSVSProject('common.vcproj',
+                          dest='$CHROME_SRC_DIR/chrome/common/common.vcproj',
+                          guid='{899F1280-3441-4D1F-BA04-CCD6208D9146}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$LIBXML_DIR/build/libxml_config.vcproj',
+                              '$CHROME_DIR/app/generated_resources.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                './common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../tools/build/win/precompiled.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                './common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+            ])
+
+p.AddFileConfig('../tools/build/win/precompiled.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

chrome/common/ipc_tests.scons

@@ -74,22 +74,73 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
+input_files = ChromeFileList([
     'ipc_fuzzing_tests.cc',
     'ipc_tests.cc',
-
+    'ipc_tests.h',
     '$BASE_DIR/perftimer$OBJSUFFIX',
-]
+])
 
 ipc_tests = env.ChromeTestProgram('ipc_tests', input_files)
 i = env.Install('$TARGET_ROOT', ipc_tests)
 Alias('chrome', i)
 
-env.ChromeMSVSProject('$CHROME_DIR/common/ipc_tests.vcproj',
-                dependencies = [
-                    '$BASE_DIR/build/base.vcproj',
-                    '$CHROME_DIR/common/common.vcproj',
-                    '$ICU38_DIR/build/icu.vcproj',
-                    '$TESTING_DIR/gtest.vcproj',
-                ],
-                guid='{B92AE829-E1CD-4781-824A-DCB1603A1672}')
+p = env.ChromeMSVSProject('ipc_tests.vcproj',
+                          dest='$CHROME_SRC_DIR/chrome/common/ipc_tests.vcproj',
+                          guid='{B92AE829-E1CD-4781-824A-DCB1603A1672}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$BASE_DIR/build/base.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$TESTING_DIR/gtest.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              MSVSTool('VCLinkerTool',
+                                       AdditionalDependencies=[
+                                           'shlwapi.lib',
+                                           'rpcrt4.lib',
+                                           'winmm.lib'
+                                       ],
+                                       SubSystem='1'),
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])

chrome/installer/mini_installer/mini_installer.scons

@@ -75,21 +75,33 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
-    "mini_installer.cc",
-    "pe_resource.cc",
-]
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('resources', [
+    'mini_installer.ico',
+    'mini_installer.rc',
+    'mini_installer_exe_version.rc.version',
+    'mini_installer_resource.h',
+  ]),
+    'chrome.release',
+    'mini_installer.cc',
+    'mini_installer.h',
+    'pe_resource.cc',
+    'pe_resource.h',
+])
 
 if env.Bit('windows'):
-  input_files.extend([
+  additional_dependencies = [
       "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj",
       "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj",
-  ])
-  input_files.extend(resources)
+  ]
 
 # TODO(port):
 if env.Bit('windows'):
-  env.ChromeProgram('mini_installer', input_files)
+  env.ChromeProgram('mini_installer',
+                    input_files + additional_dependencies + resources)
 
 
 env.AppendENVPath('PATH', r'C:\WINDOWS\system32')
@@ -97,7 +109,8 @@ env.AppendENVPath('PATH', r'C:\WINDOWS\system32')
 # TODO(port):
 if env.Bit('windows'):
   packed = env.Command('$DESTINATION_ROOT/packed_files.txt',
-                       ['$CHROME_DIR/tools/build/win/create_installer_archive.py',
+                       [('$CHROME_DIR/tools/'
+                         + 'build/win/create_installer_archive.py'),
                         '$CHROME_DIR/installer/mini_installer/chrome.release'],
                        ('$PYTHON ${SOURCES[0]}'
                         ' --output_dir=${TARGET.dir}'
@@ -118,66 +131,102 @@ if env.Bit('windows'):
   # TODO(sgk):  implicit dependency should be picked up automatically
   env_res.Depends(resources, exe_version_rc)
 
-env.ChromeMSVSProject('$CHROME_DIR/installer/mini_installer/mini_installer.vcproj',
-                      dependencies = [
-                          '$CHROME_DIR/app/locales/et.vcproj',
-                          '$CHROME_DIR/app/locales/pt-PT.vcproj',
-                          '$CHROME_DIR/app/locales/fr.vcproj',
-                          '$CHROME_DIR/app/locales/uk.vcproj',
-                          '$CHROME_DIR/installer/setup/setup.vcproj',
-                          '$CHROME_DIR/app/locales/th.vcproj',
-                          '$CHROME_DIR/app/locales/hi.vcproj',
-                          '$CHROME_DIR/app/locales/gu.vcproj',
-                          '$CHROME_DIR/app/locales/it.vcproj',
-                          '$CHROME_DIR/app/locales/pt-BR.vcproj',
-                          '$CHROME_DIR/app/locales/sr.vcproj',
-                          '$CHROME_DIR/app/locales/ko.vcproj',
-                          '$CHROME_DIR/app/locales/en-GB.vcproj',
-                          '$CHROME_DIR/app/locales/fil.vcproj',
-                          '$CHROME_DIR/app/locales/ar.vcproj',
-                          '$CHROME_DIR/app/locales/kn.vcproj',
-                          '$CHROME_DIR/app/locales/bn.vcproj',
-                          '$CHROME_DIR/app/locales/es.vcproj',
-                          '$CHROME_DIR/app/locales/bg.vcproj',
-                          '$CHROME_DIR/app/locales/nl.vcproj',
-                          '$CHROME_DIR/app/locales/fi.vcproj',
-                          '$CHROME_DIR/app/locales/tr.vcproj',
-                          '$CHROME_DIR/app/locales/ta.vcproj',
-                          '$CHROME_DIR/app/chrome_exe.vcproj',
-                          '$CHROME_DIR/app/locales/ru.vcproj',
-                          '$CHROME_DIR/app/locales/cs.vcproj',
-                          '$CHROME_DIR/app/locales/lt.vcproj',
-                          '$CHROME_DIR/app/locales/sk.vcproj',
-                          ('$CHROME_DIR/tools/crash_service/' +
-                               'crash_service.vcproj'),
-                          '$CHROME_DIR/app/locales/te.vcproj',
-                          '$CHROME_DIR/app/locales/pl.vcproj',
-                          '$ICU38_DIR/build/icudt.vcproj',
-                          '$CHROME_DIR/app/locales/he.vcproj',
-                          '$CHROME_DIR/app/locales/mr.vcproj',
-                          '$CHROME_DIR/app/locales/da.vcproj',
-                          '$CHROME_DIR/app/locales/lv.vcproj',
-                          '$CHROME_DIR/app/locales/hu.vcproj',
-                          '$CHROME_DIR/app/locales/sv.vcproj',
-                          '$CHROME_DIR/app/locales/ja.vcproj',
-                          '$CHROME_DIR/app/locales/nb.vcproj',
-                          '$CHROME_DIR/app/locales/de.vcproj',
-                          '$RLZ_DIR/rlz.vcproj',
-                          '$CHROME_DIR/app/chrome_dll.vcproj',
-                          '$CHROME_DIR/app/locales/zh-CN.vcproj',
-                          '$CHROME_DIR/app/locales/sl.vcproj',
-                          '$CHROME_DIR/app/locales/ro.vcproj',
-                          '$CHROME_DIR/app/locales/ml.vcproj',
-                          '$CHROME_DIR/app/locales/en-US.vcproj',
-                          '$CHROME_DIR/app/locales/hr.vcproj',
-                          '$CHROME_DIR/app/locales/el.vcproj',
-                          '$CHROME_DIR/app/locales/vi.vcproj',
-                          '$CHROME_DIR/app/locales/or.vcproj',
-                          '$BSDIFF_DIR/bsdiff.vcproj',
-                          '$CHROME_DIR/app/locales/id.vcproj',
-                          '$CHROME_DIR/app/locales/zh-TW.vcproj',
-                          '$CHROME_DIR/app/locales/ca.vcproj',
-                          '$CHROME_DIR/app/locales/es-419.vcproj',
-                          '$CHROME_DIR/app/theme/theme_dll.vcproj',
-                      ],
-                      guid='{24A5AC7C-280B-4899-9153-6BA570A081E7}')
+p = env.ChromeMSVSProject('mini_installer.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/installer/'
+                                + 'mini_installer/mini_installer.vcproj'),
+                          guid='{24A5AC7C-280B-4899-9153-6BA570A081E7}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$CHROME_DIR/app/locales/et.vcproj',
+                              '$CHROME_DIR/app/locales/pt-PT.vcproj',
+                              '$CHROME_DIR/app/locales/fr.vcproj',
+                              '$CHROME_DIR/app/locales/uk.vcproj',
+                              '$CHROME_DIR/installer/setup/setup.vcproj',
+                              '$CHROME_DIR/app/locales/th.vcproj',
+                              '$CHROME_DIR/app/locales/hi.vcproj',
+                              '$CHROME_DIR/app/locales/gu.vcproj',
+                              '$CHROME_DIR/app/locales/it.vcproj',
+                              '$CHROME_DIR/app/locales/pt-BR.vcproj',
+                              '$CHROME_DIR/app/locales/sr.vcproj',
+                              '$CHROME_DIR/app/locales/ko.vcproj',
+                              '$CHROME_DIR/app/locales/en-GB.vcproj',
+                              '$CHROME_DIR/app/locales/fil.vcproj',
+                              '$CHROME_DIR/app/locales/ar.vcproj',
+                              '$CHROME_DIR/app/locales/kn.vcproj',
+                              '$CHROME_DIR/app/locales/bn.vcproj',
+                              '$CHROME_DIR/app/locales/es.vcproj',
+                              '$CHROME_DIR/app/locales/bg.vcproj',
+                              '$CHROME_DIR/app/locales/nl.vcproj',
+                              '$CHROME_DIR/app/locales/fi.vcproj',
+                              '$CHROME_DIR/app/locales/tr.vcproj',
+                              '$CHROME_DIR/app/locales/ta.vcproj',
+                              '$CHROME_DIR/app/chrome_exe.vcproj',
+                              '$CHROME_DIR/app/locales/ru.vcproj',
+                              '$CHROME_DIR/app/locales/cs.vcproj',
+                              '$CHROME_DIR/app/locales/lt.vcproj',
+                              '$CHROME_DIR/app/locales/sk.vcproj',
+                              ('$CHROME_DIR/tools/crash_service/' +
+                                   'crash_service.vcproj'),
+                              '$CHROME_DIR/app/locales/te.vcproj',
+                              '$CHROME_DIR/app/locales/pl.vcproj',
+                              '$ICU38_DIR/build/icudt.vcproj',
+                              '$CHROME_DIR/app/locales/he.vcproj',
+                              '$CHROME_DIR/app/locales/mr.vcproj',
+                              '$CHROME_DIR/app/locales/da.vcproj',
+                              '$CHROME_DIR/app/locales/lv.vcproj',
+                              '$CHROME_DIR/app/locales/hu.vcproj',
+                              '$CHROME_DIR/app/locales/sv.vcproj',
+                              '$CHROME_DIR/app/locales/ja.vcproj',
+                              '$CHROME_DIR/app/locales/nb.vcproj',
+                              '$CHROME_DIR/app/locales/de.vcproj',
+                              '$RLZ_DIR/rlz.vcproj',
+                              '$CHROME_DIR/app/chrome_dll.vcproj',
+                              '$CHROME_DIR/app/locales/zh-CN.vcproj',
+                              '$CHROME_DIR/app/locales/sl.vcproj',
+                              '$CHROME_DIR/app/locales/ro.vcproj',
+                              '$CHROME_DIR/app/locales/ml.vcproj',
+                              '$CHROME_DIR/app/locales/en-US.vcproj',
+                              '$CHROME_DIR/app/locales/hr.vcproj',
+                              '$CHROME_DIR/app/locales/el.vcproj',
+                              '$CHROME_DIR/app/locales/vi.vcproj',
+                              '$CHROME_DIR/app/locales/or.vcproj',
+                              '$BSDIFF_DIR/bsdiff.vcproj',
+                              '$CHROME_DIR/app/locales/id.vcproj',
+                              '$CHROME_DIR/app/locales/zh-TW.vcproj',
+                              '$CHROME_DIR/app/locales/ca.vcproj',
+                              '$CHROME_DIR/app/locales/es-419.vcproj',
+                              '$CHROME_DIR/app/theme/theme_dll.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              MSVSTool('create installer archive',
+                      LastChromeInstaller='$(LAST_CHROME_INSTALLER)',
+                      LastChromeVersion='$(LAST_CHROME_VERSION)',
+                      SkipRebuildArchive='$(SKIP_REBUILD_CHROME_ARCHIVE)'
+                              ),
+                              'Version',
+                              'VCCLCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCLinkerTool',
+                              'VCManifestTool',
+                          ],
+                          ConfigurationType='1')
+
+p.AddToolFile('$CHROME_DIR/tools/build/win/release.rules')
+p.AddToolFile('$CHROME_DIR/tools/build/win/version.rules')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                './mini_installer_debug.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                './mini_installer_release.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])

chrome/installer/setup/setup.scons

@@ -72,35 +72,76 @@ if env.Bit('windows'):
       ],
   )
 
-
-input_files = [
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('resources', [
+    'setup.ico',
+    'setup.rc',
+    'setup_exe_version.rc.version',
+    'setup_resource.h',
+  ]),
     'install.cc',
     'main.cc',
     'setup.cc',
+    'setup.h',
     'setup_constants.cc',
+    'setup_constants.h',
     'uninstall.cc',
-]
+    'uninstall.h',
+])
 
 # TODO(port):
 if env.Bit('windows'):
-  env.ChromeProgram('setup', resources + input_files)
+  env.ChromeProgram('setup', resources + input_files[1:])
 
-env.ChromeMSVSProject('$CHROME_DIR/installer/setup/setup.vcproj',
-                      dependencies = [
-                          '$BASE_DIR/build/base.vcproj',
-                          '$CHROME_DIR/common/common.vcproj',
-                          '$ICU38_DIR/build/icu.vcproj',
-                          '$LZMA_SDK_DIR/7z_C.vcproj',
-                          '$BSPATCH_DIR/bspatch.vcproj',
-                          '$CHROME_DIR/installer/util/util.vcproj',
-                      ],
-                      guid='{21C76E6E-8B38-44D6-8148-B589C13B9554}')
+p = env.ChromeMSVSProject('setup.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'installer/setup/setup.vcproj'),
+                          guid='{21C76E6E-8B38-44D6-8148-B589C13B9554}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$BASE_DIR/build/base.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$LZMA_SDK_DIR/7z_C.vcproj',
+                              '$BSPATCH_DIR/bspatch.vcproj',
+                              '$CHROME_DIR/installer/util/util.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'Version',
+                              'VCCLCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCLinkerTool',
+                              'VCManifestTool',
+                          ],
+                          ConfigurationType='1')
+
+p.AddToolFile('$CHROME_DIR/tools/build/win/version.rules')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                './setup_debug.vsprops',
+                '$(SolutionDir)installer/util/using_util.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                './setup_release.vsprops',
+                '$(SolutionDir)installer/util/using_util.vsprops',
+            ])
 
 # TODO(port):
 if env.Bit('windows'):
   exe_version_rc = env.ChromeVersionRC('setup_exe_version.rc',
-                                     'setup_exe_version.rc.version',
-                                     PWD = env.Dir('.'))
+                                       'setup_exe_version.rc.version',
+                                       PWD = env.Dir('.'))
 
   # TODO(sgk):  implicit dependency should be picked up automatically
   env_res.Depends(resources, exe_version_rc)

chrome/installer/util/installer_unittests.scons

@@ -51,20 +51,86 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
-    '../setup/setup_constants$OBJSUFFIX',
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('support', [
+    'run_all_unittests.cc',
+  ]),
+  MSVSFilter('tests', [
     'copy_tree_work_item_unittest.cc',
     'create_dir_work_item_unittest.cc',
     'create_reg_key_work_item_unittest.cc',
     'delete_reg_value_work_item_unittest.cc',
     'delete_tree_work_item_unittest.cc',
-    'google_chrome_distribution_unittest.cc',
     'helper_unittest.cc',
-    'run_all_unittests.cc',
+    'google_chrome_distribution_unittest.cc',
     'set_reg_value_work_item_unittest.cc',
+    '../setup/setup_constants$OBJSUFFIX',
     'work_item_list_unittest.cc',
-]
+  ]),
+])
+
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeTestProgram('installer_unittests', input_files)
+
+p = env.ChromeMSVSProject('installer_unittests.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'installer/util/installer_unittests.vcproj'),
+                          guid='{903F8C1E-537A-4C9E-97BE-075147CBE769}',
+                          dependencies = [
+                              '$BASE_DIR/build/base.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$TESTING_DIR/gtest.vcproj',
+                              '$CHROME_DIR/installer/util/util.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLinkerTool',
+                              'VCALinkTool',
+                              MSVSTool('VCManifestTool',
+                                       AdditionalManifestFiles=(
+                                           '$(SolutionDir)installer/'
+                                           + 'mini_installer/'
+                                           + 'mini_installer.exe.manifest')),
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)/tools/build/win/unit_test.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)/tools/build/win/unit_test.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])

chrome/installer/util/util.scons

@@ -26,43 +26,116 @@ env.Prepend(
     ],
 )
 
-input_files = [
+input_files = ChromeFileList([
     'browser_distribution.cc',
+    'browser_distribution.h',
     'copy_tree_work_item.cc',
+    'copy_tree_work_item.h',
     'create_dir_work_item.cc',
+    'create_dir_work_item.h',
     'create_reg_key_work_item.cc',
+    'create_reg_key_work_item.h',
     'delete_reg_value_work_item.cc',
+    'delete_reg_value_work_item.h',
     'delete_tree_work_item.cc',
+    'delete_tree_work_item.h',
     'google_chrome_distribution.cc',
+    'google_chrome_distribution.h',
     'google_update_constants.cc',
+    'google_update_constants.h',
     'google_update_settings.cc',
+    'google_update_settings.h',
     'helper.cc',
+    'helper.h',
+    'html_dialog.h',
     'html_dialog_impl.cc',
     'install_util.cc',
+    'install_util.h',
     'l10n_string_util.cc',
+    'l10n_string_util.h',
     'logging_installer.cc',
+    'logging_installer.h',
     'lzma_util.cc',
+    'lzma_util.h',
     'master_preferences.cc',
+    'master_preferences.h',
     'set_reg_value_work_item.cc',
+    'set_reg_value_work_item.h',
     'shell_util.cc',
+    'shell_util.h',
     'util_constants.cc',
+    'util_constants.h',
     'version.cc',
+    'version.h',
     'work_item.cc',
+    'work_item.h',
     'work_item_list.cc',
-]
+    'work_item_list.h',
+])
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeLibrary('util', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/installer/util/util.vcproj',
-                      dependencies = [
-                          ('$CHROME_DIR/installer/util/prebuild/' + 
-                               'util_prebuild.vcproj'),
-                      ],
-                      guid='{EFBB1436-A63F-4CD8-9E99-B89226E782EC}')
+p = env.ChromeMSVSProject('util.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'installer/util/util.vcproj'),
+                          guid='{EFBB1436-A63F-4CD8-9E99-B89226E782EC}',
+                          dependencies = [
+                              ('$CHROME_DIR/installer/util/prebuild/' + 
+                                   'util_prebuild.vcproj'),
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
 
 
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)common/common.vsprops',
+                '$(SolutionDir)installer/util/using_util.vsprops',
+                '$(SolutionDir)../third_party/lzma_sdk/using_lzma_sdk.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)common/common.vsprops',
+                '$(SolutionDir)installer/util/using_util.vsprops',
+                '$(SolutionDir)../third_party/lzma_sdk/using_lzma_sdk.vsprops',
+            ])
+
+
+##############################################################################
+
+input_files = ChromeFileList([
+  'prebuild/create_string_rc.bat',
+  'prebuild/create_string_rc.py',
+])
+
 # TODO(port):
 if env.Bit('windows'):
   # create_string_rc.py imports FP.py from the tools/grit/grit/extern
@@ -76,3 +149,43 @@ if env.Bit('windows'):
                  '$CHROME_DIR/app/generated_resources.grd'] +
                  env.Glob('$CHROME_DIR/app/resources/*.xtb'),
                 "$PYTHON ${SOURCES[0]} ${TARGET.dir}")
+
+p = env.ChromeMSVSProject('prebuild/util_prebuild.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/installer/'
+                                + 'util/prebuild/util_prebuild.vcproj'),
+                          guid='{0026A376-C4F1-4575-A1BA-578C69F07013}',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              MSVSTool('VCCustomBuildTool',
+                                       CommandLine=('create_string_rc.bat '
+                                                    + '$(IntDir)'),
+                                       AdditionalDependencies=(
+                                           'create_string_rc.py;'
+                                           + '$(SolutionDir)/app/'
+                                           + 'generated_resources.grd'),
+                                       Outputs=('$(IntDir)/'
+                                                + 'installer_util_strings.rc;'
+                                                + '$(IntDir)/'
+                                                + 'installer_util_strings.h')),
+                              'VCMIDLTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='10')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+            ])

chrome/plugin/plugin.scons

@@ -24,23 +24,45 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
-    'chrome_plugin_host.cc',
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('NPObject', [
     'npobject_proxy.cc',
+    'npobject_proxy.h',
     'npobject_stub.cc',
+    'npobject_stub.h',
     'npobject_util.cc',
+    'npobject_util.h',
+  ]),
+    'chrome_plugin_host.cc',
+    'chrome_plugin_host.h',
     'plugin_channel.cc',
+    'plugin_channel.h',
     'plugin_channel_base.cc',
+    'plugin_channel_base.h',
     'plugin_main.cc',
     'plugin_process.cc',
+    'plugin_process.h',
     'plugin_thread.cc',
+    'plugin_thread.h',
+    '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled.h',
     'webplugin_delegate_stub.cc',
+    'webplugin_delegate_stub.h',
     'webplugin_proxy.cc',
-]
+    'webplugin_proxy.h',
+])
+
+if not env.Bit('windows'):
+  input_files.Remove(
+      '$CHROME_DIR/tools/build/win/precompiled$OBJSUFFIX',
+  )
 
 if env.Bit('posix'):
   # TODO(port)
-  to_be_ported_files = [
+  input_files.Remove(
       'chrome_plugin_host.cc',
       'npobject_proxy.cc',
       'npobject_stub.cc',
@@ -52,11 +74,59 @@ if env.Bit('posix'):
       'plugin_thread.cc',
       'webplugin_delegate_stub.cc',
       'webplugin_proxy.cc',
-  ]
-  for remove in to_be_ported_files:
-    input_files.remove(remove)
+  )
 
 env.ChromeLibrary('plugin', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/plugin/plugin.vcproj',
-                guid='{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}')
+p = env.ChromeMSVSProject('plugin.vcproj',
+                          dest='$CHROME_SRC_DIR/chrome/plugin/plugin.vcproj',
+                          guid='{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '../tools/build/win/precompiled.vsprops',
+                '$(SolutionDir)../third_party/npapi/using_npapi.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)../third_party/npapi/using_npapi.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+            ])
+
+p.AddFileConfig('../tools/build/win/precompiled.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

chrome/renderer/renderer.scons

@@ -27,34 +27,69 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('automation', [
+    'automation/dom_automation_controller.cc',
+    'automation/dom_automation_controller.h',
+  ]),
+  MSVSFilter('net', [
+    'net/render_dns_master.cc',
+    'net/render_dns_master.h',
+    'net/render_dns_queue.cc',
+    'net/render_dns_queue.h',
+  ]),
     'about_handler.cc',
+    'about_handler.h',
     'chrome_plugin_host.cc',
+    'chrome_plugin_host.h',
     'debug_message_handler.cc',
+    'debug_message_handler.h',
     'dom_ui_bindings.cc',
+    'dom_ui_bindings.h',
     'external_host_bindings.cc',
+    'external_host_bindings.h',
     'external_js_object.cc',
+    'external_js_object.h',
     'localized_error.cc',
+    'localized_error.h',
     'plugin_channel_host.cc',
+    'plugin_channel_host.h',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
     'render_process.cc',
+    'render_process.h',
     'render_thread.cc',
+    'render_thread.h',
     'render_view.cc',
+    'render_view.h',
     'render_widget.cc',
+    'render_widget.h',
     'renderer_glue.cc',
     'renderer_main.cc',
+    'renderer_resources.h',
     'user_script_slave.cc',
+    'user_script_slave.h',
     'visitedlink_slave.cc',
+    'visitedlink_slave.h',
     'webmediaplayer_delegate_impl.cc',
+    'webmediaplayer_delegate_impl.h',
     'webplugin_delegate_proxy.cc',
-    'automation/dom_automation_controller.cc',
+    'webplugin_delegate_proxy.h',
+])
 
-    'net/render_dns_master.cc',
-    'net/render_dns_queue.cc',
-]
+if not env.Bit('windows'):
+  # Windows-specific.
+  input_files.Remove(
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+  )
 
 # TODO(port): Port these to Linux
 if env.Bit('linux'):
-  to_be_ported_files = [
+  input_files.Remove(
       'chrome_plugin_host.cc',
       'debug_message_handler.cc',
       'external_js_object.cc',
@@ -67,13 +102,11 @@ if env.Bit('linux'):
       'renderer_glue.cc',
       'renderer_main.cc',
       'webplugin_delegate_proxy.cc',
-  ]
-  for remove in to_be_ported_files:
-    input_files.remove(remove)
+  )
 
 # TODO(port): Port these to Mac
 if env.Bit('mac'):
-  to_be_ported_files = [
+  input_files.Remove(
       'chrome_plugin_host.cc',
       'debug_message_handler.cc',
       'external_js_object.cc',
@@ -86,17 +119,64 @@ if env.Bit('mac'):
       'renderer_glue.cc',
       'renderer_main.cc',
       'webplugin_delegate_proxy.cc',
-  ]
-  for remove in to_be_ported_files:
-    input_files.remove(remove)
+  )
 
 
 # TODO(port): Enable for Mac.
 if not env.Bit('mac'):
   env.ChromeLibrary('renderer', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/renderer/renderer.vcproj',
-                dependencies = [
-                    '$CHROME_DIR/app/generated_resources.vcproj',
-                ],
-                guid='{9301A569-5D2B-4D11-9332-B1E30AEACB8D}')
+# TODO########################################################################
+
+p = env.ChromeMSVSProject('renderer.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'renderer/renderer.vcproj'),
+                          guid='{9301A569-5D2B-4D11-9332-B1E30AEACB8D}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$CHROME_DIR/app/generated_resources.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                './renderer.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../tools/build/win/precompiled_wtl.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                './renderer.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+            ])
+
+p.AddFileConfig('../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

chrome/test/activex_test_control/activex_test_control.scons

@@ -40,16 +40,71 @@ if env.Bit('windows'):
 if env.Bit('windows'):
   env.TypeLibrary('activex_test_control.idl')
 
-input_files = [
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('resource', [
+    'activex_test_control.rc',
+    'activex_test_control.rgs',
+    'chrome_test_control.bmp',
+    'chrome_test_control.rgs',
+  ]),
     'activex_test_control.cc',
     'activex_test_control.def',
+    'activex_test_control.idl',
     'chrome_test_control.cc',
-]
+    'chrome_test_control.h',
+    'chrome_test_control_cp.h',
+    'resource.h',
+])
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeSharedLibrary('activex_test_control', input_files)
 
-env.ChromeMSVSProject(('$CHROME_DIR/test/activex_test_control/' +
-                          'activex_test_control.vcproj'),
-                      guid='{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}')
+p = env.ChromeMSVSProject('activex_test_control.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/test/'
+                                + 'activex_test_control/'
+                                + 'activex_test_control.vcproj'),
+                          keyword='AtlProj',
+                          guid='{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLinkerTool',
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='2')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                './activex_test_control.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                './activex_test_control.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+            ])

chrome/test/automated_ui_tests/automated_ui_tests.scons

@@ -63,37 +63,124 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
-    'automated_ui_tests.cc',
-
-    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Common', [
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
     '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/testing_browser_process.h',
     '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test.h',
     '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
-]
+  ]),
+  MSVSFilter('MemoryUsage', [
+    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
+    '$CHROME_DIR/test/perf/mem_usage.h',
+  ]),
+  MSVSFilter('AutomatedUITest', [
+    'automated_ui_tests.cc',
+    'automated_ui_tests.h',
+  ]),
+])
+
+if not env.Bit('windows'):
+  input_files.Remove(
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+  )
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeTestProgram('automated_ui_tests',  input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/automated_ui_tests/automated_ui_tests.vcproj',
-                      dependencies = [
-                          '$CHROME_DIR/test/automation/automation.vcproj',
-                          '$BASE_DIR/build/base.vcproj',
-                          '$LIBXML_DIR/build/libxml_config.vcproj',
-                          '$NET_DIR/build/net.vcproj',
-                          '$CHROME_DIR/browser/browser.vcproj',
-                          '$MODP_B64_DIR/modp_b64.vcproj',
-                          '$CHROME_DIR/app/chrome_exe.vcproj',
-                          '$ZLIB_DIR/zlib.vcproj',
-                          '$CHROME_DIR/common/common.vcproj',
-                          '$ICU38_DIR/build/icu.vcproj',
-                          '$BASE_DIR/build/base_gfx.vcproj',
-                          '$TESTING_DIR/gtest.vcproj',
-                          '$LIBPNG_DIR/libpng.vcproj',
-                          '$SKIA_DIR/skia.vcproj',
-                          '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                          '$LIBXML_DIR/build/libxml.vcproj',
-                          '$CHROME_DIR/browser/views/browser_views.vcproj',
-                      ],
-                      guid='{D2250C20-3A94-4FB9-AF73-11BC5B73884B}')
+p = env.ChromeMSVSProject('automated_ui_tests.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/test/'
+                                + 'automated_ui_tests/'
+                                + 'automated_ui_tests.vcproj'),
+                          root_namespace='page_cycler_tests',
+                          guid='{D2250C20-3A94-4FB9-AF73-11BC5B73884B}',
+                          dependencies = [
+                              '$CHROME_DIR/test/automation/automation.vcproj',
+                              '$BASE_DIR/build/base.vcproj',
+                              '$LIBXML_DIR/build/libxml_config.vcproj',
+                              '$NET_DIR/build/net.vcproj',
+                              '$CHROME_DIR/browser/browser.vcproj',
+                              '$MODP_B64_DIR/modp_b64.vcproj',
+                              '$CHROME_DIR/app/chrome_exe.vcproj',
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              '$TESTING_DIR/gtest.vcproj',
+                              '$LIBPNG_DIR/libpng.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                              '$LIBXML_DIR/build/libxml.vcproj',
+                              '$CHROME_DIR/browser/views/browser_views.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLinkerTool',
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../../tools/build/win/precompiled_wtl.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                ('$(SolutionDir)../'
+                 + 'third_party/libxml/build/using_libxml.vsprops'),
+                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+                '../../tools/build/win/test_memory_usage.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '../../tools/build/win/test_memory_usage.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',
+            ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

chrome/test/automation/automation.scons

@@ -17,19 +17,67 @@ env.Prepend(
     ],
 )
 
-input_files = [
+input_files = ChromeFileList([
     'autocomplete_edit_proxy.cc',
+    'autocomplete_edit_proxy.h',
+    'automation_constants.h',
     'automation_handle_tracker.cc',
+    'automation_handle_tracker.h',
+    'automation_messages.h',
+    'automation_messages_internal.h',
     'automation_proxy.cc',
+    'automation_proxy.h',
     'browser_proxy.cc',
+    'browser_proxy.h',
     'constrained_window_proxy.cc',
+    'constrained_window_proxy.h',
     'tab_proxy.cc',
+    'tab_proxy.h',
     'window_proxy.cc',
-]
+    'window_proxy.h',
+])
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeLibrary('automation', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/automation/automation.vcproj',
-                      guid='{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}')
+p = env.ChromeMSVSProject('automation.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'test/automation/automation.vcproj'),
+                          guid='{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/debug.vsprops',
+                './automation.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/release.vsprops',
+                './automation.vsprops',
+            ])

chrome/test/chrome_plugin/test_chrome_plugin.scons

@@ -41,22 +41,89 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
+input_files = ChromeFileList([
     'test_chrome_plugin.cc',
-]
+    'test_chrome_plugin.def',
+    'test_chrome_plugin.h',
+])
 
-if env.Bit('windows'):
-  input_files.extend([
+if not env.Bit('windows'):
+  input_files.Remove(
       'test_chrome_plugin.def',
-  ])
+  )
 
 env.ChromeSharedLibrary('test_chrome_plugin', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/chrome_plugin/test_chrome_plugin.vcproj',
-                dependencies = [
-                    '$BASE_DIR/build/base.vcproj',
-                    '$ICU38_DIR/build/icu.vcproj',
-                    '$ICU38_DIR/build/icudt.vcproj',
-                    '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                ],
-                guid='{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}')
+p = env.ChromeMSVSProject('test_chrome_plugin.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/test/'
+                                + 'chrome_plugin/test_chrome_plugin.vcproj'),
+                          root_namespace='startup_tests',
+                          guid='{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}',
+                          dependencies = [
+                              '$BASE_DIR/build/base.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$ICU38_DIR/build/icudt.vcproj',
+                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          ConfigurationType='2')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/debug.vsprops',
+                './test_chrome_plugin.vsprops',
+            ],
+            tools=[
+                'VCPreBuildEventTool',
+                'VCCustomBuildTool',
+                'VCXMLDataGeneratorTool',
+                'VCWebServiceProxyGeneratorTool',
+                'VCMIDLTool',
+                MSVSTool('VCCLCompilerTool',
+                         UsePrecompiledHeader='0'),
+                'VCManagedResourceCompilerTool',
+                'VCResourceCompilerTool',
+                'VCPreLinkEventTool',
+                MSVSTool('VCLinkerTool',
+                         AdditionalDependencies='winmm.lib'),
+                'VCALinkTool',
+                'VCManifestTool',
+                'VCXDCMakeTool',
+                'VCBscMakeTool',
+                'VCFxCopTool',
+                'VCAppVerifierTool',
+                'VCWebDeploymentTool',
+                'VCPostBuildEventTool',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/release.vsprops',
+                './test_chrome_plugin.vsprops',
+            ],
+            tools=[
+                'VCPreBuildEventTool',
+                'VCCustomBuildTool',
+                'VCXMLDataGeneratorTool',
+                'VCWebServiceProxyGeneratorTool',
+                'VCMIDLTool',
+                'VCCLCompilerTool',
+                'VCManagedResourceCompilerTool',
+                'VCResourceCompilerTool',
+                'VCPreLinkEventTool',
+                MSVSTool('VCLinkerTool',
+                         AdditionalDependencies='winmm.lib'),
+                'VCALinkTool',
+                'VCManifestTool',
+                'VCXDCMakeTool',
+                'VCBscMakeTool',
+                'VCFxCopTool',
+                'VCAppVerifierTool',
+                'VCWebDeploymentTool',
+                'VCPostBuildEventTool',
+            ])

chrome/test/interactive_ui/interactive_ui_tests.scons

@@ -89,70 +89,189 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
-    '$CHROME_DIR/browser/browser_focus_uitest.cc',
-    '$CHROME_DIR/browser/views/bookmark_bar_view_test.cc',
-    '$CHROME_DIR/browser/views/constrained_window_impl_interactive_uitest.cc',
-    '$CHROME_DIR/browser/views/tabs/tab_dragging_test.cc',
-    '$CHROME_DIR/test/interactive_ui/npapi_interactive_test.cc',
-    '$CHROME_DIR/test/testing_profile$OBJSUFFIX',
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Common', [
     '$CHROME_DIR/test/ui/npapi_test_helper$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/npapi_test_helper.h',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
     '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/testing_profile$OBJSUFFIX',
+    '$CHROME_DIR/test/testing_profile.h',
     '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test.h',
     '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
-
     'view_event_test_base.cc',
-]
+    'view_event_test_base.h',
+  ]),
+  MSVSFilter('TestBookmarkBarView', [
+    '$CHROME_DIR/browser/views/bookmark_bar_view_test.cc',
+  ]),
+  MSVSFilter('TestFindInPage', [
+    '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc',
+  ]),
+  MSVSFilter('TestFocus', [
+    '$CHROME_DIR/browser/browser_focus_uitest.cc',
+    '$CHROME_DIR/browser/views/constrained_window_impl_interactive_uitest.cc',
+  ]),
+  MSVSFilter('TestTabDragging', [
+    '$CHROME_DIR/browser/views/tabs/tab_dragging_test.cc',
+  ]),
+  MSVSFilter('TestNPAPI', [
+    'npapi_interactive_test.cc',
+  ]),
+])
+
+if not env.Bit('windows'):
+  # Windows-specific.
+  input_files.Remove(
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+  )
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeTestProgram('interactive_ui_tests', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/interactive_ui/interactive_ui.vcproj',
-                      name='interactive_ui_tests',
-                      dependencies = [
-                          '$CHROME_DIR/test/automation/automation.vcproj',
-                          '$BASE_DIR/build/base.vcproj',
-                          '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
-                          '$CHROME_DIR/plugin/plugin.vcproj',
-                          '$LIBJPEG_DIR/libjpeg.vcproj',
-                          '$BZIP2_DIR/bzip2.vcproj',
-                          '$NET_DIR/build/net.vcproj',
-                          ('$WEBKIT_DIR/build/JavaScriptCore/' +
-                               'JavaScriptCore_pcre.vcproj'),
-                          '$WEBKIT_DIR/build/port/port.vcproj',
-                          '$CHROME_DIR/browser/debugger/debugger.vcproj',
-                          '$WEBKIT_DIR/default_plugin/default_plugin.vcproj',
-                          '$CHROME_DIR/browser/browser.vcproj',
-                          '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
-                          '$SQLITE_DIR/sqlite.vcproj',
-                          '$CHROME_DIR/views/views.vcproj',
-                          '$MODP_B64_DIR/modp_b64.vcproj',
-                          '$CHROME_DIR/app/chrome_exe.vcproj',
-                          ('$CHROME_DIR/test/chrome_plugin/' +
-                               'test_chrome_plugin.vcproj'),
-                          '$ZLIB_DIR/zlib.vcproj',
-                          '$CHROME_DIR/common/common.vcproj',
-                          '$ICU38_DIR/build/icu.vcproj',
-                          '$CHROME_DIR/renderer/renderer.vcproj',
-                          '$BASE_DIR/build/base_gfx.vcproj',
-                          '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
-                          ('$CHROME_DIR/browser/resources/' +
-                               'browser_resources.vcproj'),
-                          '$RLZ_DIR/rlz.vcproj',
-                          '$TESTING_DIR/gtest.vcproj',
-                          '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj',
-                          '$LIBPNG_DIR/libpng.vcproj',
-                          '$WEBKIT_DIR/build/glue/glue.vcproj',
-                          '$CHROME_DIR/app/locales/en-US.vcproj',
-                          '$SKIA_DIR/skia.vcproj',
-                          '$CHROME_DIR/third_party/hunspell/hunspell.vcproj',
-                          '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                          '$CHROME_DIR/installer/util/util.vcproj',
-                          '$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
-                          '$SDCH_DIR/sdch.vcproj',
-                          '$CHROME_DIR/browser/views/browser_views.vcproj',
-                          '$LIBXSLT_DIR/build/libxslt.vcproj',
-                          '$CHROME_DIR/app/theme/theme_dll.vcproj',
-                      ],
-                      guid='{018D4F38-6272-448F-A864-976DA09F05D0}')
+p = env.ChromeMSVSProject('interactive_ui.vcproj',
+                          name='interactive_ui_tests',
+                          root_namespace='manual_ui',
+                          dest=('$CHROME_SRC_DIR/chrome/test/'
+                                + 'interactive_ui/interactive_ui.vcproj'),
+                          guid='{018D4F38-6272-448F-A864-976DA09F05D0}',
+                          dependencies = [
+                              '$CHROME_DIR/test/automation/automation.vcproj',
+                              '$BASE_DIR/build/base.vcproj',
+                              '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
+                              '$CHROME_DIR/plugin/plugin.vcproj',
+                              '$LIBJPEG_DIR/libjpeg.vcproj',
+                              '$BZIP2_DIR/bzip2.vcproj',
+                              '$NET_DIR/build/net.vcproj',
+                              ('$WEBKIT_DIR/build/JavaScriptCore/' +
+                                   'JavaScriptCore_pcre.vcproj'),
+                              '$WEBKIT_DIR/build/port/port.vcproj',
+                              '$CHROME_DIR/browser/debugger/debugger.vcproj',
+                              ('$WEBKIT_DIR/default_plugin/'
+                               + 'default_plugin.vcproj'),
+                              '$CHROME_DIR/browser/browser.vcproj',
+                              '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
+                              '$SQLITE_DIR/sqlite.vcproj',
+                              '$CHROME_DIR/views/views.vcproj',
+                              '$MODP_B64_DIR/modp_b64.vcproj',
+                              '$CHROME_DIR/app/chrome_exe.vcproj',
+                              ('$CHROME_DIR/test/chrome_plugin/' +
+                                   'test_chrome_plugin.vcproj'),
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$CHROME_DIR/renderer/renderer.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
+                              ('$CHROME_DIR/browser/resources/' +
+                                   'browser_resources.vcproj'),
+                              '$RLZ_DIR/rlz.vcproj',
+                              '$TESTING_DIR/gtest.vcproj',
+                              '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj',
+                              '$LIBPNG_DIR/libpng.vcproj',
+                              '$WEBKIT_DIR/build/glue/glue.vcproj',
+                              '$CHROME_DIR/app/locales/en-US.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                              ('$CHROME_DIR/third_party/'
+                               + 'hunspell/hunspell.vcproj'),
+                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                              '$CHROME_DIR/installer/util/util.vcproj',
+                              '$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
+                              '$SDCH_DIR/sdch.vcproj',
+                              '$CHROME_DIR/browser/views/browser_views.vcproj',
+                              '$LIBXSLT_DIR/build/libxslt.vcproj',
+                              '$CHROME_DIR/app/theme/theme_dll.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            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'),
+                '../../../third_party/icu38/build/using_icu.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+                '../../third_party/hunspell/using_hunspell.vsprops',
+            ],
+            tools=[
+                'VCPreBuildEventTool',
+                'VCCustomBuildTool',
+                'VCXMLDataGeneratorTool',
+                'VCWebServiceProxyGeneratorTool',
+                'VCMIDLTool',
+                'VCCLCompilerTool',
+                'VCManagedResourceCompilerTool',
+                'VCResourceCompilerTool',
+                'VCPreLinkEventTool',
+                'VCLinkerTool',
+                'VCALinkTool',
+                'VCManifestTool',
+                'VCXDCMakeTool',
+                'VCBscMakeTool',
+                'VCFxCopTool',
+                'VCAppVerifierTool',
+                'VCWebDeploymentTool',
+                'VCPostBuildEventTool',
+            ])
+
+p.AddConfig('Release|Win32',
+            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'),
+                '../../../third_party/icu38/build/using_icu.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+                '../../third_party/hunspell/using_hunspell.vsprops',
+            ],
+            tools=[
+                'VCPreBuildEventTool',
+                'VCCustomBuildTool',
+                'VCXMLDataGeneratorTool',
+                'VCWebServiceProxyGeneratorTool',
+                'VCMIDLTool',
+                'VCCLCompilerTool',
+                'VCManagedResourceCompilerTool',
+                'VCResourceCompilerTool',
+                'VCPreLinkEventTool',
+                MSVSTool('VCLinkerTool',
+                         AdditionalDependencies='winmm.lib'),
+                'VCALinkTool',
+                'VCManifestTool',
+                'VCXDCMakeTool',
+                'VCBscMakeTool',
+                'VCFxCopTool',
+                'VCAppVerifierTool',
+                'VCWebDeploymentTool',
+                'VCPostBuildEventTool',
+            ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

chrome/test/memory_test/memory_test.scons

@@ -54,32 +54,113 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
-    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Common', [
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
     '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/testing_browser_process.h',
     '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test.h',
     '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+  ]),
+  MSVSFilter('MemoryUsage', [
+    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
+    '$CHROME_DIR/test/perf/mem_usage.h',
+  ]),
+  MSVSFilter('TestMemory', [
     'memory_test.cc',
-]
+  ]),
+])
+
+if not env.Bit('windows'):
+  # Windows-specific.
+  input_files.Remove(
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+  )
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeTestProgram('memory_test', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/memory_test/memory_test.vcproj',
-                      dependencies = [
-                          '$CHROME_DIR/test/automation/automation.vcproj',
-                          '$BASE_DIR/build/base.vcproj',
-                          '$NET_DIR/build/net.vcproj',
-                          '$CHROME_DIR/browser/browser.vcproj',
-                          '$MODP_B64_DIR/modp_b64.vcproj',
-                          '$ZLIB_DIR/zlib.vcproj',
-                          '$CHROME_DIR/common/common.vcproj',
-                          '$BASE_DIR/build/base_gfx.vcproj',
-                          '$TESTING_DIR/gtest.vcproj',
-                          '$LIBPNG_DIR/libpng.vcproj',
-                          '$SKIA_DIR/skia.vcproj',
-                          '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                          '$CHROME_DIR/browser/views/browser_views.vcproj',
-                      ],
-                      guid='{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}')
+p = env.ChromeMSVSProject('memory_test.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'test/memory_test/memory_test.vcproj'),
+                          guid='{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}',
+                          dependencies = [
+                              '$CHROME_DIR/test/automation/automation.vcproj',
+                              '$BASE_DIR/build/base.vcproj',
+                              '$NET_DIR/build/net.vcproj',
+                              '$CHROME_DIR/browser/browser.vcproj',
+                              '$MODP_B64_DIR/modp_b64.vcproj',
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              '$TESTING_DIR/gtest.vcproj',
+                              '$LIBPNG_DIR/libpng.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                              '$CHROME_DIR/browser/views/browser_views.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              MSVSTool('VCLinkerTool',
+                                       AdditionalDependencies='winmm.lib'),
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../../tools/build/win/precompiled_wtl.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '../../tools/build/win/test_memory_usage.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '../../tools/build/win/test_memory_usage.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

chrome/test/mini_installer_test/mini_installer_test.scons

@@ -57,23 +57,99 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
-    '$CHROME_DIR/installer/setup/setup_constants$OBJSUFFIX',
-    '$CHROME_DIR/installer/util/run_all_unittests$OBJSUFFIX',
+input_files = ChromeFileList([
     'chrome_mini_installer.cc',
+    'chrome_mini_installer.h',
     'mini_installer_test_constants.cc',
+    'mini_installer_test_constants.h',
+    '$CHROME_DIR/installer/util/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/installer/setup/setup_constants$OBJSUFFIX',
     'test.cc',
-]
+])
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeTestProgram('mini_installer_test', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/mini_installer_test/mini_installer_test.vcproj',
-                      dependencies = [
-                          '$BASE_DIR/build/base.vcproj',
-                          '$ICU38_DIR/build/icu.vcproj',
-                          '$TESTING_DIR/gtest.vcproj',
-                          '$CHROME_DIR/installer/util/util.vcproj',
-                      ],
-                      guid='{4B6E199A-034A-49BD-AB93-458DD37E45B1}')
+p = env.ChromeMSVSProject('mini_installer_test.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/test/'
+                                + 'mini_installer_test/'
+                                + 'mini_installer_test.vcproj'),
+                          guid='{4B6E199A-034A-49BD-AB93-458DD37E45B1}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$BASE_DIR/build/base.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$TESTING_DIR/gtest.vcproj',
+                              '$CHROME_DIR/installer/util/util.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)/tools/build/win/unit_test.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ],
+            tools=[
+                'VCPreBuildEventTool',
+                'VCCustomBuildTool',
+                'VCXMLDataGeneratorTool',
+                'VCWebServiceProxyGeneratorTool',
+                'VCMIDLTool',
+                'VCCLCompilerTool',
+                'VCManagedResourceCompilerTool',
+                'VCResourceCompilerTool',
+                'VCPreLinkEventTool',
+                MSVSTool('VCLinkerTool',
+                         IgnoreDefaultLibraryNames=''),
+                'VCALinkTool',
+                MSVSTool('VCManifestTool',
+                         AdditionalManifestFiles=('$(SolutionDir)installer/'
+                                                  + 'mini_installer/'
+                                              + 'mini_installer.exe.manifest')),
+                'VCXDCMakeTool',
+                'VCBscMakeTool',
+                'VCFxCopTool',
+                'VCAppVerifierTool',
+                'VCWebDeploymentTool',
+                'VCPostBuildEventTool',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)/tools/build/win/unit_test.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ],
+            tools=[
+                'VCPreBuildEventTool',
+                'VCCustomBuildTool',
+                'VCXMLDataGeneratorTool',
+                'VCWebServiceProxyGeneratorTool',
+                'VCMIDLTool',
+                'VCCLCompilerTool',
+                'VCManagedResourceCompilerTool',
+                'VCResourceCompilerTool',
+                'VCPreLinkEventTool',
+                'VCLinkerTool',
+                'VCALinkTool',
+                MSVSTool('VCManifestTool',
+                         AdditionalManifestFiles=('$(SolutionDir)installer/'
+                                                  + 'mini_installer/'
+                                              + 'mini_installer.exe.manifest')),
+                'VCXDCMakeTool',
+                'VCBscMakeTool',
+                'VCFxCopTool',
+                'VCAppVerifierTool',
+                'VCWebDeploymentTool',
+                'VCPostBuildEventTool',
+            ])

chrome/test/page_cycler/page_cycler_tests.scons

@@ -60,34 +60,115 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
-    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Common', [
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
     '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/testing_browser_process.h',
     '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test.h',
     '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+  ]),
+  MSVSFilter('MemoryUsage', [
+    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
+    '$CHROME_DIR/test/perf/mem_usage.h',
+  ]),
+  MSVSFilter('TestPageCycler', [
     'page_cycler_test.cc',
-]
+  ]),
+])
+
+if not env.Bit('windows'):
+  # Windows-specific.
+  input_files.Remove(
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+  )
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeTestProgram('page_cycler_tests', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/page_cycler/page_cycler_tests.vcproj',
-                      dependencies = [
-                          '$CHROME_DIR/test/automation/automation.vcproj',
-                          '$BASE_DIR/build/base.vcproj',
-                          '$NET_DIR/build/net.vcproj',
-                          '$CHROME_DIR/browser/browser.vcproj',
-                          '$MODP_B64_DIR/modp_b64.vcproj',
-                          '$CHROME_DIR/app/chrome_exe.vcproj',
-                          '$ZLIB_DIR/zlib.vcproj',
-                          '$CHROME_DIR/common/common.vcproj',
-                          '$ICU38_DIR/build/icu.vcproj',
-                          '$BASE_DIR/build/base_gfx.vcproj',
-                          '$TESTING_DIR/gtest.vcproj',
-                          '$LIBPNG_DIR/libpng.vcproj',
-                          '$SKIA_DIR/skia.vcproj',
-                          '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                          '$CHROME_DIR/browser/views/browser_views.vcproj',
-                      ],
-                      guid='{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}')
+p = env.ChromeMSVSProject('page_cycler_tests.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'test/page_cycler/page_cycler_tests.vcproj'),
+                          guid='{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}',
+                          dependencies = [
+                              '$CHROME_DIR/test/automation/automation.vcproj',
+                              '$BASE_DIR/build/base.vcproj',
+                              '$NET_DIR/build/net.vcproj',
+                              '$CHROME_DIR/browser/browser.vcproj',
+                              '$MODP_B64_DIR/modp_b64.vcproj',
+                              '$CHROME_DIR/app/chrome_exe.vcproj',
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              '$TESTING_DIR/gtest.vcproj',
+                              '$LIBPNG_DIR/libpng.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                              '$CHROME_DIR/browser/views/browser_views.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              MSVSTool('VCLinkerTool',
+                                       AdditionalDependencies='winmm.lib'),
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../../tools/build/win/precompiled_wtl.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '../../tools/build/win/test_memory_usage.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '../../tools/build/win/test_memory_usage.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

chrome/test/perf/perftests.scons

@@ -35,16 +35,6 @@ if env.Bit('posix'):
       '$LIBEVENT_DIR/using_libevent.scons',
   ], {'env':env})
 
-input_files = [
-    'perftests.cc',
-    'url_parse_perftest.cc',
-    '$BASE_DIR/perftimer$OBJSUFFIX',
-    '$CHROME_DIR/browser/safe_browsing/database_perftest.cc',
-    '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX',
-    '$CHROME_DIR/browser/visitedlink_perftest.cc',
-    '$CHROME_DIR/common/json_value_serializer_perftest.cc',
-]
-
 if env.Bit('windows'):
   env.Prepend(
       LIBS = [
@@ -54,64 +44,148 @@ if env.Bit('windows'):
       ]
   )
 
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('TestVisitedLink', [
+    '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX',
+    '$CHROME_DIR/browser/visitedlink_perftest.cc',
+  ]),
+  MSVSFilter('Common', [
+    'perftests.cc',
+    '$BASE_DIR/perftimer$OBJSUFFIX',
+  ]),
+  MSVSFilter('TestURLParser', [
+    'url_parse_perftest.cc',
+  ]),
+  MSVSFilter('TestJSONSerializer', [
+    '$CHROME_DIR/common/json_value_serializer_perftest.cc',
+  ]),
+  MSVSFilter('TestSafeBrowsing', [
+    '$CHROME_DIR/browser/safe_browsing/database_perftest.cc',
+  ]),
+])
+
 if env.Bit('linux'):
   # TODO(port): Port these files.
-  remove_files = [
+  input_files.Remove(
       'url_parse_perftest.cc',
       '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX',
       '$CHROME_DIR/browser/visitedlink_perftest.cc',
-  ]
-  for file in remove_files:
-    input_files.remove(file)
+  )
 
 if env.Bit('mac'):
   # TODO(port): Port these files.
-  remove_files = [
+  input_files.Remove(
       'url_parse_perftest.cc',
       '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX',
       '$CHROME_DIR/browser/visitedlink_perftest.cc',
-  ]
-  for file in remove_files:
-    input_files.remove(file)
+  )
 
 if not env.Bit('mac'):
   env.ChromeTestProgram('perf_tests', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/perf/perftests.vcproj',
-                name='perf_tests',
-                dependencies = [
-                    '$BASE_DIR/build/base.vcproj',
-                    '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
-                    '$CHROME_DIR/plugin/plugin.vcproj',
-                    '$LIBJPEG_DIR/libjpeg.vcproj',
-                    '$BZIP2_DIR/bzip2.vcproj',
-                    '$NET_DIR/build/net.vcproj',
-                    '$WEBKIT_DIR/build/JavaScriptCore/JavaScriptCore_pcre.vcproj',
-                    '$WEBKIT_DIR/build/port/port.vcproj',
-                    '$CHROME_DIR/browser/debugger/debugger.vcproj',
-                    '$WEBKIT_DIR/default_plugin/default_plugin.vcproj',
-                    '$CHROME_DIR/browser/browser.vcproj',
-                    '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
-                    '$SQLITE_DIR/sqlite.vcproj',
-                    '$CHROME_DIR/views/views.vcproj',
-                    '$MODP_B64_DIR/modp_b64.vcproj',
-                    '$ZLIB_DIR/zlib.vcproj',
-                    '$CHROME_DIR/common/common.vcproj',
-                    '$ICU38_DIR/build/icu.vcproj',
-                    '$CHROME_DIR/renderer/renderer.vcproj',
-                    '$BASE_DIR/build/base_gfx.vcproj',
-                    '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
-                    '$TESTING_DIR/gtest.vcproj',
-                    '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj',
-                    '$LIBPNG_DIR/libpng.vcproj',
-                    '$WEBKIT_DIR/build/glue/glue.vcproj',
-                    '$SKIA_DIR/skia.vcproj',
-                    '$CHROME_DIR/third_party/hunspell/hunspell.vcproj',
-                    '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                    '$CHROME_DIR/installer/util/util.vcproj',
-                    '$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
-                    '$SDCH_DIR/sdch.vcproj',
-                    '$CHROME_DIR/browser/views/browser_views.vcproj',
-                    '$LIBXSLT_DIR/build/libxslt.vcproj',
-                ],
-                guid='{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}')
+p = env.ChromeMSVSProject('perftests.vcproj',
+                          name='perf_tests',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'test/perf/perftests.vcproj'),
+                          guid='{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$BASE_DIR/build/base.vcproj',
+                              '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
+                              '$CHROME_DIR/plugin/plugin.vcproj',
+                              '$LIBJPEG_DIR/libjpeg.vcproj',
+                              '$BZIP2_DIR/bzip2.vcproj',
+                              '$NET_DIR/build/net.vcproj',
+                              ('$WEBKIT_DIR/build/'
+                               + 'JavaScriptCore/JavaScriptCore_pcre.vcproj'),
+                              '$WEBKIT_DIR/build/port/port.vcproj',
+                              '$CHROME_DIR/browser/debugger/debugger.vcproj',
+                              ('$WEBKIT_DIR/default_plugin/'
+                               + 'default_plugin.vcproj'),
+                              '$CHROME_DIR/browser/browser.vcproj',
+                              '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
+                              '$SQLITE_DIR/sqlite.vcproj',
+                              '$CHROME_DIR/views/views.vcproj',
+                              '$MODP_B64_DIR/modp_b64.vcproj',
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$CHROME_DIR/renderer/renderer.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
+                              '$TESTING_DIR/gtest.vcproj',
+                              '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj',
+                              '$LIBPNG_DIR/libpng.vcproj',
+                              '$WEBKIT_DIR/build/glue/glue.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                              ('$CHROME_DIR/third_party/'
+                               + 'hunspell/hunspell.vcproj'),
+                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                              '$CHROME_DIR/installer/util/util.vcproj',
+                              '$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
+                              '$SDCH_DIR/sdch.vcproj',
+                              '$CHROME_DIR/browser/views/browser_views.vcproj',
+                              '$LIBXSLT_DIR/build/libxslt.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              MSVSTool('VCCLCompilerTool',
+                                       PreprocessorDefinitions=[
+                                           'PERF_TEST',
+                                           '_CRT_RAND_S',
+                                       ]),
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              MSVSTool('VCLinkerTool',
+                                       AdditionalDependencies=[
+                                           'shlwapi.lib',
+                                           'rpcrt4.lib',
+                                           'winmm.lib',
+                                       ],
+                                       SubSystem='1'),
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+                ('$(SolutionDir)../'
+                 + 'third_party/libxml/build/using_libxml.vsprops'),
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+                ('$(SolutionDir)../'
+                 + 'third_party/libxml/build/using_libxml.vsprops'),
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+            ])

chrome/test/plugin/plugin_tests.scons

@@ -63,38 +63,114 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
-    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+input_files = ChromeFileList([
     'plugin_test.cpp',
-]
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/testing_browser_process.h',
+    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test.h',
+    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+])
 
+if not env.Bit('windows'):
+  # Windows-specific.
+  input_files.Remove(
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+  )
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeTestProgram('plugin_tests', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/plugin/plugin_tests.vcproj',
-                      dependencies = [
-                          '$CHROME_DIR/test/automation/automation.vcproj',
-                          '$BASE_DIR/build/base.vcproj',
-                          '$NET_DIR/build/net.vcproj',
-                          ('$CHROME_DIR/test/activex_test_control/' +
-                               'activex_test_control.vcproj'),
-                          '$CHROME_DIR/browser/browser.vcproj',
-                          '$MODP_B64_DIR/modp_b64.vcproj',
-                          '$CHROME_DIR/app/chrome_exe.vcproj',
-                          '$ZLIB_DIR/zlib.vcproj',
-                          '$CHROME_DIR/common/common.vcproj',
-                          '$ICU38_DIR/build/icu.vcproj',
-                          '$BASE_DIR/build/base_gfx.vcproj',
-                          '$TESTING_DIR/gtest.vcproj',
-                          '$LIBPNG_DIR/libpng.vcproj',
-                          '$SKIA_DIR/skia.vcproj',
-                          ('$CHROME_DIR/test/security_tests/' +
-                               'security_tests.vcproj'),
-                          '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                          '$CHROME_DIR/browser/views/browser_views.vcproj',
-                      ],
-                      guid='{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}')
+p = env.ChromeMSVSProject('plugin_tests.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'test/plugin/plugin_tests.vcproj'),
+                          guid='{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}',
+                          dependencies = [
+                              '$CHROME_DIR/test/automation/automation.vcproj',
+                              '$BASE_DIR/build/base.vcproj',
+                              '$NET_DIR/build/net.vcproj',
+                              ('$CHROME_DIR/test/activex_test_control/' +
+                                   'activex_test_control.vcproj'),
+                              '$CHROME_DIR/browser/browser.vcproj',
+                              '$MODP_B64_DIR/modp_b64.vcproj',
+                              '$CHROME_DIR/app/chrome_exe.vcproj',
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              '$TESTING_DIR/gtest.vcproj',
+                              '$LIBPNG_DIR/libpng.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                              ('$CHROME_DIR/test/security_tests/' +
+                                   'security_tests.vcproj'),
+                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                              '$CHROME_DIR/browser/views/browser_views.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              MSVSTool('VCLinkerTool',
+                                       AdditionalDependencies='winmm.lib'),
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../../tools/build/win/precompiled_wtl.vsprops',
+                ('$(SolutionDir)../'
+                 + 'third_party/libxml/build/using_libxml.vsprops'),
+                ('$(SolutionDir)../'
+                 + 'third_party/libxslt/build/using_libxslt.vsprops'),
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                ('$(SolutionDir)../'
+                 + 'third_party/libxml/build/using_libxml.vsprops'),
+                ('$(SolutionDir)../'
+                 + 'third_party/libxslt/build/using_libxslt.vsprops'),
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

chrome/test/reliability/reliability_tests.scons

@@ -62,34 +62,119 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
-    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
-    'page_load_test.cc',
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Common', [
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+    'reliability_test_suite.h',
     'run_all_unittests.cc',
-]
+    '$CHROME_DIR/test/testing_browser_process.h',
+    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test.h',
+    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+  ]),
+  MSVSFilter('MemoryUsage', [
+    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
+    '$CHROME_DIR/test/perf/mem_usage.h',
+  ]),
+  MSVSFilter('TestPageLoader', [
+    'page_load_test.cc',
+    'page_load_test.h',
+  ]),
+])
+
+if not env.Bit('windows'):
+  # Windows-specific.
+  input_files.Remove(
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+  )
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeTestProgram('reliability_tests', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/reliability/reliability_tests.vcproj',
-                      dependencies = [
-                          '$CHROME_DIR/test/automation/automation.vcproj',
-                          '$BASE_DIR/build/base.vcproj',
-                          '$NET_DIR/build/net.vcproj',
-                          '$CHROME_DIR/browser/browser.vcproj',
-                          '$MODP_B64_DIR/modp_b64.vcproj',
-                          '$CHROME_DIR/app/chrome_exe.vcproj',
-                          '$ZLIB_DIR/zlib.vcproj',
-                          '$CHROME_DIR/common/common.vcproj',
-                          '$ICU38_DIR/build/icu.vcproj',
-                          '$BASE_DIR/build/base_gfx.vcproj',
-                          '$TESTING_DIR/gtest.vcproj',
-                          '$LIBPNG_DIR/libpng.vcproj',
-                          '$SKIA_DIR/skia.vcproj',
-                          '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                          '$CHROME_DIR/browser/views/browser_views.vcproj',
-                      ],
-                      guid='{8A3E1774-1DE9-445C-982D-3EE37C8A752A}')
+p = env.ChromeMSVSProject('reliability_tests.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'test/reliability/reliability_tests.vcproj'),
+                          guid='{8A3E1774-1DE9-445C-982D-3EE37C8A752A}',
+                          dependencies = [
+                              '$CHROME_DIR/test/automation/automation.vcproj',
+                              '$BASE_DIR/build/base.vcproj',
+                              '$NET_DIR/build/net.vcproj',
+                              '$CHROME_DIR/browser/browser.vcproj',
+                              '$MODP_B64_DIR/modp_b64.vcproj',
+                              '$CHROME_DIR/app/chrome_exe.vcproj',
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              '$TESTING_DIR/gtest.vcproj',
+                              '$LIBPNG_DIR/libpng.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                              '$CHROME_DIR/browser/views/browser_views.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              MSVSTool('VCLinkerTool',
+                                       AdditionalDependencies='winmm.lib'),
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../../tools/build/win/precompiled_wtl.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '../../tools/build/win/test_memory_usage.vsprops',
+                '../../tools/build/win/reliability_test.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '../../tools/build/win/test_memory_usage.vsprops',
+                '../../tools/build/win/reliability_test.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

chrome/test/security_tests/security_tests.scons

@@ -35,15 +35,60 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
+input_files = ChromeFileList([
+    '$SANDBOX_DIR/tests/validation_tests/commands$OBJSUFFIX',
+    '$SANDBOX_DIR/tests/validation_tests/commands.h',
+    '$CHROME_DIR/test/injection_test_dll.h',
     'ipc_security_tests.cc',
+    'ipc_security_tests.h',
     'security_tests.cc',
-    '$SANDBOX_DIR/tests/validation_tests/commands${OBJSUFFIX}',
-]
+])
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeSharedLibrary('security_tests', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/security_tests/security_tests.vcproj',
-                      guid='{E750512D-FC7C-4C98-BF04-0A0DAF882055}')
+p = env.ChromeMSVSProject('security_tests.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'test/security_tests/security_tests.vcproj'),
+                          guid='{E750512D-FC7C-4C98-BF04-0A0DAF882055}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLinkerTool',
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='2')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+            ])

chrome/test/selenium/selenium_tests.scons

@@ -65,33 +65,108 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Common', [
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
     '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/testing_browser_process.h',
     '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test.h',
     '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+  ]),
+  MSVSFilter('TestSelenium', [
     'selenium_test.cc',
-]
+  ]),
+])
+
+if not env.Bit('windows'):
+  # Windows-specific.
+  input_files.Remove(
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+  )
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeTestProgram('selenium_tests', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/selenium/selenium_tests.vcproj',
-                      dependencies = [
-                          '$CHROME_DIR/test/automation/automation.vcproj',
-                          '$BASE_DIR/build/base.vcproj',
-                          '$NET_DIR/build/net.vcproj',
-                          '$CHROME_DIR/browser/browser.vcproj',
-                          '$MODP_B64_DIR/modp_b64.vcproj',
-                          '$CHROME_DIR/app/chrome_exe.vcproj',
-                          '$ZLIB_DIR/zlib.vcproj',
-                          '$CHROME_DIR/common/common.vcproj',
-                          '$ICU38_DIR/build/icu.vcproj',
-                          '$BASE_DIR/build/base_gfx.vcproj',
-                          '$TESTING_DIR/gtest.vcproj',
-                          '$LIBPNG_DIR/libpng.vcproj',
-                          '$SKIA_DIR/skia.vcproj',
-                          '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                          '$CHROME_DIR/browser/views/browser_views.vcproj',
-                      ],
-                      guid='{E3749617-BA3D-4230-B54C-B758E56D9FA5}')
+p = env.ChromeMSVSProject('selenium_tests.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'test/selenium/selenium_tests.vcproj'),
+                          guid='{E3749617-BA3D-4230-B54C-B758E56D9FA5}',
+                          dependencies = [
+                              '$CHROME_DIR/test/automation/automation.vcproj',
+                              '$BASE_DIR/build/base.vcproj',
+                              '$NET_DIR/build/net.vcproj',
+                              '$CHROME_DIR/browser/browser.vcproj',
+                              '$MODP_B64_DIR/modp_b64.vcproj',
+                              '$CHROME_DIR/app/chrome_exe.vcproj',
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              '$TESTING_DIR/gtest.vcproj',
+                              '$LIBPNG_DIR/libpng.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                              '$CHROME_DIR/browser/views/browser_views.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              MSVSTool('VCLinkerTool',
+                                       AdditionalDependencies='winmm.lib'),
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../../tools/build/win/precompiled_wtl.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

chrome/test/startup/startup_tests.scons

@@ -59,34 +59,103 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Common', [
+    '$CHROME_DIR/tools/build/win/precompiled.cc',
+    '$CHROME_DIR/tools/build/win/precompiled.h',
     '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/testing_browser_process.h',
     '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test.h',
     '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+  ]),
+  MSVSFilter('TestStartup', [
     'feature_startup_test.cc',
     'startup_test.cc',
-]
+  ]),
+])
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeTestProgram('startup_tests', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/startup/startup_tests.vcproj',
-                      dependencies = [
-                          '$CHROME_DIR/test/automation/automation.vcproj',
-                          '$BASE_DIR/build/base.vcproj',
-                          '$NET_DIR/build/net.vcproj',
-                          '$CHROME_DIR/browser/browser.vcproj',
-                          '$MODP_B64_DIR/modp_b64.vcproj',
-                          '$CHROME_DIR/app/chrome_exe.vcproj',
-                          '$ZLIB_DIR/zlib.vcproj',
-                          '$CHROME_DIR/common/common.vcproj',
-                          '$ICU38_DIR/build/icu.vcproj',
-                          '$BASE_DIR/build/base_gfx.vcproj',
-                          '$TESTING_DIR/gtest.vcproj',
-                          '$LIBPNG_DIR/libpng.vcproj',
-                          '$SKIA_DIR/skia.vcproj',
-                          '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                          '$CHROME_DIR/browser/views/browser_views.vcproj',
-                      ],
-                      guid='{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}')
+p = env.ChromeMSVSProject('startup_tests.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'test/startup/startup_tests.vcproj'),
+                          guid='{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}',
+                          dependencies = [
+                              '$CHROME_DIR/test/automation/automation.vcproj',
+                              '$BASE_DIR/build/base.vcproj',
+                              '$NET_DIR/build/net.vcproj',
+                              '$CHROME_DIR/browser/browser.vcproj',
+                              '$MODP_B64_DIR/modp_b64.vcproj',
+                              '$CHROME_DIR/app/chrome_exe.vcproj',
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              '$TESTING_DIR/gtest.vcproj',
+                              '$LIBPNG_DIR/libpng.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                              '$CHROME_DIR/browser/views/browser_views.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              MSVSTool('VCLinkerTool',
+                                       AdditionalDependencies='winmm.lib'),
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../../tools/build/win/precompiled.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddFileConfig('../../tools/build/win/precompiled.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

chrome/test/tab_switching/tab_switching_test.scons

@@ -60,37 +60,113 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Common', [
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
     '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/testing_browser_process.h',
     '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test.h',
     '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+  ]),
+  MSVSFilter('TabSwitchingTest', [
     'tab_switching_test.cc',
-]
+  ]),
+])
 
-#"..\..\Debug\obj\tab_switching_test\precompiled_wtl.obj"
+if not env.Bit('windows'):
+  # Windows-specific.
+  input_files.Remove(
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+  )
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeTestProgram('tab_switching_test', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/tab_switching/tab_switching.vcproj',
-                      name='tab_switching_test',
-                      dependencies = [
-                          '$CHROME_DIR/test/automation/automation.vcproj',
-                          '$BASE_DIR/build/base.vcproj',
-                          '$NET_DIR/build/net.vcproj',
-                          '$CHROME_DIR/browser/browser.vcproj',
-                          '$MODP_B64_DIR/modp_b64.vcproj',
-                          '$CHROME_DIR/test/ui/ui_tests.vcproj',
-                          '$CHROME_DIR/app/chrome_exe.vcproj',
-                          '$ZLIB_DIR/zlib.vcproj',
-                          '$CHROME_DIR/common/common.vcproj',
-                          '$ICU38_DIR/build/icu.vcproj',
-                          '$BASE_DIR/build/base_gfx.vcproj',
-                          '$TESTING_DIR/gtest.vcproj',
-                          '$LIBPNG_DIR/libpng.vcproj',
-                          '$SKIA_DIR/skia.vcproj',
-                          '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                          '$CHROME_DIR/browser/views/browser_views.vcproj',
-                      ],
-                      guid='{A34770EA-A574-43E8-9327-F79C04770E98}')
+p = env.ChromeMSVSProject('tab_switching.vcproj',
+                          name='tab_switching_test',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'test/tab_switching/tab_switching.vcproj'),
+                          guid='{A34770EA-A574-43E8-9327-F79C04770E98}',
+                          dependencies = [
+                              '$CHROME_DIR/test/automation/automation.vcproj',
+                              '$BASE_DIR/build/base.vcproj',
+                              '$NET_DIR/build/net.vcproj',
+                              '$CHROME_DIR/browser/browser.vcproj',
+                              '$MODP_B64_DIR/modp_b64.vcproj',
+                              '$CHROME_DIR/test/ui/ui_tests.vcproj',
+                              '$CHROME_DIR/app/chrome_exe.vcproj',
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              '$TESTING_DIR/gtest.vcproj',
+                              '$LIBPNG_DIR/libpng.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                              '$CHROME_DIR/browser/views/browser_views.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              MSVSTool('VCLinkerTool',
+                                       AdditionalDependencies='winmm.lib'),
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../../tools/build/win/precompiled_wtl.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '../../tools/build/win/test_memory_usage.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '../../tools/build/win/test_memory_usage.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

chrome/test/ui/ui_tests.scons

@@ -84,97 +84,308 @@ if env.Bit('windows'):
       ],
   )
 
-ui_test_files = [
-    'run_all_unittests.cc',
-    'ui_test.cc',
-    'ui_test_suite.cc',
-]
-
-if env.Bit('windows'):
-  # TODO(port): mark which of these work and which don't.
-  ui_test_files.extend([
-    'history_uitest.cc',
-    'inspector_controller_uitest.cc',
-    'layout_plugin_uitest.cpp',
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Common', [
     'npapi_test_helper.cc',
-    'npapi_uitest.cpp',
-    'omnibox_uitest.cc',
-
-    'sandbox_uitests.cc',
-
-    '$CHROME_DIR/app/chrome_main_uitest.cc',
-    '$CHROME_DIR/browser/browser_uitest.cc',
-    '$CHROME_DIR/browser/crash_recovery_uitest.cc',
-    '$CHROME_DIR/browser/download/download_uitest.cc',
-    '$CHROME_DIR/browser/download/save_page_uitest.cc',
-    '$CHROME_DIR/browser/errorpage_uitest.cc',
-    '$CHROME_DIR/browser/history/redirect_uitest.cc',
-    '$CHROME_DIR/browser/iframe_uitest.cc',
-    '$CHROME_DIR/browser/images_uitest.cc',
-    '$CHROME_DIR/browser/interstitial_page_uitest.cc',
-    '$CHROME_DIR/browser/locale_tests_uitest.cc',
-    '$CHROME_DIR/browser/login_prompt_uitest.cc',
-    '$CHROME_DIR/browser/metrics_service_uitest.cc',
-    '$CHROME_DIR/browser/printing/printing_layout_uitest.cc',
-    '$CHROME_DIR/browser/resource_dispatcher_host_uitest.cc',
-    '$CHROME_DIR/browser/sanity_uitest.cc',
-    '$CHROME_DIR/browser/session_history_uitest.cc',
-    '$CHROME_DIR/browser/sessions/session_restore_uitest.cc',
-    '$CHROME_DIR/browser/ssl_uitest.cc',
-    '$CHROME_DIR/browser/tab_restore_uitest.cc',
-    '$CHROME_DIR/browser/view_source_uitest.cc',
-    '$CHROME_DIR/common/logging_chrome_uitest.cc',
-    '$CHROME_DIR/common/net/cache_uitest.cc',
-    '$CHROME_DIR/common/pref_service_uitest.cc',
-    '$CHROME_DIR/test/accessibility/accessibility_tests.cc',
-    '$CHROME_DIR/test/accessibility/accessibility_util.cc',
-    '$CHROME_DIR/test/accessibility/browser_impl.cc',
-    '$CHROME_DIR/test/accessibility/keyboard_util.cc',
-    '$CHROME_DIR/test/accessibility/registry_util.cc',
-    '$CHROME_DIR/test/accessibility/tab_impl.cc',
-    '$CHROME_DIR/test/automation/automation_proxy_uitest.cc',
-    '$CHROME_DIR/test/perf/mem_usage.cc',
-    '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX',
+    'npapi_test_helper.h',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+    'run_all_unittests.cc',
+    '$CHROME_DIR/test/testing_browser_process.h',
+    'ui_test.cc',
+    'ui_test.h',
+    'ui_test_suite.cc',
+    'ui_test_suite.h',
     '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
-    ])
+    '$NET_DIR/url_request/url_request_test_job.h',
+  ]),
+  MSVSFilter('TestChromeMain', [
+    '$CHROME_DIR/app/chrome_main_uitest.cc',
+  ]),
+  MSVSFilter('TestErrorPage', [
+    '$CHROME_DIR/browser/errorpage_uitest.cc',
+  ]),
+  MSVSFilter('TestBrowser', [
+    '$CHROME_DIR/browser/browser_uitest.cc',
+    MSVSFilter('TestImages', [
+      '$CHROME_DIR/browser/images_uitest.cc',
+    ]),
+  ]),
+  MSVSFilter('TestChromeLogging', [
+    '$CHROME_DIR/common/logging_chrome_uitest.cc',
+  ]),
+  MSVSFilter('TestDownload', [
+    '$CHROME_DIR/browser/download/download_uitest.cc',
+  ]),
+  MSVSFilter('TestIFrame', [
+    '$CHROME_DIR/browser/iframe_uitest.cc',
+  ]),
+  MSVSFilter('TestCache', [
+    '$CHROME_DIR/common/net/cache_uitest.cc',
+  ]),
+  MSVSFilter('TestSanity', [
+    '$CHROME_DIR/browser/sanity_uitest.cc',
+  ]),
+  MSVSFilter('TestAutomationProxy', [
+    '$CHROME_DIR/test/automation/automation_proxy_uitest.cc',
+  ]),
+  MSVSFilter('TestNPAPI', [
+    'layout_plugin_uitest.cpp',
+    'npapi_uitest.cpp',
+  ]),
+  MSVSFilter('TestSessionHistory', [
+    '$CHROME_DIR/browser/session_history_uitest.cc',
+  ]),
+  MSVSFilter('TestSessionRestore', [
+    '$CHROME_DIR/browser/sessions/session_restore_uitest.cc',
+  ]),
+  MSVSFilter('TestTabRestore', [
+    '$CHROME_DIR/browser/tab_restore_uitest.cc',
+  ]),
+  MSVSFilter('TestUnload', [
+    '$CHROME_DIR/browser/unload_uitest.cc',
+  ]),
+  MSVSFilter('TestAuthentication', [
+    '$CHROME_DIR/browser/login_prompt_uitest.cc',
+  ]),
+  MSVSFilter('TestPreferences', [
+    '$CHROME_DIR/common/pref_service_uitest.cc',
+  ]),
+  MSVSFilter('TestViewSource', [
+    '$CHROME_DIR/browser/tab_contents/view_source_uitest.cc',
+  ]),
+  MSVSFilter('TestRedirects', [
+    '$CHROME_DIR/browser/history/redirect_uitest.cc',
+  ]),
+  MSVSFilter('TestResourceDispatcherHost', [
+    '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_uitest.cc',
+  ]),
+  MSVSFilter('TestFindInPage', [
+    '$CHROME_DIR/browser/views/find_bar_win_uitest.cc',
+  ]),
+  MSVSFilter('TestPageLoader', [
+    '$CHROME_DIR/test/perf/mem_usage.cc',
+    '$CHROME_DIR/test/perf/mem_usage.h',
+    '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX',
+    '$CHROME_DIR/test/reliability/page_load_test.h',
+  ]),
+  MSVSFilter('TestSandbox', [
+    'sandbox_uitests.cc',
+  ]),
+  MSVSFilter('TestInspector', [
+    'inspector_controller_uitest.cc',
+  ]),
+  MSVSFilter('TestLocalizedBuilds', [
+    '$CHROME_DIR/browser/locale_tests_uitest.cc',
+  ]),
+  MSVSFilter('TestMetricsService', [
+    '$CHROME_DIR/browser/metrics/metrics_service_uitest.cc',
+  ]),
+  MSVSFilter('TestInterstitialPage', [
+    '$CHROME_DIR/browser/interstitial_page_uitest.cc',
+  ]),
+  MSVSFilter('TestSSL', [
+    '$CHROME_DIR/browser/ssl/ssl_uitest.cc',
+  ]),
+  MSVSFilter('TestAccessibility', [
+    '$CHROME_DIR/test/accessibility/accessibility_tests.cc',
+    MSVSFilter('Accessibility Client', [
+      '$CHROME_DIR/test/accessibility/accessibility_util.cc',
+      '$CHROME_DIR/test/accessibility/accessibility_util.h',
+      '$CHROME_DIR/test/accessibility/browser_impl.cc',
+      '$CHROME_DIR/test/accessibility/browser_impl.h',
+      '$CHROME_DIR/test/accessibility/constants.h',
+      '$CHROME_DIR/test/accessibility/keyboard_util.cc',
+      '$CHROME_DIR/test/accessibility/keyboard_util.h',
+      '$CHROME_DIR/test/accessibility/registry_util.cc',
+      '$CHROME_DIR/test/accessibility/registry_util.h',
+      '$CHROME_DIR/test/accessibility/tab_impl.cc',
+      '$CHROME_DIR/test/accessibility/tab_impl.h',
+    ]),
+  ]),
+  MSVSFilter('TestCrashRecovery', [
+    '$CHROME_DIR/browser/crash_recovery_uitest.cc',
+  ]),
+  MSVSFilter('TestPrinting', [
+    '$CHROME_DIR/browser/printing/printing_layout_uitest.cc',
+    '$CHROME_DIR/browser/printing/printing_test.h',
+  ]),
+  MSVSFilter('TestSavePage', [
+    '$CHROME_DIR/browser/download/save_page_uitest.cc',
+  ]),
+  MSVSFilter('TestOmnibox', [
+    'omnibox_uitest.cc',
+  ]),
+  MSVSFilter('TestHistory', [
+    'history_uitest.cc',
+  ]),
+])
 
+if not env.Bit('windows'):
+  # TODO(port): mark which of these work and which don't.
+  input_files.Remove(
+      'history_uitest.cc',
+      'inspector_controller_uitest.cc',
+      'layout_plugin_uitest.cpp',
+      'npapi_test_helper.cc',
+      'npapi_uitest.cpp',
+      'omnibox_uitest.cc',
+
+      'sandbox_uitests.cc',
+
+      '$CHROME_DIR/app/chrome_main_uitest.cc',
+      '$CHROME_DIR/browser/browser_uitest.cc',
+      '$CHROME_DIR/browser/crash_recovery_uitest.cc',
+      '$CHROME_DIR/browser/download/download_uitest.cc',
+      '$CHROME_DIR/browser/download/save_page_uitest.cc',
+      '$CHROME_DIR/browser/errorpage_uitest.cc',
+      '$CHROME_DIR/browser/history/redirect_uitest.cc',
+      '$CHROME_DIR/browser/iframe_uitest.cc',
+      '$CHROME_DIR/browser/images_uitest.cc',
+      '$CHROME_DIR/browser/interstitial_page_uitest.cc',
+      '$CHROME_DIR/browser/locale_tests_uitest.cc',
+      '$CHROME_DIR/browser/login_prompt_uitest.cc',
+      '$CHROME_DIR/browser/metrics/metrics_service_uitest.cc',
+      '$CHROME_DIR/browser/printing/printing_layout_uitest.cc',
+      '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_uitest.cc',
+      '$CHROME_DIR/browser/sanity_uitest.cc',
+      '$CHROME_DIR/browser/session_history_uitest.cc',
+      '$CHROME_DIR/browser/sessions/session_restore_uitest.cc',
+      '$CHROME_DIR/browser/ssl/ssl_uitest.cc',
+      '$CHROME_DIR/browser/tab_contents/view_source_uitest.cc',
+      '$CHROME_DIR/browser/tab_restore_uitest.cc',
+      '$CHROME_DIR/browser/unload_uitest.cc',
+      '$CHROME_DIR/common/logging_chrome_uitest.cc',
+      '$CHROME_DIR/common/net/cache_uitest.cc',
+      '$CHROME_DIR/common/pref_service_uitest.cc',
+      '$CHROME_DIR/test/accessibility/accessibility_tests.cc',
+      '$CHROME_DIR/test/accessibility/accessibility_util.cc',
+      '$CHROME_DIR/test/accessibility/browser_impl.cc',
+      '$CHROME_DIR/test/accessibility/keyboard_util.cc',
+      '$CHROME_DIR/test/accessibility/registry_util.cc',
+      '$CHROME_DIR/test/accessibility/tab_impl.cc',
+      '$CHROME_DIR/test/automation/automation_proxy_uitest.cc',
+      '$CHROME_DIR/test/perf/mem_usage.cc',
+      '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX',
+      '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
+  )
+
+if not env.Bit('windows'):
   # Windows-specific tests.
-  ui_test_files.extend([
+  input_files.Remove(
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
       '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc',
       '$CHROME_DIR/browser/views/find_bar_win_uitest.cc',
-  ])
+  )
 
-env.ChromeTestProgram('ui_tests', ui_test_files)
+env.ChromeTestProgram('ui_tests', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/ui/ui_tests.vcproj',
-                      dependencies = [
-                          ('$WEBKIT_DIR/glue/plugins/test/' +
-                               'npapi_test_plugin.vcproj'),
-                          '$CHROME_DIR/test/automation/automation.vcproj',
-                          '$BASE_DIR/build/base.vcproj',
-                          '$BZIP2_DIR/bzip2.vcproj',
-                          '$NET_DIR/build/net.vcproj',
-                          '$CHROME_DIR/browser/browser.vcproj',
-                          '$MODP_B64_DIR/modp_b64.vcproj',
-                          '$CHROME_DIR/app/chrome_exe.vcproj',
-                          '$ZLIB_DIR/zlib.vcproj',
-                          '$CHROME_DIR/common/common.vcproj',
-                          '$ICU38_DIR/build/icu.vcproj',
-                          '$CHROME_DIR/app/locales/he.vcproj',
-                          '$CHROME_DIR/app/locales/da.vcproj',
-                          '$BASE_DIR/build/base_gfx.vcproj',
-                          ('$WEBKIT_DIR/tools/npapi_layout_test_plugin/' +
-                               'npapi_layout_test_plugin.vcproj'),
-                          '$TESTING_DIR/gtest.vcproj',
-                          '$LIBPNG_DIR/libpng.vcproj',
-                          '$CHROME_DIR/app/locales/en-US.vcproj',
-                          '$SKIA_DIR/skia.vcproj',
-                          ('$CHROME_DIR/test/security_tests/' +
-                               'security_tests.vcproj'),
-                          '$CHROME_DIR/app/locales/zh-TW.vcproj',
-                          '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                          '$SDCH_DIR/sdch.vcproj',
-                          '$LIBXML_DIR/build/libxml.vcproj',
-                          '$CHROME_DIR/browser/views/browser_views.vcproj',
-                      ],
-                      guid='{76235B67-1C27-4627-8A33-4B2E1EF93EDE}')
+p = env.ChromeMSVSProject('ui_tests.vcproj',
+                          dest='$CHROME_SRC_DIR/chrome/test/ui/ui_tests.vcproj',
+                          guid='{76235B67-1C27-4627-8A33-4B2E1EF93EDE}',
+                          dependencies = [
+                              ('$WEBKIT_DIR/glue/plugins/test/' +
+                                   'npapi_test_plugin.vcproj'),
+                              '$CHROME_DIR/test/automation/automation.vcproj',
+                              '$BASE_DIR/build/base.vcproj',
+                              '$BZIP2_DIR/bzip2.vcproj',
+                              '$NET_DIR/build/net.vcproj',
+                              '$CHROME_DIR/browser/browser.vcproj',
+                              '$MODP_B64_DIR/modp_b64.vcproj',
+                              '$CHROME_DIR/app/chrome_exe.vcproj',
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$CHROME_DIR/app/locales/he.vcproj',
+                              '$CHROME_DIR/app/locales/da.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              ('$WEBKIT_DIR/tools/npapi_layout_test_plugin/'
+                               + 'npapi_layout_test_plugin.vcproj'),
+                              '$TESTING_DIR/gtest.vcproj',
+                              '$LIBPNG_DIR/libpng.vcproj',
+                              '$CHROME_DIR/app/locales/en-US.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                              ('$CHROME_DIR/test/security_tests/'
+                               + 'security_tests.vcproj'),
+                              '$CHROME_DIR/app/locales/zh-TW.vcproj',
+                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                              '$SDCH_DIR/sdch.vcproj',
+                              '$LIBXML_DIR/build/libxml.vcproj',
+                              '$CHROME_DIR/browser/views/browser_views.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              MSVSTool('VCCLCompilerTool',
+                                       AdditionalIncludeDirectories=[
+                                         '"$(OutDir)/obj/generated_resources"',
+                                       ]),
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              MSVSTool('VCLinkerTool',
+                                       AdditionalDependencies='winmm.lib'),
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../../tools/build/win/precompiled_wtl.vsprops',
+                ('$(SolutionDir)../third_party/'
+                 + 'libxml/build/using_libxml.vsprops'),
+                ('$(SolutionDir)../third_party/'
+                 + 'libxslt/build/using_libxslt.vsprops'),
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '../../tools/build/win/test_memory_usage.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+                '$(SolutionDir)/tools/build/win/js_engine.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                ('$(SolutionDir)../third_party/'
+                 + 'libxml/build/using_libxml.vsprops'),
+                ('$(SolutionDir)../third_party/'
+                 + 'libxslt/build/using_libxslt.vsprops'),
+                '../../tools/build/win/unit_test.vsprops',
+                '../../tools/build/win/ui_test.vsprops',
+                '$(SolutionDir)../skia/using_skia.vsprops',
+                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+                '$(SolutionDir)/tools/build/win/js_engine.vsprops',
+                '$(SolutionDir)../testing/using_gtest.vsprops',
+            ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

chrome/test/unit/unit_tests.scons

@@ -108,20 +108,177 @@ if env.Bit('windows'):
       ],
   )
 
-unit_test_files = []
-
-unit_test_files.extend([
+input_files = ChromeFileList([
+  MSVSFilter('Common', [
+    '$CHROME_DIR/browser/browser_resources.h',
+    '$CHROME_DIR/browser/browser_resources.rc',
+    '$CHROME_DIR/test/browser_with_test_window_test.cc',
+    '$CHROME_DIR/test/browser_with_test_window_test.h',
+    'chrome_test_suite.h',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+    'run_all_unittests.cc',
+    '$CHROME_DIR/test/test_browser_window.h',
+    '$CHROME_DIR/test/test_notification_tracker.cc',
+    '$CHROME_DIR/test/test_notification_tracker.h',
+    '$CHROME_DIR/test/test_tab_contents.cc',
+    '$CHROME_DIR/test/test_tab_contents.h',
+    '$CHROME_DIR/test/testing_browser_process.h',
+    '$CHROME_DIR/test/testing_profile.cc',
+    '$CHROME_DIR/test/testing_profile.h',
+    '$CHROME_DIR/../net/url_request/url_request_test_job$OBJSUFFIX',
+    '$CHROME_DIR/../net/url_request/url_request_test_job.h',
+  ]),
+  MSVSFilter('hunspell', [
+    '$CHROME_DIR/tools/convert_dict/aff_reader$OBJSUFFIX',
+    '$CHROME_DIR/tools/convert_dict/aff_reader.h',
+    '$CHROME_DIR/third_party/hunspell/google/bdict.h',
+    '$CHROME_DIR/third_party/hunspell/google/bdict_reader$OBJSUFFIX',
+    '$CHROME_DIR/third_party/hunspell/google/bdict_reader.h',
+    '$CHROME_DIR/third_party/hunspell/google/bdict_writer$OBJSUFFIX',
+    '$CHROME_DIR/third_party/hunspell/google/bdict_writer.h',
+    '$CHROME_DIR/tools/convert_dict/dic_reader$OBJSUFFIX',
+    '$CHROME_DIR/tools/convert_dict/dic_reader.h',
+    '$CHROME_DIR/tools/convert_dict/hunspell_reader$OBJSUFFIX',
+    '$CHROME_DIR/tools/convert_dict/hunspell_reader.h',
+    '$CHROME_DIR/third_party/hunspell/google/hunspell_tests.cc',
+  ]),
+  '$CHROME_DIR/common/animation_unittest.cc',
+  '$CHROME_DIR/browser/autocomplete/autocomplete_unittest.cc',
+  '$CHROME_DIR/browser/back_forward_menu_model_unittest.cc',
+  '$CHROME_DIR/browser/safe_browsing/bloom_filter_unittest.cc',
+  '$CHROME_DIR/browser/bookmarks/bookmark_context_menu_test.cc',
+  '$CHROME_DIR/browser/bookmarks/bookmark_drag_data_unittest.cc',
+  '$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc',
+  '$CHROME_DIR/browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
+  '$CHROME_DIR/browser/bookmarks/bookmark_html_writer_unittest.cc',
+  '$CHROME_DIR/browser/bookmarks/bookmark_model_unittest.cc',
+  '$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc',
+  '$CHROME_DIR/browser/bookmarks/bookmark_utils_unittest.cc',
+  '$CHROME_DIR/browser/browser_commands_unittest.cc',
+  '$CHROME_DIR/common/bzip2_unittest.cc',
+  '$CHROME_DIR/browser/cache_manager_host_unittest.cc',
+  '$CHROME_DIR/common/chrome_plugin_unittest.cc',
+  '$CHROME_DIR/browser/chrome_thread_unittest.cc',
+  '$CHROME_DIR/browser/safe_browsing/chunk_range_unittest.cc',
+  '$CHROME_DIR/browser/controller_unittest.cc',
+  '$CHROME_DIR/browser/net/dns_host_info_unittest.cc',
+  '$CHROME_DIR/browser/net/dns_master_unittest.cc',
+  '$CHROME_DIR/browser/download/download_manager_unittest.cc',
+  '$CHROME_DIR/browser/download/download_request_manager_unittest.cc',
+  '$CHROME_DIR/common/gfx/emf_unittest.cc',
+  '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc',
+  '$CHROME_DIR/browser/history/expire_history_backend_unittest.cc',
+  '$CHROME_DIR/browser/extensions/extension_protocols_unittest.cc',
+  '$CHROME_DIR/browser/extensions/extension_unittest.cc',
+  '$CHROME_DIR/browser/extensions/extensions_service_unittest.cc',
+  '$CHROME_DIR/browser/importer/firefox_importer_unittest.cc',
+  '$CHROME_DIR/views/focus_manager_unittest.cc',
+  '$CHROME_DIR/browser/google_url_tracker_unittest.cc',
+  '$CHROME_DIR/views/grid_layout_unittest.cc',
+  '$CHROME_DIR/../googleurl/src/gurl_unittest$OBJSUFFIX',
+  '$CHROME_DIR/browser/history/history_backend_unittest.cc',
+  '$CHROME_DIR/browser/autocomplete/history_contents_provider_unittest.cc',
+  '$CHROME_DIR/browser/history/history_querying_unittest.cc',
+  '$CHROME_DIR/browser/history/history_types_unittest.cc',
+  '$CHROME_DIR/browser/history/history_unittest.cc',
+  '$CHROME_DIR/browser/autocomplete/history_url_provider_unittest.cc',
+  '$CHROME_DIR/common/gfx/icon_util_unittest.cc',
+  '$CHROME_DIR/browser/importer/importer_unittest.cc',
+  '$CHROME_DIR/common/ipc_message_unittest.cc',
+  '$CHROME_DIR/common/ipc_sync_channel_unittest.cc',
+  '$CHROME_DIR/common/ipc_sync_channel_unittest.h',
   '$CHROME_DIR/common/ipc_sync_message_unittest.cc',
+  '$CHROME_DIR/common/ipc_sync_message_unittest.h',
+  '$CHROME_DIR/common/jpeg_codec_unittest.cc',
+  '$CHROME_DIR/common/json_value_serializer_unittest.cc',
+  '$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc',
+  '$CHROME_DIR/browser/autocomplete/keyword_provider_unittest.cc',
   '$CHROME_DIR/common/l10n_util_unittest.cc',
+  '$CHROME_DIR/views/label_unittest.cc',
+  '$CHROME_DIR/browser/login_prompt_unittest.cc',
+  '$CHROME_DIR/browser/metrics/metrics_log_unittest.cc',
+  '$CHROME_DIR/browser/metrics/metrics_response_unittest.cc',
+  '$CHROME_DIR/renderer/mock_render_process.h',
+  '$CHROME_DIR/renderer/mock_render_thread.cc',
+  '$CHROME_DIR/renderer/mock_render_thread.h',
+  '$CHROME_DIR/common/mru_cache_unittest.cc',
+  '$CHROME_DIR/browser/navigation_controller_unittest.cc',
+  '$CHROME_DIR/common/notification_service_unittest.cc',
+  '$CHROME_DIR/common/os_exchange_data_unittest.cc',
+  '$CHROME_DIR/browser/printing/page_number_unittest.cc',
+  '$CHROME_DIR/browser/printing/page_overlays_unittest.cc',
+  '$CHROME_DIR/browser/printing/page_range_unittest.cc',
+  '$CHROME_DIR/browser/printing/page_setup_unittest.cc',
+  '$CHROME_DIR/browser/password_manager/password_form_manager_unittest.cc',
+  '$CHROME_DIR/common/pref_member_unittest.cc',
+  '$CHROME_DIR/common/pref_service_unittest.cc',
+  '$CHROME_DIR/browser/printing/print_job_unittest.cc',
+  '$CHROME_DIR/browser/printing/printing_test.h',
+  '$CHROME_DIR/browser/profile_manager_unittest.cc',
   '$CHROME_DIR/common/property_bag_unittest.cc',
+  '$CHROME_DIR/browser/safe_browsing/protocol_manager_unittest.cc',
+  '$CHROME_DIR/browser/safe_browsing/protocol_parser_unittest.cc',
+  '$CHROME_DIR/browser/history/query_parser_unittest.cc',
+  '$CHROME_DIR/renderer/net/render_dns_master_unittest.cc',
+  '$CHROME_DIR/renderer/net/render_dns_queue_unittest.cc',
+  '$CHROME_DIR/renderer/render_view_unittest.cc',
+  '$CHROME_DIR/renderer/render_widget_unittest.cc',
+  '$CHROME_DIR/browser/renderer_security_policy_unittest.cc',
+  '$CHROME_DIR/test/data/resource.h',
+  '$CHROME_DIR/test/data/resource.rc',
+  '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_unittest.cc',
+  '$CHROME_DIR/common/resource_dispatcher_unittest.cc',
+  '$CHROME_DIR/browser/rlz/rlz_unittest.cc',
+  '$CHROME_DIR/browser/safe_browsing/safe_browsing_database_unittest.cc',
+  '$CHROME_DIR/browser/safe_browsing/safe_browsing_util_unittest.cc',
+  '$CHROME_DIR/browser/download/save_package_unittest.cc',
+  '$CHROME_DIR/browser/sessions/session_backend_unittest.cc',
+  '$CHROME_DIR/browser/sessions/session_service_test_helper.cc',
+  '$CHROME_DIR/browser/sessions/session_service_test_helper.h',
+  '$CHROME_DIR/browser/sessions/session_service_unittest.cc',
+  '$CHROME_DIR/browser/site_instance_unittest.cc',
+  '$CHROME_DIR/browser/history/snippet_unittest.cc',
+  '$CHROME_DIR/browser/spellcheck_unittest.cc',
+  '$CHROME_DIR/browser/history/starred_url_database_unittest.cc',
+  '$CHROME_DIR/browser/sessions/tab_restore_service_unittest.cc',
+  '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc',
+  '$CHROME_DIR/views/table_view_unittest.cc',
+  '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc',
+  '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc',
+  '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc',
+  '$CHROME_DIR/browser/search_engines/template_url_unittest.cc',
+  '$CHROME_DIR/browser/history/text_database_manager_unittest.cc',
+  '$CHROME_DIR/browser/history/text_database_unittest.cc',
+  '$CHROME_DIR/common/gfx/text_elider_unittest.cc',
+  '$CHROME_DIR/browser/history/thumbnail_database_unittest.cc',
+  '$CHROME_DIR/common/time_format_unittest.cc',
+  '$CHROME_DIR/views/tree_node_iterator_unittest.cc',
+  '$CHROME_DIR/browser/printing/units_unittest.cc',
   '$CHROME_DIR/common/unzip_unittest.cc',
+  '$CHROME_DIR/../googleurl/src/url_canon_unittest$OBJSUFFIX',
+  '$CHROME_DIR/browser/history/url_database_unittest.cc',
+  '$CHROME_DIR/browser/net/url_fetcher_unittest.cc',
+  '$CHROME_DIR/browser/net/url_fixer_upper_unittest.cc',
+  '$CHROME_DIR/../googleurl/src/url_parse_unittest$OBJSUFFIX',
+  '$CHROME_DIR/../googleurl/src/url_util_unittest$OBJSUFFIX',
+  '$CHROME_DIR/browser/extensions/user_script_master_unittest.cc',
   '$CHROME_DIR/renderer/user_script_slave_unittest.cc',
+  '$CHROME_DIR/views/view_unittest.cc',
   '$CHROME_DIR/browser/history/visit_database_unittest.cc',
+  '$CHROME_DIR/browser/history/visit_tracker_unittest.cc',
+  '$CHROME_DIR/browser/visitedlink_unittest.cc',
+  '$CHROME_DIR/browser/tab_contents/web_contents_unittest.cc',
+  '$CHROME_DIR/browser/webdata/web_database_unittest.cc',
+  '$CHROME_DIR/browser/printing/win_printing_context_unittest.cc',
+  '$CHROME_DIR/common/win_util_unittest.cc',
+  '$CHROME_DIR/browser/window_sizer_unittest.cc',
+  '$CHROME_DIR/common/worker_thread_ticker_unittest.cc',
 ])
 
-if not env.Bit('mac'):
+if env.Bit('mac'):
   # TODO(port): Port to Mac.
-  unit_test_files.extend([
+  input_files.Remove(
       'run_all_unittests.cc',
 
       '$CHROME_DIR/browser/chrome_thread_unittest.cc',
@@ -157,11 +314,18 @@ if not env.Bit('mac'):
       '$CHROME_DIR/test/test_notification_tracker.cc',
 
       '$NET_DIR/base/ssl_test_util$OBJSUFFIX',
-  ])
+  )
 
-if env.Bit('windows'):
+if not env.Bit('windows'):
+  # Windows-specific.
+  input_files.Remove(
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+  )
+
+if not env.Bit('windows'):
   # TODO(port): Port these.
-  unit_test_files.extend([
+  input_files.Remove(
       '$CHROME_DIR/browser/autocomplete/autocomplete_unittest.cc',
       '$CHROME_DIR/browser/autocomplete/history_contents_provider_unittest.cc',
       '$CHROME_DIR/browser/autocomplete/history_url_provider_unittest.cc',
@@ -174,13 +338,14 @@ if env.Bit('windows'):
       '$CHROME_DIR/browser/bookmarks/bookmark_model_unittest.cc',
       '$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc',
       '$CHROME_DIR/browser/bookmarks/bookmark_utils_unittest.cc',
+      '$CHROME_DIR/browser/browser_commands_unittest.cc',
       '$CHROME_DIR/browser/cache_manager_host_unittest.cc',
       '$CHROME_DIR/browser/controller_unittest.cc',
       '$CHROME_DIR/browser/download/download_manager_unittest.cc',
       '$CHROME_DIR/browser/download/download_request_manager_unittest.cc',
       '$CHROME_DIR/browser/download/save_package_unittest.cc',
+      '$CHROME_DIR/browser/extensions/extension_protocols_unittest.cc',
       '$CHROME_DIR/browser/extensions/user_script_master_unittest.cc',
-      '$CHROME_DIR/browser/encryptor_unittest.cc',
       '$CHROME_DIR/browser/google_url_tracker_unittest.cc',
       '$CHROME_DIR/browser/history/expire_history_backend_unittest.cc',
       '$CHROME_DIR/browser/history/history_backend_unittest.cc',
@@ -198,30 +363,32 @@ if env.Bit('windows'):
       '$CHROME_DIR/browser/navigation_controller_unittest.cc',
       '$CHROME_DIR/browser/net/dns_master_unittest.cc',
       '$CHROME_DIR/browser/net/url_fixer_upper_unittest.cc',
-      '$CHROME_DIR/browser/password_form_manager_unittest.cc',
+      '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc',
+      '$CHROME_DIR/browser/password_manager/password_form_manager_unittest.cc',
       '$CHROME_DIR/browser/printing/page_number_unittest.cc',
       '$CHROME_DIR/browser/printing/page_overlays_unittest.cc',
       '$CHROME_DIR/browser/printing/print_job_unittest.cc',
       '$CHROME_DIR/browser/printing/win_printing_context_unittest.cc',
       '$CHROME_DIR/browser/profile_manager_unittest.cc',
+      '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_unittest.cc',
       '$CHROME_DIR/browser/renderer_security_policy_unittest.cc',
       '$CHROME_DIR/browser/resource_dispatcher_host_unittest.cc',
       '$CHROME_DIR/browser/rlz/rlz_unittest.cc',
       '$CHROME_DIR/browser/safe_browsing/protocol_manager_unittest.cc',
+      '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc',
+      '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc',
+      '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc',
+      '$CHROME_DIR/browser/search_engines/template_url_unittest.cc',
       '$CHROME_DIR/browser/sessions/session_backend_unittest.cc',
       '$CHROME_DIR/browser/sessions/session_service_test_helper.cc',
       '$CHROME_DIR/browser/sessions/session_service_unittest.cc',
       '$CHROME_DIR/browser/sessions/tab_restore_service_unittest.cc',
       '$CHROME_DIR/browser/site_instance_unittest.cc',
+      '$CHROME_DIR/browser/tab_contents/web_contents_unittest.cc',
       '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc',
-      '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc',
-      '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc',
-      '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc',
-      '$CHROME_DIR/browser/search_engines/template_url_unittest.cc',
       '$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc',
       '$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc',
       '$CHROME_DIR/browser/visitedlink_unittest.cc',
-      '$CHROME_DIR/browser/web_contents_unittest.cc',
       '$CHROME_DIR/browser/webdata/web_database_unittest.cc',
       '$CHROME_DIR/browser/window_sizer_unittest.cc',
       '$CHROME_DIR/common/chrome_plugin_unittest.cc',
@@ -234,12 +401,22 @@ if env.Bit('windows'):
       '$CHROME_DIR/common/resource_dispatcher_unittest.cc',
       '$CHROME_DIR/common/time_format_unittest.cc',
       '$CHROME_DIR/common/win_util_unittest.cc',
+      '$CHROME_DIR/renderer/mock_render_thread.cc',
       '$CHROME_DIR/renderer/net/render_dns_master_unittest.cc',
+      '$CHROME_DIR/renderer/render_view_unittest.cc',
       '$CHROME_DIR/renderer/render_widget_unittest.cc',
+      '$CHROME_DIR/test/browser_with_test_window_test.cc',
       '$CHROME_DIR/test/test_tab_contents.cc',
       '$CHROME_DIR/test/testing_profile.cc',
+      '$CHROME_DIR/third_party/hunspell/google/bdict_reader$OBJSUFFIX',
+      '$CHROME_DIR/third_party/hunspell/google/bdict_writer$OBJSUFFIX',
+      '$CHROME_DIR/third_party/hunspell/google/hunspell_tests.cc',
+      '$CHROME_DIR/tools/convert_dict/aff_reader$OBJSUFFIX',
+      '$CHROME_DIR/tools/convert_dict/dic_reader$OBJSUFFIX',
+      '$CHROME_DIR/tools/convert_dict/hunspell_reader$OBJSUFFIX',
       '$CHROME_DIR/views/focus_manager_unittest.cc',
       '$CHROME_DIR/views/grid_layout_unittest.cc',
+      '$CHROME_DIR/views/label_unittest.cc',
       '$CHROME_DIR/views/table_view_unittest.cc',
       '$CHROME_DIR/views/tree_node_iterator_unittest.cc',
       '$CHROME_DIR/views/view_unittest.cc',
@@ -251,17 +428,18 @@ if env.Bit('windows'):
 
       '$CHROME_DIR/browser/browser_resources.res',
       '$CHROME_DIR/test/data/resource.res',
-  ])
+  )
 
 if not env.Bit('mac'):
   # TODO(port): This should work on all platforms.
 
-  unit_tests = env.ChromeTestProgram('unit_tests', unit_test_files)
+  unit_tests = env.ChromeTestProgram('unit_tests', input_files)
 
   i = env.Install('$TARGET_ROOT', unit_tests)
   Alias('chrome', i)
 
-env.ChromeMSVSProject('$CHROME_DIR/test/unit/unittests.vcproj',
+p = env.ChromeMSVSProject('unittests.vcproj',
+                dest='$CHROME_SRC_DIR/chrome/test/unit/unittests.vcproj',
                 name='unit_tests',
                 dependencies = [
                     '$BASE_DIR/build/base.vcproj',
@@ -305,4 +483,76 @@ env.ChromeMSVSProject('$CHROME_DIR/test/unit/unittests.vcproj',
                     '$LIBXSLT_DIR/build/libxslt.vcproj',
                     '$CHROME_DIR/app/theme/theme_dll.vcproj',
                 ],
-                guid='{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}')
+                guid='{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}',
+                # TODO(sgk):  when we can intuit the hierarchy
+                # from the built targets.
+                #buildtargets=TODO,
+                files=input_files,
+                local_directory_prefix='./',
+                tools=[
+                    'VCPreBuildEventTool',
+                    'VCCustomBuildTool',
+                    'VCXMLDataGeneratorTool',
+                    'VCWebServiceProxyGeneratorTool',
+                    'VCMIDLTool',
+                    'VCCLCompilerTool',
+                    'VCManagedResourceCompilerTool',
+                    MSVSTool('VCResourceCompilerTool',
+                             AdditionalIncludeDirectories=[
+                               '$(SolutionDir)..',
+                               '"$(IntDir)"',
+                               '"$(IntDir)"',
+                               '"$(SolutionDir)"',
+                               '"$(IntDir)/../"',
+                             ]),
+                    'VCPreLinkEventTool',
+                    MSVSTool('VCLinkerTool',
+                             AdditionalDependencies='winmm.lib'),
+                    'VCALinkTool',
+                    'VCManifestTool',
+                    'VCXDCMakeTool',
+                    'VCBscMakeTool',
+                    'VCFxCopTool',
+                    'VCAppVerifierTool',
+                    'VCWebDeploymentTool',
+                    'VCPostBuildEventTool',
+                ],
+                ConfigurationType='1')
+
+p.AddConfig('Debug|Win32',
+            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',
+            ])
+
+p.AddConfig('Release|Win32',
+            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',
+            ])
+
+p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

chrome/third_party/hunspell/SConscript

@@ -70,17 +70,46 @@ if env.Bit('linux'):
       ],
   )
 
-input_files = [
-    'google/bdict_reader.cc',
-    'src/hunspell/affentry.cxx',
-    'src/hunspell/affixmgr.cxx',
-    'src/hunspell/csutil.cxx',
-    'src/hunspell/dictmgr.cxx',
-    'src/hunspell/hashmgr.cxx',
-    'src/hunspell/hunspell.cxx',
-    'src/hunspell/suggestmgr.cxx',
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('parsers', [
     'src/parsers/textparser.cxx',
-]
+    'src/parsers/textparser.hxx',
+  ]),
+  MSVSFilter('hunspell', [
+    'src/hunspell/affentry.cxx',
+    'src/hunspell/affentry.hxx',
+    'src/hunspell/affixmgr.cxx',
+    'src/hunspell/affixmgr.hxx',
+    'src/hunspell/atypes.hxx',
+    'src/hunspell/baseaffix.hxx',
+    'src/hunspell/csutil.cxx',
+    'src/hunspell/csutil.hxx',
+    'src/hunspell/dictmgr.cxx',
+    'src/hunspell/dictmgr.hxx',
+    'src/hunspell/hashmgr.cxx',
+    'src/hunspell/hashmgr.hxx',
+    'src/hunspell/htypes.hxx',
+    'src/hunspell/hunspell.cxx',
+    'src/hunspell/hunspell.h',
+    'src/hunspell/hunspell.hxx',
+    'src/hunspell/langnum.hxx',
+    'src/hunspell/suggestmgr.cxx',
+    'src/hunspell/suggestmgr.hxx',
+    'src/hunspell/utf_info.hxx',
+  ]),
+  MSVSFilter('Dictionaries', [
+    'dictionaries/en-US-1-2.bdic',
+  ]),
+  MSVSFilter('google', [
+    'google/bdict.h',
+    'google/bdict_affentry.h',
+    'google/bdict_reader.cc',
+    'google/bdict_reader.h',
+  ]),
+])
 
 env.ChromeLibrary('hunspell', input_files)
 
@@ -94,5 +123,53 @@ dictionaries = [
 i = env.Install('$DESTINATION_ROOT/Dictionaries', dictionaries)
 env.Alias('chrome_Dictionaries', i)
 
-env.ChromeMSVSProject('$CHROME_DIR/third_party/hunspell/hunspell.vcproj',
-                guid='{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}')
+
+p = env.ChromeMSVSProject('hunspell.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'third_party/hunspell/hunspell.vcproj'),
+                          guid='{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}',
+                          keyword='Win32Proj',
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'CopyDictionaries',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+p.AddToolFile('./copy_dictionary_files.rules')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '../../../build/debug.vsprops',
+                '$(SolutionDir)../build/external_code.vsprops',
+                './hunspell.vsprops',
+                './using_hunspell.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '../../../build/release.vsprops',
+                '$(SolutionDir)../build/external_code.vsprops',
+                './hunspell.vsprops',
+                './using_hunspell.vsprops',
+            ])

chrome/tools/convert_dict/convert_dict.scons

@@ -24,23 +24,72 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
+input_files = ChromeFileList([
     'aff_reader.cc',
+    'aff_reader.h',
+    '$CHROME_DIR/third_party/hunspell/google/bdict.h',
+    '$CHROME_DIR/third_party/hunspell/google/bdict_reader$OBJSUFFIX',
+    '$CHROME_DIR/third_party/hunspell/google/bdict_reader.h',
+    '$CHROME_DIR/third_party/hunspell/google/bdict_writer.cc',
+    '$CHROME_DIR/third_party/hunspell/google/bdict_writer.h',
     'convert_dict.cc',
     'dic_reader.cc',
+    'dic_reader.h',
     'hunspell_reader.cc',
-    '$CHROME_DIR/third_party/hunspell/google/bdict_reader$OBJSUFFIX',
-    '$CHROME_DIR/third_party/hunspell/google/bdict_writer.cc',
-]
+    'hunspell_reader.h',
+])
+
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeProgram('convert_dict', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/tools/convert_dict/convert_dict.vcproj',
-                      dependencies = [
-                          '$BASE_DIR/build/base.vcproj',
-                          '$ICU38_DIR/build/icu.vcproj',
-                          '$ICU38_DIR/build/icudt.vcproj',
-                      ],
-                      guid='{42ECD5EC-722F-41DE-B6B8-83764C8016DF}')
+p = env.ChromeMSVSProject('convert_dict.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'tools/convert_dict/convert_dict.vcproj'),
+                          guid='{42ECD5EC-722F-41DE-B6B8-83764C8016DF}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$BASE_DIR/build/base.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$ICU38_DIR/build/icudt.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          local_directory_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLinkerTool',
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            CharacterSet='2',
+            InheritedPropertySheets=[
+                '../../../build/debug.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            CharacterSet='2',
+            InheritedPropertySheets=[
+                '../../../build/release.vsprops',
+            ])

chrome/tools/crash_service/crash_service.scons

@@ -42,24 +42,69 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
-    'main.cc',
+input_files = ChromeFileList([
     'crash_service.cc',
-]
+    'crash_service.h',
+    'main.cc',
+])
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeProgram('crash_service', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/tools/crash_service/crash_service.vcproj',
-                      dependencies = [
-                          '$BASE_DIR/build/base.vcproj',
-                          '$ZLIB_DIR/zlib.vcproj',
-                          '$CHROME_DIR/common/common.vcproj',
-                          '$ICU38_DIR/build/icu.vcproj',
-                          '$BREAKPAD_DIR/breakpad_sender.vcproj',
-                          '$BASE_DIR/build/base_gfx.vcproj',
-                          '$BREAKPAD_DIR/breakpad_handler.vcproj',
-                          '$SKIA_DIR/skia.vcproj',
-                      ],
-                      guid='{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}')
+p = env.ChromeMSVSProject('crash_service.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'tools/crash_service/crash_service.vcproj'),
+                          guid='{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$BASE_DIR/build/base.vcproj',
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$CHROME_DIR/common/common.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$BREAKPAD_DIR/breakpad_sender.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              '$BREAKPAD_DIR/breakpad_handler.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLinkerTool',
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)../breakpad/using_breakpad.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)../breakpad/using_breakpad.vsprops',
+            ])

chrome/tools/perf/flush_cache/flush_cache.scons

@@ -36,15 +36,55 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
+input_files = ChromeFileList([
     'flush_cache.cc',
-]
+])
 
 env.ChromeTestProgram('flush_cache', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/tools/perf/flush_cache/flush_cache.vcproj',
-                dependencies = [
-                    '$BASE_DIR/build/base.vcproj',
-                    '$ICU38_DIR/build/icu.vcproj',
-                ],
-                guid='{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}')
+p = env.ChromeMSVSProject('flush_cache.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'tools/perf/flush_cache/flush_cache.vcproj'),
+                          guid='{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}',
+                          dependencies = [
+                              '$BASE_DIR/build/base.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLinkerTool',
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+            ])

chrome/tools/profiles/generate_profile.scons

@@ -61,49 +61,106 @@ if env.Bit('windows'):
       ],
   )
 
-input_files = [
+input_files = ChromeFileList([
     'generate_profile.cc',
-]
+    'thumbnail-inl.h',
+])
 
 # TODO(port):
 if env.Bit('windows'):
   env.ChromeTestProgram('generate_profile', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/tools/profiles/generate_profile.vcproj',
-                      dependencies = [
-                           '$BASE_DIR/build/base.vcproj',
-                           '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
-                           '$CHROME_DIR/plugin/plugin.vcproj',
-                           '$LIBJPEG_DIR/libjpeg.vcproj',
-                           '$BZIP2_DIR/bzip2.vcproj',
-                           '$NET_DIR/build/net.vcproj',
-                           ('$WEBKIT_DIR/build/JavaScriptCore/' +
-                                'JavaScriptCore_pcre.vcproj'),
-                           '$WEBKIT_DIR/build/port/port.vcproj',
-                           '$CHROME_DIR/browser/debugger/debugger.vcproj',
-                           '$WEBKIT_DIR/default_plugin/default_plugin.vcproj',
-                           '$CHROME_DIR/browser/browser.vcproj',
-                           '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
-                           '$SQLITE_DIR/sqlite.vcproj',
-                           '$CHROME_DIR/views/views.vcproj',
-                           '$MODP_B64_DIR/modp_b64.vcproj',
-                           '$ZLIB_DIR/zlib.vcproj',
-                           '$CHROME_DIR/common/common.vcproj',
-                           '$ICU38_DIR/build/icu.vcproj',
-                           '$CHROME_DIR/renderer/renderer.vcproj',
-                           '$BASE_DIR/build/base_gfx.vcproj',
-                           '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
-                           '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj',
-                           '$LIBPNG_DIR/libpng.vcproj',
-                           '$WEBKIT_DIR/build/glue/glue.vcproj',
-                           '$SKIA_DIR/skia.vcproj',
-                           '$CHROME_DIR/third_party/hunspell/hunspell.vcproj',
-                           '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                           '$CHROME_DIR/installer/util/util.vcproj',
-                           '$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
-                           '$SDCH_DIR/sdch.vcproj',
-                           '$CHROME_DIR/browser/views/browser_views.vcproj',
-                           '$LIBXSLT_DIR/build/libxslt.vcproj',
-	
-                      ],
-                      guid='{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}')
+p = env.ChromeMSVSProject('generate_profile.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'tools/profiles/generate_profile.vcproj'),
+                          guid='{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                               '$BASE_DIR/build/base.vcproj',
+                               '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
+                               '$CHROME_DIR/plugin/plugin.vcproj',
+                               '$LIBJPEG_DIR/libjpeg.vcproj',
+                               '$BZIP2_DIR/bzip2.vcproj',
+                               '$NET_DIR/build/net.vcproj',
+                               ('$WEBKIT_DIR/build/JavaScriptCore/' +
+                                    'JavaScriptCore_pcre.vcproj'),
+                               '$WEBKIT_DIR/build/port/port.vcproj',
+                               '$CHROME_DIR/browser/debugger/debugger.vcproj',
+                               ('$WEBKIT_DIR/default_plugin/'
+                                + 'default_plugin.vcproj'),
+                               '$CHROME_DIR/browser/browser.vcproj',
+                               '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
+                               '$SQLITE_DIR/sqlite.vcproj',
+                               '$CHROME_DIR/views/views.vcproj',
+                               '$MODP_B64_DIR/modp_b64.vcproj',
+                               '$ZLIB_DIR/zlib.vcproj',
+                               '$CHROME_DIR/common/common.vcproj',
+                               '$ICU38_DIR/build/icu.vcproj',
+                               '$CHROME_DIR/renderer/renderer.vcproj',
+                               '$BASE_DIR/build/base_gfx.vcproj',
+                               '$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
+                               '$V8_DIR/tools/visual_studio/v8_snapshot.vcproj',
+                               '$LIBPNG_DIR/libpng.vcproj',
+                               '$WEBKIT_DIR/build/glue/glue.vcproj',
+                               '$SKIA_DIR/skia.vcproj',
+                               ('$CHROME_DIR/third_party/'
+                                + 'hunspell/hunspell.vcproj'),
+                               '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                               '$CHROME_DIR/installer/util/util.vcproj',
+                               '$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
+                               '$SDCH_DIR/sdch.vcproj',
+                               '$CHROME_DIR/browser/views/browser_views.vcproj',
+                               '$LIBXSLT_DIR/build/libxslt.vcproj',
+    	
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              MSVSTool('VCCLCompilerTool',
+                                       AdditionalIncludeDirectories='../../..',
+                                       PreprocessorDefinitions='PERF_TEST'),
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              MSVSTool('VCLinkerTool',
+                                       AdditionalDependencies=[
+                                          'shlwapi.lib',
+                                          'rpcrt4.lib',
+                                          'winmm.lib'
+                                       ],
+                                       SubSystem='1'),
+                              'VCALinkTool',
+                              'VCManifestTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCAppVerifierTool',
+                              'VCWebDeploymentTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='1')
+
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+                '../../../skia/using_skia.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)../third_party/icu38/build/using_icu.vsprops',
+                '../../../skia/using_skia.vsprops',
+            ])

chrome/tools/test/image_diff/image_diff.scons

@@ -42,19 +42,49 @@ if env.Bit('windows'):
         ],
     )
 
-input_files = [
+input_files = ChromeFileList([
     'image_diff.cc',
-]
+])
 
 env.ChromeTestProgram('image_diff', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/tools/test/image_diff/image_diff.vcproj',
-                dependencies = [
-                    '$BASE_DIR/build/base.vcproj',
-                    '$ZLIB_DIR/zlib.vcproj',
-                    '$ICU38_DIR/build/icu.vcproj',
-                    '$BASE_DIR/build/base_gfx.vcproj',
-                    '$LIBPNG_DIR/libpng.vcproj',
-                    '$SKIA_DIR/skia.vcproj',
-                ],
-                guid='{50B079C7-CD01-42D3-B8C4-9F8D9322E822}')
+p = env.ChromeMSVSProject('image_diff.vcproj',
+                          dest=('$CHROME_SRC_DIR/chrome/'
+                                + 'tools/test/image_diff/image_diff.vcproj'),
+                          guid='{50B079C7-CD01-42D3-B8C4-9F8D9322E822}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$BASE_DIR/build/base.vcproj',
+                              '$ZLIB_DIR/zlib.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$BASE_DIR/build/base_gfx.vcproj',
+                              '$LIBPNG_DIR/libpng.vcproj',
+                              '$SKIA_DIR/skia.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools=[
+                              MSVSTool('VCLinkerTool',
+                                       SubSystem='1'),
+                              'VCCLCompilerTool',
+                          ],
+                          ConfigurationType='1')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)../third_party/libpng/using_libpng.vsprops',
+                '$(SolutionDir)../third_party/zlib/using_zlib.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)../third_party/libpng/using_libpng.vsprops',
+                '$(SolutionDir)../third_party/zlib/using_zlib.vsprops',
+            ])

chrome/views/SConscript

@@ -30,71 +30,153 @@ env.Append(
     ],
 )
 
-input_files = [
-    'accelerator.cc',
-    'accelerator_handler.cc',
+input_files = ChromeFileList([
+  # TODO(sgk):  violate standard indentation so we don't have to
+  # reindent too much when we remove the explicit MSVSFilter() calls
+  # in favor of generating the hierarchy to reflect the file system.
+  MSVSFilter('Accessibility', [
     'accessibility/accessible_wrapper.cc',
+    'accessibility/accessible_wrapper.h',
     'accessibility/view_accessibility.cc',
+    'accessibility/view_accessibility.h',
+  ]),
+    'accelerator.cc',
+    'accelerator.h',
+    'accelerator_handler.cc',
+    'accelerator_handler.h',
     'aero_tooltip_manager.cc',
+    'aero_tooltip_manager.h',
+    'app_modal_dialog_delegate.h',
     'background.cc',
+    'background.h',
     'base_button.cc',
+    'base_button.h',
     'bitmap_scroll_bar.cc',
+    'bitmap_scroll_bar.h',
     'border.cc',
+    'border.h',
     'button.cc',
+    'button.h',
     'button_dropdown.cc',
+    'button_dropdown.h',
     'checkbox.cc',
+    'checkbox.h',
     'chrome_menu.cc',
+    'chrome_menu.h',
     'client_view.cc',
+    'client_view.h',
     'combo_box.cc',
+    'combo_box.h',
+    'controller.h',
     'custom_frame_window.cc',
-    'dialog_delegate.cc',
-    'dialog_client_view.cc',
+    'custom_frame_window.h',
     'decision.cc',
+    'decision.h',
+    'dialog_client_view.cc',
+    'dialog_client_view.h',
+    'dialog_delegate.cc',
+    'dialog_delegate.h',
     'event.cc',
+    'event.h',
     'external_focus_tracker.cc',
+    'external_focus_tracker.h',
     'focus_manager.cc',
+    'focus_manager.h',
     'grid_layout.cc',
+    'grid_layout.h',
     'group_table_view.cc',
+    'group_table_view.h',
+    'hwnd_notification_source.h',
     'hwnd_view.cc',
+    'hwnd_view.h',
     'image_view.cc',
+    'image_view.h',
     'label.cc',
+    'label.h',
     'layout_manager.cc',
+    'layout_manager.h',
     'link.cc',
+    'link.h',
     'menu.cc',
+    'menu.h',
     'menu_button.cc',
+    'menu_button.h',
     'message_box_view.cc',
+    'message_box_view.h',
     'native_button.cc',
+    'native_button.h',
     'native_control.cc',
+    'native_control.h',
     'native_scroll_bar.cc',
+    'native_scroll_bar.h',
     'non_client_view.cc',
+    'non_client_view.h',
     'painter.cc',
+    'painter.h',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
     'radio_button.cc',
+    'radio_button.h',
     'repeat_controller.cc',
+    'repeat_controller.h',
     'resize_corner.cc',
+    'resize_corner.h',
     'root_view.cc',
+    'root_view.h',
     'root_view_drop_target.cc',
+    'root_view_drop_target.h',
     'scroll_bar.cc',
+    'scroll_bar.h',
     'scroll_view.cc',
+    'scroll_view.h',
     'separator.cc',
+    'separator.h',
     'single_split_view.cc',
+    'single_split_view.h',
     'tabbed_pane.cc',
+    'tabbed_pane.h',
     'table_view.cc',
+    'table_view.h',
     'text_button.cc',
+    'text_button.h',
     'text_field.cc',
+    'text_field.h',
     'throbber.cc',
+    'throbber.h',
     'tooltip_manager.cc',
+    'tooltip_manager.h',
+    'tree_model.h',
+    'tree_node_iterator.h',
+    'tree_node_model.h',
     'tree_view.cc',
+    'tree_view.h',
     'view.cc',
+    'view.h',
     'view_constants.cc',
+    'view_constants.h',
+    'view_menu_delegate.h',
     'view_storage.cc',
+    'view_storage.h',
+    'widget.h',
     'widget_win.cc',
+    'widget_win.h',
     'window.cc',
+    'window.h',
     'window_delegate.cc',
-]
+    'window_delegate.h',
+    'window_resources.h',
+])
+
+if not env.Bit('windows'):
+  # Windows-specific.
+  input_files.Remove(
+      '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+      '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+  )
 
 if env.Bit('linux'):
   # TODO(port): Port to Linux.
-  remove_files = [
+  input_files.Remove(
       'accelerator.cc',
       'accelerator_handler.cc',
       'accessibility/accessible_wrapper.cc',
@@ -146,13 +228,11 @@ if env.Bit('linux'):
       'widget_win.cc',
       'window.cc',
       'window_delegate.cc',
-  ]
-  for file in remove_files:
-    input_files.remove(file)
+  )
 
 if env.Bit('mac'):
   # TODO(port): Port to Mac.
-  remove_files = [
+  input_files.Remove(
       'accelerator.cc',
       'accelerator_handler.cc',
       'accessibility/accessible_wrapper.cc',
@@ -211,14 +291,60 @@ if env.Bit('mac'):
       'widget_win.cc',
       'window.cc',
       'window_delegate.cc',
-  ]
-  for file in remove_files:
-    input_files.remove(file)
+  )
 
 env.ChromeLibrary('views', input_files)
 
-env.ChromeMSVSProject('$CHROME_DIR/views/views.vcproj',
-                dependencies = [
-                    '$CHROME_DIR/app/generated_resources.vcproj',
-                ],
-                guid='{6F9258E5-294F-47B2-919D-17FFE7A8B751}')
+p = env.ChromeMSVSProject('views.vcproj',
+                          dest='$CHROME_SRC_DIR/chrome/views/views.vcproj',
+                          guid='{6F9258E5-294F-47B2-919D-17FFE7A8B751}',
+                          keyword='Win32Proj',
+                          dependencies = [
+                              '$CHROME_DIR/app/generated_resources.vcproj',
+                          ],
+                          # TODO(sgk):  when we can intuit the hierarchy
+                          # from the built targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          root_namespace = 'Views',
+                          relative_path_prefix='./',
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              'VCLibrarianTool',
+                              'VCALinkTool',
+                              'VCXDCMakeTool',
+                              'VCBscMakeTool',
+                              'VCFxCopTool',
+                              'VCPostBuildEventTool',
+                          ],
+                          ConfigurationType='4')
+
+p.AddConfig('Debug|Win32',
+            InheritedPropertySheets=[
+                './views.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '../tools/build/win/precompiled_wtl.vsprops',
+                '../../third_party/icu38/build/using_icu.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                './views.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '../../third_party/icu38/build/using_icu.vsprops',
+            ])
+
+p.AddFileConfig('../tools/build/win/precompiled_wtl.cc',
+                'Debug|Win32',
+                tools=[
+                    MSVSTool('VCCLCompilerTool',
+                             UsePrecompiledHeader='1'),
+                ])

net/crash_cache.scons

@@ -33,11 +33,12 @@ input_files = ChromeFileList([
 
 if not env.Bit('mac'):
   # TODO(port): port to mac?
-  env.ChromeTestProgram('crash_cache', input_files)
+  x = env.ChromeTestProgram('crash_cache', input_files)
 
 p = env.ChromeMSVSProject('$NET_DIR/build/crash_cache.vcproj',
                           dest='$CHROME_SRC_DIR/net/build/crash_cache.vcproj',
                           guid='{B0EE0599-2913-46A0-A847-A3EC813658D3}',
+                          keyword='Win32Proj',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
                               '$NET_DIR/build/net.vcproj',

net/dump_cache.scons

@@ -37,6 +37,7 @@ if env.Bit('windows'):
 p = env.ChromeMSVSProject('$NET_DIR/build/dump_cache.vcproj',
                           dest='$CHROME_SRC_DIR/net/build/dump_cache.vcproj',
                           guid='{4A14E455-2B7C-4C0F-BCC2-35A9666C186F}',
+                          keyword='Win32Proj',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
                               '$NET_DIR/build/net.vcproj',

net/net_lib.scons

@@ -36,6 +36,7 @@ input_files = ChromeFileList([
     'base/client_socket_pool.h',
     'base/completion_callback.h',
     'base/connection_type_histograms.cc',
+    'base/connection_type_histograms.h',
     'base/cookie_monster.cc',
     'base/cookie_monster.h',
     'base/cookie_policy.cc',
@@ -336,6 +337,7 @@ lib = env.ChromeLibrary('net', input_files)
 p = env.ChromeMSVSProject('$NET_DIR/build/net.vcproj',
                           dest='$CHROME_SRC_DIR/net/build/net.vcproj',
                           guid='{326E9795-E760-410A-B69A-3F79DB3F5243}',
+                          keyword='Win32Proj',
                           dependencies = [
                               '$NET_DIR/build/net_resources.vcproj',
                               '$NET_DIR/build/tld_cleanup.vcproj',

net/net_perftests.scons

@@ -63,6 +63,7 @@ env.ChromeMSVSProject('$NET_DIR/build/net_perftests.vcproj',
 p = env.ChromeMSVSProject('$NET_DIR/build/net_perftests.vcproj',
                           dest='$CHROME_SRC_DIR/net/build/net_perftests.vcproj',
                           guid='{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}',
+                          keyword='Win32Proj',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
                               '$NET_DIR/build/net.vcproj',

net/net_resources.scons

@@ -44,10 +44,21 @@ if env.Bit('windows'):
     net_resources.extend(net_res)
     env.Depends(net_res, tld_names_clean)
 
+  input_files = ChromeFileList([
+      'base/net_resources.grd',
+      Derived(env.File('$TARGET_ROOT/grit_derived_sources/net_resources.h')),
+  ])
+
   p = env.ChromeMSVSProject('build/net_resources.vcproj',
-                            dest='$CHROME_SRC_DIR/net/build/net_resources.vcproj',
+                            dest=('$CHROME_SRC_DIR/net/'
+                                  + 'build/net_resources.vcproj'),
                             guid='{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}',
-                            buildtargets=net_resources,
+                            keyword='Win32Proj',
+                            #buildtargets=net_resources,
+                            files=input_files,
+                            relative_path_substitutions = [
+                              ('../../..', '$(OutDir)'),
+                            ],
                             ConfigurationType='10')
 
   p.AddToolFile('../tools/grit/build/grit_resources.rules')

net/net_unittests.scons

@@ -39,7 +39,8 @@ input_files = ChromeFileList([
   # reindent too much when we remove the explicit MSVSFilter() calls
   # in favor of generating the hierarchy to reflect the file system.
   MSVSFilter('support', [
-    'build/precompiled_net$OBJSUFFIX',
+    # Built from build/precomiled_net.cc, net_lib.scons.
+    'precompiled_net$OBJSUFFIX',
     'build/precompiled_net.h',
     'base/run_all_unittests.cc',
   ]),
@@ -71,9 +72,6 @@ input_files = ChromeFileList([
     'http/http_util_unittest.cc',
     'http/http_vary_data_unittest.cc',
     ]),
-   MSVSFilter('ftp', [
-    'ftp/ftp_auth_cache_unittest.cc',
-    ]),
    MSVSFilter('base', [
     'base/base64_unittest.cc',
     'base/bzip2_filter_unittest.cc',
@@ -102,6 +100,9 @@ input_files = ChromeFileList([
     'base/wininet_util_unittest.cc',
     'base/x509_certificate_unittest.cc',
     ]),
+   MSVSFilter('ftp', [
+    'ftp/ftp_auth_cache_unittest.cc',
+    ]),
    MSVSFilter('url_request', [
     'url_request/url_request_unittest.cc',
     'url_request/url_request_unittest.h',
@@ -116,7 +117,7 @@ input_files = ChromeFileList([
 if not env.Bit('windows'):
   input_files.Remove(
       'base/wininet_util_unittest.cc',
-      'build/precompiled_net$OBJSUFFIX',
+      'precompiled_net$OBJSUFFIX',
   )
 
 if env.Bit('linux'):
@@ -143,6 +144,8 @@ net_unittests = env.ChromeTestProgram('net_unittests', input_files)
 
 p = env.ChromeMSVSProject('$NET_DIR/build/net_unittests.vcproj',
                           dest='$CHROME_SRC_DIR/net/build/net_unittests.vcproj',
+                          guid='{E99DA267-BE90-4F45-88A1-6919DB2C7567}',
+                          keyword='Win32Proj',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
                               '$BZIP2_DIR/bzip2.vcproj',
@@ -154,7 +157,6 @@ p = env.ChromeMSVSProject('$NET_DIR/build/net_unittests.vcproj',
                               '$GOOGLEURL_DIR/build/googleurl.vcproj',
                               '$SDCH_DIR/sdch.vcproj',
                           ],
-                          guid='{E99DA267-BE90-4F45-88A1-6919DB2C7567}',
                           # TODO: restore when we can derive all info,
                           # on all platforms, from the windows build targets.
                           #buildtargets=net_unittests,

net/stress_cache.scons

@@ -47,6 +47,7 @@ if not env.Bit('mac'):
 p = env.ChromeMSVSProject('$NET_DIR/build/stress_cache.vcproj',
                           dest='$CHROME_SRC_DIR/net/build/stress_cache.vcproj',
                           guid='{B491C3A1-DE5F-4843-A1BB-AB8C4337187B}',
+                          keyword='Win32Proj',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
                               '$NET_DIR/build/net.vcproj',

net/tools/tld_cleanup/tld_cleanup.scons

@@ -32,6 +32,7 @@ env.ChromeProgram('tld_cleanup', input_files)
 p = env.ChromeMSVSProject('$NET_DIR/build/tld_cleanup.vcproj',
                           dest='$CHROME_SRC_DIR/net/build/tld_cleanup.vcproj',
                           guid='{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}',
+                          keyword='Win32Proj',
                           dependencies = [
                               '$BASE_DIR/build/base.vcproj',
                               '$ICU38_DIR/build/icu.vcproj',

site_scons/site_tools/_Node_MSVS.py

@@ -38,6 +38,7 @@ import xml.dom.minidom
 
 import SCons.Node.FS
 import SCons.Script
+import SCons.Util
 
 from SCons.Debug import Trace
 TODO = 0
@@ -220,7 +221,7 @@ class _MSVSFolder(FileList):
 
   entry_type_guid = '{2150E333-8FDC-42A3-9474-1A3956D46DE8}'
 
-  def initialize(self, path, name = None, entries = None, guid = None, items = None):
+  def initialize(self, path, name=None, entries=None, guid=None, items=None):
     """Initializes the folder.
 
     Args:
@@ -385,6 +386,47 @@ class MSVSTool(object):
       Name: Tool name.
       **attrs: Tool attributes.
     """
+
+    val = attrs.get('AdditionalDependencies')
+    if val:
+      if isinstance(val, list):
+        val = ' '.join(val)
+      attrs['AdditionalDependencies'] = val.replace('/', '\\')
+
+    val = attrs.get('AdditionalIncludeDirectories')
+    if val:
+      if isinstance(val, list):
+        val = ';'.join(val)
+      attrs['AdditionalIncludeDirectories'] = val.replace('/', '\\')
+
+    val = attrs.get('AdditionalManifestFiles')
+    if val:
+      if isinstance(val, list):
+        val = ';'.join(val)
+      attrs['AdditionalManifestFiles'] = val.replace('/', '\\')
+
+    val = attrs.get('CommandLine')
+    if val:
+      if isinstance(val, list):
+        val = '\r\n'.join(val)
+      attrs['CommandLine'] = val.replace('/', '\\')
+
+    val = attrs.get('PreprocessorDefinitions')
+    if val:
+      if isinstance(val, list):
+        val = ';'.join(val)
+      attrs['PreprocessorDefinitions'] = val
+
+    for a in ('ImportLibrary',
+              'ObjectFile',
+              'OutputFile',
+              'Outputs',
+              'XMLDocumentationFileName'):
+      val = attrs.get(a)
+      if val:
+        val = val.replace('/', '\\')
+        attrs[a] = val
+
     self.Name = Name
     self.attrs = attrs
 
@@ -453,7 +495,10 @@ class _MSVSProject(SCons.Node.FS.File):
                                  buildtargets = [],
                                  files = [],
                                  root_namespace = None,
-                                 relative_path_prefix = '',
+                                 keyword = None,
+                                 relative_path_prefix = None,
+                                 local_directory_prefix = None,
+                                 relative_path_substitutions = [],
                                  tools = None,
                                  configurations = None,
                                  **attrs):
@@ -511,14 +556,28 @@ class _MSVSProject(SCons.Node.FS.File):
       self.tool_files = []
       self.file_lists = []
       self.initialized = True
+      self.keyword = None
+      self.local_directory_prefix = ''
+      self.relative_path_prefix = ''
+      self.relative_path_substitutions = []
+      self.root_namespace = name
 
     self.attrs = attrs
     self.env = env
     self.guid = guid
     self.msvs_name = name
     self.msvs_path = path
-    self.relative_path_prefix = relative_path_prefix
-    self.root_namespace = root_namespace or self.msvs_name
+    if relative_path_prefix:
+      self.relative_path_prefix = relative_path_prefix
+    if local_directory_prefix:
+      self.local_directory_prefix = local_directory_prefix
+    for left, right in relative_path_substitutions:
+      t = (left.replace('/', '\\'), right.replace('/', '\\'))
+      self.relative_path_substitutions.append(t)
+    if root_namespace:
+      self.root_namespace = root_namespace
+    if keyword:
+      self.keyword = keyword
     self.tools = tools
 
     self.buildtargets.extend(buildtargets)
@@ -533,7 +592,7 @@ class _MSVSProject(SCons.Node.FS.File):
     for entry in entries:
       if SCons.Util.is_String(entry):
         entry = self.env.File(entry)
-        result.append(entry)
+        result.append(entry.srcnode())
       elif hasattr(entry, 'entries'):
         entry.entries = self.args2nodes(entry.entries)
         result.append(entry)
@@ -594,8 +653,16 @@ class _MSVSProject(SCons.Node.FS.File):
       return sln.rel_path(self).replace('/', '\\')
 
   def get_rel_path(self, node):
-      result = self.relative_path_prefix + self.rel_path(node)
-      return result.replace('/', '\\')
+      result = self.rel_path(node)
+      if self.relative_path_prefix:
+        if not result.startswith('..'):
+          result = self.relative_path_prefix + result
+      elif not os.path.split(result)[0]:
+        result = self.local_directory_prefix + result
+      result = result.replace('/', '\\')
+      for left, right in self.relative_path_substitutions:
+        result = result.replace(left, right)
+      return result
 
   def AddConfig(self, Name, tools=None, **attrs):
     """Adds a configuration to the parent node.
@@ -710,7 +777,8 @@ class _MSVSProject(SCons.Node.FS.File):
     root.setAttribute('Name', self.msvs_name)
     root.setAttribute('ProjectGUID', self.get_guid())
     root.setAttribute('RootNamespace', self.root_namespace)
-    root.setAttribute('Keyword', 'Win32Proj')
+    if self.keyword:
+      root.setAttribute('Keyword', self.keyword)
 
     # Add platform list
     platforms = self.doc.createElement('Platforms')
@@ -1095,6 +1163,11 @@ class _MSVSProject(SCons.Node.FS.File):
           'Name',
           'DisableSpecificWarnings',
 
+          'AdditionalIncludeDirectories',
+          'Description',
+          'CommandLine',
+          'OutputFile',
+          'ImportLibrary',
           'PreprocessorDefinitions',
           'UsePrecompiledHeader',
           'PrecompiledHeaderThrough',
@@ -1178,7 +1251,7 @@ MSVSSolutionAction = SCons.Script.Action(MSVSAction,
 class _MSVSSolution(SCons.Node.FS.File):
   """Visual Studio solution."""
 
-  def initialize(self, env, path, entries = None, variants = None, websiteProperties = True):
+  def initialize(self, env, path, entries=None, variants=None, websiteProperties=True):
     """Initializes the solution.
 
     Args:
@@ -1370,8 +1443,19 @@ def MSVSSolution(env, item, *args, **kw):
   LookupAdd(item, result)
   return result
 
+class Derived(SCons.Util.Proxy):
+  def srcnode(self, *args, **kw):
+    return self
+  def __getattr__(self, name):
+    if name == 'sources':
+      return []
+    return SCons.Util.Proxy.__getattr__(self, name)
+  def __hash__(self, *args, **kw):
+    return id(self)
+
 import __builtin__
 
+__builtin__.Derived = Derived
 __builtin__.MSVSConfig = MSVSConfig
 __builtin__.MSVSFilter = MSVSFilter
 __builtin__.MSVSProject = MSVSProject

site_scons/site_tools/chromium_builders.py

@@ -53,41 +53,57 @@ class ChromeFileList(MSVS.FileList):
 import __builtin__
 __builtin__.ChromeFileList = ChromeFileList
 
-def compilable_files(sources):
+non_compilable_suffixes = {
+    'LINUX' : set([
+        '.h',
+        '.dat',
+        '.rc',
+    ]),
+    'WINDOWS' : set([
+        '.h',
+        '.dat',
+    ]),
+}
+
+def compilable(env, file):
+  base, ext = os.path.splitext(str(file))
+  if ext in non_compilable_suffixes[env['TARGET_PLATFORM']]:
+    return False
+  return True
+
+def compilable_files(env, sources):
   if not hasattr(sources, 'entries'):
-    return [x for x in sources if not str(x).endswith('.h')
-                               and not str(x).endswith('.dat')]
+    return [x for x in sources if compilable(env, x)]
   result = []
   for top, folders, nonfolders in MSVS.FileListWalk(sources):
-    result.extend([x for x in nonfolders if not str(x).endswith('.h')
-                                         and not str(x).endswith('.dat')])
+    result.extend([x for x in nonfolders if compilable(env, x)])
   return result
 
 def ChromeProgram(env, target, source, *args, **kw):
-  source = compilable_files(source)
+  source = compilable_files(env, source)
   result = env.ComponentProgram(target, source, *args, **kw)
   if env.get('INCREMENTAL'):
     env.Precious(result)
   return result
 
 def ChromeTestProgram(env, target, source, *args, **kw):
-  source = compilable_files(source)
+  source = compilable_files(env, source)
   result = env.ComponentTestProgram(target, source, *args, **kw)
   if env.get('INCREMENTAL'):
     env.Precious(*result)
   return result
 
 def ChromeLibrary(env, target, source, *args, **kw):
-  source = compilable_files(source)
+  source = compilable_files(env, source)
   return env.ComponentLibrary(target, source, *args, **kw)
 
 def ChromeStaticLibrary(env, target, source, *args, **kw):
-  source = compilable_files(source)
+  source = compilable_files(env, source)
   kw['COMPONENT_STATIC'] = True
   return env.ComponentLibrary(target, source, *args, **kw)
 
 def ChromeSharedLibrary(env, target, source, *args, **kw):
-  source = compilable_files(source)
+  source = compilable_files(env, source)
   kw['COMPONENT_STATIC'] = False
   result = [env.ComponentLibrary(target, source, *args, **kw)[0]]
   if env.get('INCREMENTAL'):

skia/SConscript

@@ -370,11 +370,11 @@ input_files = ChromeFileList([
   ]),
 
   MSVSFilter('ext', [
-    'ext/convolver.cc',
-    'ext/convolver.h',
     'ext/bitmap_platform_device.h',
     'ext/bitmap_platform_device_win.cc',
     'ext/bitmap_platform_device_win.h',
+    'ext/convolver.cc',
+    'ext/convolver.h',
     'ext/google_logging.cc',
     'ext/image_operations.cc',
     'ext/image_operations.h',
@@ -468,6 +468,7 @@ env.ChromeLibrary('skia', input_files)
 p = env.ChromeMSVSProject('skia.vcproj',
                           dest='$CHROME_SRC_DIR/skia/skia.vcproj',
                           guid='{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}',
+                          keyword='Win32Proj',
                           files=input_files,
                           relative_path_prefix=r'./',
                           tools = [

testing/SConscript.gtest

@@ -57,9 +57,9 @@ input_files = ChromeFileList([
       'gtest/include/gtest/internal/gtest-type-util.h',
     ]),
   ]),
-  'multiprocess_func_list.cc',
-  'multiprocess_func_list.h',
-  'platform_test.h',
+    'multiprocess_func_list.cc',
+    'multiprocess_func_list.h',
+    'platform_test.h',
 ])
 
 env.ChromeLibrary('gtest', input_files)
@@ -67,6 +67,7 @@ env.ChromeLibrary('gtest', input_files)
 p = env.ChromeMSVSProject('gtest.vcproj',
                           dest='$CHROME_SRC_DIR/testing/gtest.vcproj',
                           guid='{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}',
+                          keyword='Win32Proj',
                           files=input_files,
                           relative_path_prefix=r'./',
                           tools = [

third_party/libpng/libpng.scons

@@ -65,8 +65,10 @@ input_files = ChromeFileList([
 env.ChromeLibrary('libpng', input_files)
 
 p = env.ChromeMSVSProject('libpng.vcproj',
-                          dest='$CHROME_SRC_DIR/third_party/libpng/libpng.vcproj',
+                          dest=('$CHROME_SRC_DIR/third_party/'
+                                + 'libpng/libpng.vcproj'),
                           guid='{C564F145-9172-42C3-BFCB-6014CA97DBCD}',
+                          keyword='Win32Proj',
                           files=input_files,
                           relative_path_prefix='./',
                           tools = [

third_party/zlib/zlib.scons

@@ -83,6 +83,7 @@ env.ChromeLibrary('zlib', input_files)
 p = env.ChromeMSVSProject('zlib.vcproj',
                           dest='$CHROME_SRC_DIR/third_party/zlib/zlib.vcproj',
                           guid='{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}',
+                          keyword='Win32Proj',
                           files=input_files,
                           relative_path_prefix=r'./',
                           tools = [