12 files changed, 15 insertions, 30 deletions
diff --git a/chrome/SConscript b/chrome/SConscript
index 3acbd63..92f24cd 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -304,9 +304,9 @@ env_exe.Append(
 )
 
 chrome_exe = env_exe.ChromeProgram(
-    ['chrome.exe',
+    ['chrome',
      'chrome_exe.pdb',
-     'chrome_exe_implib.lib'],
+    ],
     [
         env_res.RES('app/chrome_exe.rc'),
         'app/breakpad.cc',
diff --git a/chrome/SConscript.automated_ui_tests b/chrome/SConscript.automated_ui_tests
index 68eb118..9f73ce8 100644
--- a/chrome/SConscript.automated_ui_tests
+++ b/chrome/SConscript.automated_ui_tests
@@ -103,7 +103,7 @@ test_files = [
     '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
 ]
 
-exe = env_test.ChromeTestProgram('automated_ui_tests.exe',  test_files + libs)
+exe = env_test.ChromeTestProgram('automated_ui_tests',  test_files + libs)
 
 i = env_test.Install('$TARGET_ROOT', exe)
 Alias('chrome', i)
diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests
index 234e7e6..687ad79 100644
--- a/chrome/SConscript.ui_tests
+++ b/chrome/SConscript.ui_tests
@@ -154,7 +154,7 @@ ui_test_files = [
     '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
 ]
 
-ui_tests = env_test.ChromeTestProgram('ui_tests.exe',  ui_test_files + libs)
+ui_tests = env_test.ChromeTestProgram('ui_tests',  ui_test_files + libs)
 
 i = env_test.Install('$TARGET_ROOT', ui_tests)
 Alias('chrome', i)
diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests
index 78f6728..a20e8ea 100644
--- a/chrome/SConscript.unit_tests
+++ b/chrome/SConscript.unit_tests
@@ -238,7 +238,7 @@ unit_test_files = [
     env_test['TEST_DATA_RES'],
 ]
 
-unit_tests = env_test.ChromeTestProgram('unit_tests.exe', unit_test_files + libs)
+unit_tests = env_test.ChromeTestProgram('unit_tests', unit_test_files + libs)
 
 i = env_test.Install('$TARGET_ROOT', unit_tests)
 Alias('chrome', i)
diff --git a/chrome/common/SConscript b/chrome/common/SConscript
index 0872dcb..6543cfe 100644
--- a/chrome/common/SConscript
+++ b/chrome/common/SConscript
@@ -184,7 +184,7 @@ libs = [
     'common.lib',
 ]
 
-ipc_tests = env_test.ChromeTestProgram('ipc_tests.exe', ipc_tests_files + libs)
+ipc_tests = env_test.ChromeTestProgram('ipc_tests', ipc_tests_files + libs)
 
 i = env_test.Install('$TARGET_ROOT', ipc_tests)
 Alias('chrome', i)
diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript
index de779f3..104f4a4 100644
--- a/chrome/installer/mini_installer/SConscript
+++ b/chrome/installer/mini_installer/SConscript
@@ -97,10 +97,8 @@ input_files = [
     "pe_resource.cc",
 ]
 
-exe = env.ChromeProgram(['mini_installer',
-                   'mini_installer.pdb',
-                   'mini_installer.map'],
-                  components + resources + input_files)
+exe = env.ChromeProgram('mini_installer',
+                        components + resources + input_files)
 i = env.Install('$TARGET_ROOT', exe)
 env.Alias('chrome', i)
 
@@ -179,9 +177,7 @@ libs = [
     '../util/util.lib',
 ]
 
-exe = env_test.ChromeTestProgram(['installer_unittests',
-                        'installer_unittests.pdb'],
-                       input_files + libs)
+exe = env_test.ChromeTestProgram('installer_unittests', input_files + libs)
 i = env_test.Install('$TARGET_ROOT', exe)
 
 env.Alias('chrome', i)
diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript
index 1a72d45..efa20505 100644
--- a/chrome/installer/setup/SConscript
+++ b/chrome/installer/setup/SConscript
@@ -106,10 +106,7 @@ libs = [
     '../util/util.lib',
 ]
 
-exe = env.ChromeProgram(['setup',
-                   'setup.pdb',
-                   'setup.map'],
-                  resources + input_files + libs)
+exe = env.ChromeProgram('setup', resources + input_files + libs)
 i = env.Install('$TARGET_ROOT', exe)
 
 env.Alias('chrome', i)
diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript
index 65bd64f..0bdafc6 100644
--- a/chrome/test/interactive_ui/SConscript
+++ b/chrome/test/interactive_ui/SConscript
@@ -104,9 +104,7 @@ input_files = [
     '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
 ]
 
-exe = env_test.ChromeTestProgram(['interactive_ui_tests',
-                        'interactive_ui_tests.pdb'],
-                       input_files)
+exe = env_test.ChromeTestProgram('interactive_ui_tests', input_files)
 i = env_test.Install('$TARGET_ROOT', exe)
 
 env_test.Alias('chrome', i)
diff --git a/chrome/test/page_cycler/SConscript b/chrome/test/page_cycler/SConscript
index 03bc415..3e3569f 100644
--- a/chrome/test/page_cycler/SConscript
+++ b/chrome/test/page_cycler/SConscript
@@ -98,9 +98,7 @@ input_files = [
     'page_cycler_test.cc',
 ]
 
-exe = env_test.ChromeTestProgram(['page_cycler_tests',
-                        'page_cycler_tests.pdb'],
-                       input_files)
+exe = env_test.ChromeTestProgram('page_cycler_tests', input_files)
 i = env_test.Install('$TARGET_ROOT', exe)
 
 env_test.Alias('chrome', i)
diff --git a/chrome/tools/crash_service/SConscript b/chrome/tools/crash_service/SConscript
index d650ced..b40e60c 100644
--- a/chrome/tools/crash_service/SConscript
+++ b/chrome/tools/crash_service/SConscript
@@ -72,7 +72,7 @@ input_files = [
     'crash_service.cc',
 ]
 
-exe = env.ChromeProgram('crash_service.exe', input_files)
+exe = env.ChromeProgram('crash_service', input_files)
 
 i = env.Install('$TARGET_ROOT', exe)
 Alias('chrome', i)
diff --git a/chrome/tools/perf/flush_cache/SConscript b/chrome/tools/perf/flush_cache/SConscript
index c0b6fa3..3deebe7 100644
--- a/chrome/tools/perf/flush_cache/SConscript
+++ b/chrome/tools/perf/flush_cache/SConscript
@@ -64,9 +64,7 @@ input_files = [
     'flush_cache.cc',
 ]
 
-exe = env_test.ChromeTestProgram(['flush_cache',
-                        'flush_cache'],
-                       input_files)
+exe = env_test.ChromeTestProgram('flush_cache', input_files)
 i = env_test.Install('$TARGET_ROOT', exe)
 
 env_test.Alias('chrome', i)
diff --git a/chrome/tools/test/image_diff/SConscript b/chrome/tools/test/image_diff/SConscript
index 55584dd..b62a794 100644
--- a/chrome/tools/test/image_diff/SConscript
+++ b/chrome/tools/test/image_diff/SConscript
@@ -76,9 +76,7 @@ input_files = [
     'image_diff.cc',
 ]
 
-exe = env_test.ChromeTestProgram(['image_diff',
-                        'image_diff.pdb'],
-                       input_files)
+exe = env_test.ChromeTestProgram('image_diff', input_files)
 i = env_test.Install('$TARGET_ROOT', exe)
 
 env_test.Alias('chrome', i)