Accumulated SCons changes for Windows chrome build and other

recent additions (doesn't fix everything, but gets significant
pieces back on track).
* New/additional library dependencies in various test executables
  (too many to be worth listing).
* Portability:  put library base names in $LIBS instead of explicitly
  listing .lib files.
* Have interactive_ui re-use various object files from test/ui
  instead of (re-)listing the .cc files.
* Add new files:
  chrome\browser\bookmarks\bookmark_drag_data.cc
  chrome\browser\bookmarks\bookmark_drag_utils.cc
  chrome\browser\bookmarks\bookmark_table_model.cc
  chrome\browser\browser_trial.cc
  chrome\browser\download\download_request_manager_unittest.cc
  chrome\browser\greasmonkey_master.cc
  chrome\browser\spellcheck_unittest.cc
  chrome\browser\views\find_bar_view.cc
  chrome\browser\views\find_bar_win.cc
  chrome\renderer\greasemonkey_slave.cc
* Remove old files:
  chrome\browser\find_in_page_controller.cc
  chrome\browser\find_in_page_view.cc
  chrome\renderer\spellcheck_unittest.cc
* Remove relative reference to ../../app/google_update_settings$OBJSUFFIX.
* Get rid of by-hand /IMPLIB and /MAP flags.
* Prefix / suffix portability in the jscre library.
* Rename $LIBXML_DIR/scons => $LIBXML_DIR/DerivedSources.
* Add $CHROME_DIR/app/resources to CPPPATH.
* Add icu38 directories to CPPPATH for building chrome/views files.
Review URL: http://codereview.chromium.org/8725

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

1 files changed, 17 insertions, 22 deletions

diff --git a/chrome/SConscript.automated_ui_tests b/chrome/SConscript.automated_ui_tests
index b4b15bb..e8a973d 100644
--- a/chrome/SConscript.automated_ui_tests
+++ b/chrome/SConscript.automated_ui_tests
@@ -24,19 +24,27 @@ env_test.Prepend(
         'LIBXML_STATIC',
     ],
     LIBS = [
-        'libxml',
+        'automation',
+        'base',
+        'base_gfx',
+        'browser',
+        'browser_views',
+        'common',
         'googleurl',
-        'skia',
-        'libpng',
         'gtest',
-        'base_gfx',
         env_test['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
+        'libpng',
+        'libxml',
+        'modp_b64',
+        'net',
+        'skia',
         'zlib',
-        'base',
-    ],
-)
 
-env_test.Prepend(
+        'comsupp',
+        'oleacc',
+        'psapi',
+        'rpcrt4',
+    ],
     LINKFLAGS = [
         '/INCREMENTAL',
 
@@ -54,21 +62,8 @@ env_test.Prepend(
         '/MACHINE:X86',
         '/FIXED:No',
     ],
-    LIBS = [
-        'comsupp.lib',
-        'oleacc.lib',
-        'psapi.lib',
-        'rpcrt4.lib',
-    ],
 )
 
-libs = [
-    'common/common.lib',
-    'browser/browser.lib',
-    'browser/views/browser_views.lib',
-    'test/automation/automation.lib',
-]
-
 test_files = [
     'test/automated_ui_tests/automated_ui_tests.cc',
     '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
@@ -78,7 +73,7 @@ test_files = [
     '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
 ]
 
-exe = env_test.ChromeTestProgram('automated_ui_tests',  test_files + libs)
+exe = env_test.ChromeTestProgram('automated_ui_tests',  test_files)
 
 i = env_test.Install('$TARGET_ROOT', exe)
 Alias('chrome', i)