1 files changed, 15 insertions, 73 deletions
diff --git a/net/net_perftests.scons b/net/net_perftests.scons
index 5f0529a..c2b16a2 100644
--- a/net/net_perftests.scons
+++ b/net/net_perftests.scons
@@ -37,85 +37,27 @@ elif env.Bit('linux'):
       CCFLAGS = ['-fno-strict-aliasing'],
   )
 
-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', [
-    '../base/perftimer$OBJSUFFIX',
-    '../base/run_all_perftests$OBJSUFFIX',
-  ]),
-  MSVSFilter('tests', [
+input_files = [
     'base/cookie_monster_perftest.cc',
     'disk_cache/disk_cache_perftest.cc',
     'disk_cache/disk_cache_test_util$OBJSUFFIX',
-  ]),
-])
+
+    # TODO(sgk): avoid using .cc from base directly
+    '$OBJ_ROOT/base/run_all_perftests$OBJSUFFIX',
+    '$OBJ_ROOT/base/perftimer$OBJSUFFIX',
+]
 
 if not env.Bit('mac'):
   env.ChromeTestProgram('net_perftests', input_files)
 
 env.ChromeMSVSProject('$NET_DIR/build/net_perftests.vcproj',
+                dependencies = [
+                    '$BASE_DIR/build/base.vcproj',
+                    '$NET_DIR/build/net.vcproj',
+                    '$MODP_B64_DIR/modp_b64.vcproj',
+                    '$ICU38_DIR/build/icu.vcproj',
+                    '$TESTING_DIR/gtest.vcproj',
+                    '$GOOGLEURL_DIR/build/googleurl.vcproj',
+                    '$SDCH_DIR/sdch.vcproj',
+                ],
                 guid='{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}')
-
-# TODO########################################################################
-
-p = env.ChromeMSVSProject('$NET_DIR/build/net_perftests.vcproj',
-                          guid='{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}',
-                          dependencies = [
-                              '$BASE_DIR/build/base.vcproj',
-                              '$NET_DIR/build/net.vcproj',
-                              '$MODP_B64_DIR/modp_b64.vcproj',
-                              '$ICU38_DIR/build/icu.vcproj',
-                              '$TESTING_DIR/gtest.vcproj',
-                              '$GOOGLEURL_DIR/build/googleurl.vcproj',
-                              '$SDCH_DIR/sdch.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',
-                              # TODO(sgk):  pull this from CPPDEFINES.
-                              MSVSTool('VCCLCompilerTool',
-                                       PreprocessorDefinitions='PERF_TEST'),
-                              '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)../testing/using_gtest.vsprops',
-            ])
-
-p.AddConfig('Release|Win32',
-            InheritedPropertySheets=[
-                '$(SolutionDir)../build/common.vsprops',
-                '$(SolutionDir)../build/release.vsprops',
-                '$(SolutionDir)../testing/using_gtest.vsprops',
-            ])
-
-env.AlwaysBuild(p)
-
-i = env.Command('$CHROME_SRC_DIR/net/build/net_perftests.vcproj', p,
-                Copy('$TARGET', '$SOURCE'))
-Alias('msvs', i)