Resubmit r7826 after fixing breakages:...

net/dump_cache.scons

Index: net/dump_cache.scons
===================================================================
--- net/dump_cache.scons	(revision 7850)
+++ net/dump_cache.scons	(working copy)
@@ -23,21 +23,66 @@
       ],
   )
 
-input_files = [
+input_files = ChromeFileList([
     'tools/dump_cache/dump_cache.cc',
     'tools/dump_cache/dump_files.cc',
     'tools/dump_cache/upgrade.cc',
-]
+])
 
 
 if env.Bit('windows'):
 
   env.ChromeTestProgram('dump_cache', input_files)
 
-env.ChromeMSVSProject('$NET_DIR/build/dump_cache.vcproj',
-                dependencies = [
-                    '$BASE_DIR/build/base.vcproj',
-                    '$ICU38_DIR/build/icu.vcproj',
-                    '$NET_DIR/build/net.vcproj',
-                ],
-                guid='{4A14E455-2B7C-4C0F-BCC2-35A9666C186F}')
+p = env.ChromeMSVSProject('$NET_DIR/build/dump_cache.vcproj',
+                          guid='{4A14E455-2B7C-4C0F-BCC2-35A9666C186F}',
+                          dependencies = [
+                              '$BASE_DIR/build/base.vcproj',
+                              '$ICU38_DIR/build/icu.vcproj',
+                              '$NET_DIR/build/net.vcproj',
+                          ],
+                          # TODO: restore when we can derive all info,
+                          # on all platforms, from the windows build targets.
+                          #buildtargets=TODO,
+                          files=input_files,
+                          tools=[
+                              'VCPreBuildEventTool',
+                              'VCCustomBuildTool',
+                              'VCXMLDataGeneratorTool',
+                              'VCWebServiceProxyGeneratorTool',
+                              'VCMIDLTool',
+                              'VCCLCompilerTool',
+                              'VCManagedResourceCompilerTool',
+                              'VCResourceCompilerTool',
+                              'VCPreLinkEventTool',
+                              MSVSTool('VCLinkerTool',
+                                       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',
+            ])
+
+p.AddConfig('Release|Win32',
+            InheritedPropertySheets=[
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+            ])
+
+env.AlwaysBuild(p)
+
+i = env.Command('$CHROME_SRC_DIR/net/build/dump_cache.vcproj', p,
+                Copy('$TARGET', '$SOURCE'))
+Alias('msvs', i)