Catch up SCons Windows build with recent file shuffling and other changes:

* New browser\download\ subdirectory.
* New browser\importer\ subdirectory.
* New browser\views\old_frames subdirectory.
* Add common/notification_registrar.cc.
* Remove title_chomper{,_unittest}.cc.
* Link against sdch where empirically necessary.
* No libevent.lib on Windows, comment out until Linux hits the .dll logic.
Review URL: http://codereview.chromium.org/4310

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

1 files changed, 9 insertions, 10 deletions

diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests
index 4178314..d860aea 100644
--- a/chrome/SConscript.unit_tests
+++ b/chrome/SConscript.unit_tests
@@ -53,6 +53,7 @@ env_test.Prepend(
         'libxml',
         'libxslt',
         'modp_b64',
+        'sdch',
         'skia',
         'v8',
         'zlib',
@@ -156,13 +157,13 @@ if env_test['PLATFORM'] == 'win32':
       'browser/autocomplete/keyword_provider_unittest.cc',
       'browser/back_forward_menu_model_unittest.cc',
       'browser/bookmark_bar_context_menu_controller_test.cc',
-      'browser/bookmarks/bookmark_bar_unittest.cc',
       'browser/bookmarks/bookmark_drag_data_unittest.cc',
+      'browser/bookmarks/bookmark_model_unittest.cc',
       'browser/cache_manager_host_unittest.cc',
       'browser/controller_unittest.cc',
-      'browser/download_manager_unittest.cc',
+      'browser/download/download_manager_unittest.cc',
+      'browser/download/save_package_unittest.cc',
       'browser/encryptor_unittest.cc',
-      'browser/firefox_importer_unittest.cc',
       'browser/google_url_tracker_unittest.cc',
       'browser/history/expire_history_backend_unittest.cc',
       'browser/history/history_backend_unittest.cc',
@@ -178,7 +179,8 @@ if env_test['PLATFORM'] == 'win32':
       'browser/history/url_database_unittest.cc',
       'browser/history/visit_database_unittest.cc',
       'browser/history/visit_tracker_unittest.cc',
-      'browser/importer_unittest.cc',
+      'browser/importer/firefox_importer_unittest.cc',
+      'browser/importer/importer_unittest.cc',
       'browser/metrics_log_unittest.cc',
       'browser/navigation_controller_unittest.cc',
       'browser/net/dns_master_unittest.cc',
@@ -193,7 +195,7 @@ if env_test['PLATFORM'] == 'win32':
       'browser/safe_browsing/bloom_filter_unittest.cc',
       'browser/safe_browsing/protocol_manager_unittest.cc',
       'browser/safe_browsing/safe_browsing_database_unittest.cc',
-      'browser/save_package_unittest.cc',
+      'browser/safe_browsing/safe_browsing_database_impl_unittest.cc',
       'browser/session_backend_unittest.cc',
       'browser/session_service_test_helper.cc',
       'browser/session_service_unittest.cc',
@@ -202,10 +204,8 @@ if env_test['PLATFORM'] == 'win32':
       'browser/template_url_model_unittest.cc',
       'browser/template_url_parser_unittest.cc',
       'browser/template_url_unittest.cc',
-      'browser/title_chomper_unittest.cc',
       'browser/url_fetcher_unittest.cc',
       'browser/url_fixer_upper_unittest.cc',
-      'browser/views/bookmark_bar_view_test.cc',
       'browser/views/bookmark_editor_view_unittest.cc',
       'browser/views/keyword_editor_view_unittest.cc',
       'browser/visitedlink_unittest.cc',
@@ -231,13 +231,12 @@ if env_test['PLATFORM'] == 'win32':
       'renderer/net/render_dns_master_unittest.cc',
       'renderer/net/render_dns_queue_unittest.cc',
       'renderer/spellcheck_unittest.cc',
+      'test/test_notification_tracker.cc',
+      'test/testing_profile.cc',
       'views/focus_manager_unittest.cc',
       'views/grid_layout_unittest.cc',
       'views/table_view_unittest.cc',
       'views/view_unittest.cc',
-      'test/test_notification_tracker.cc',
-      'test/testing_profile.cc',
-      'test/ui/view_event_test_base.cc',
       # Commented out for now because googleurl_tests doesn't build with
       # gtest; see ../build/SConscript.googleurl.
       #'$GOOGLEURL_DIR/googleurl_tests.lib',