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

8 files changed, 59 insertions, 57 deletions

diff --git a/chrome/SConscript b/chrome/SConscript
index 958d8ab..79f82f3 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -102,6 +102,7 @@ env_dll.Append(
         'breakpad_handler',
         'googleurl',
         'net',
+        'sdch',
         'skia',
         'bzip2',
         env_dll['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
@@ -174,6 +175,7 @@ input_files = []
 if env_dll['PLATFORM'] == 'win32':
   input_files.extend([
       'app/chrome_dll_main.cc',
+      '$V8_DIR/snapshot-empty$OBJSUFFIX',
   ])
 
 libs = [
@@ -186,11 +188,11 @@ libs = [
     'plugin/plugin.lib',
     'renderer/renderer.lib',
     'third_party/hunspell/hunspell.lib',
-    'third_party/libevent/libevent.lib',
+    # TODO(sgk):  libevent isn't used on Windows, revisit when Linux gets here
+    #'third_party/libevent/libevent.lib',
     'third_party/sqlite/sqlite.lib',
     'views/views.lib',
     '$V8_DIR/v8.lib',
-    '$V8_DIR/snapshot-empty$OBJSUFFIX',
 ]
 
 
@@ -239,7 +241,8 @@ if env_dll['PLATFORM'] == 'win32':
 
   def chrome_version_emitter(target, source, env):
       source.append('$CHROME_SRC_DIR/VERSION')
-      source.append('$CHROME_SRC_DIR/BRANDING')
+      # TODO(sgk):  parameterize for chromium-vs.-google_chrome
+      source.append('$CHROME_SRC_DIR/app/theme/google_chrome/BRANDING')
       return target, source
 
   b = Builder(action = '$CHROME_VERSION_RC_COM',
diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests
index 60a0603..4a89250 100644
--- a/chrome/SConscript.ui_tests
+++ b/chrome/SConscript.ui_tests
@@ -37,6 +37,7 @@ env_test.Prepend(
         'libpng',
         'npapi_layout_test_plugin',
         'gtest',
+        'sdch',
         'base_gfx',
         env_test['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
         'zlib',
@@ -86,7 +87,8 @@ ui_test_files = [
     'app/chrome_main_uitest.cc',
     'browser/browser_uitest.cc',
     'browser/crash_recovery_uitest.cc',
-    'browser/download_uitest.cc',
+    'browser/download/download_uitest.cc',
+    'browser/download/save_page_uitest.cc',
     'browser/errorpage_uitest.cc',
     'browser/find_in_page_controller_uitest.cc',
     'browser/history/redirect_uitest.cc',
@@ -99,7 +101,6 @@ ui_test_files = [
     'browser/printing/printing_layout_uitest.cc',
     'browser/resource_dispatcher_host_uitest.cc',
     'browser/sanity_uitest.cc',
-    'browser/save_page_uitest.cc',
     'browser/session_history_uitest.cc',
     'browser/session_restore_uitest.cc',
     'browser/ssl_uitest.cc',
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',
diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript
index 71d4fd3..1efc99d 100644
--- a/chrome/browser/SConscript
+++ b/chrome/browser/SConscript
@@ -109,10 +109,10 @@ if env['PLATFORM'] == 'win32':
       'back_forward_menu_model.cc',
       'base_history_model.cc',
       'bookmark_bar_context_menu_controller.cc',
-      'bookmarks/bookmark_bar_model.cc',
       'bookmarks/bookmark_codec.cc',
-      'bookmarks/bookmark_storage.cc',
       'bookmarks/bookmark_drag_data.cc',
+      'bookmarks/bookmark_model.cc',
+      'bookmarks/bookmark_storage.cc',
       'browser.cc',
       'browser_about_handler.cc',
       'browser_commands.cc',
@@ -136,28 +136,26 @@ if env['PLATFORM'] == 'win32':
       'dom_ui/dom_ui_host.cc',
       'dom_ui/html_dialog_contents.cc',
       'dom_ui/new_tab_ui.cc',
-      'download_exe.cc',
-      'download_file.cc',
-      'download_item_model.cc',
-      'download_manager.cc',
-      'download_tab_view.cc',
-      'download_util.cc',
+      'download/download_exe.cc',
+      'download/download_file.cc',
+      'download/download_item_model.cc',
+      'download/download_manager.cc',
+      'download/download_util.cc',
+      'download/save_file.cc',
+      'download/save_file_manager.cc',
+      'download/save_item.cc',
+      'download/save_package.cc',
+      'download/save_page_model.cc',
       'drag_utils.cc',
       'encoding_menu_controller_delegate.cc',
       'encryptor.cc',
-      'external_protocol_dialog.cc',
       'external_protocol_handler.cc',
       'external_tab_container.cc',
       'fav_icon_helper.cc',
       'find_in_page_controller.cc',
       'find_in_page_view.cc',
-      'firefox2_importer.cc',
-      'firefox3_importer.cc',
-      'firefox_importer_utils.cc',
-      'firefox_profile_lock.cc',
       'first_run.cc',
       'frame_util.cc',
-      'frame_view.cc',
       'gears_integration.cc',
       'hang_monitor/hung_plugin_action.cc',
       'hang_monitor/hung_window_detector.cc',
@@ -187,9 +185,14 @@ if env['PLATFORM'] == 'win32':
       'icon_loader.cc',
       'icon_manager.cc',
       'ie7_password.cc',
-      'ie_importer.cc',
       'ime_input.cc',
-      'importer.cc',
+      'importer/firefox2_importer.cc',
+      'importer/firefox3_importer.cc',
+      'importer/firefox_importer_utils.cc',
+      'importer/firefox_profile_lock.cc',
+      'importer/ie_importer.cc',
+      'importer/importer.cc',
+      'importer/mork_reader.cc',
       'ipc_status_view.cc',
       'jankometer.cc',
       'js_before_unload_handler.cc',
@@ -199,22 +202,20 @@ if env['PLATFORM'] == 'win32':
       'metrics_log.cc',
       'metrics_service.cc',
       'modal_html_dialog_delegate.cc',
-      'mork_reader.cc',
       'native_ui_contents.cc',
       'navigation_controller.cc',
       'navigation_entry.cc',
       'net/dns_global.cc',
       'net/dns_master.cc',
       'net/dns_slave.cc',
+      'net/sdch_dictionary_fetcher.cc',
       'network_status_view.cc',
       'google_update.cc',
-      'page_info_window.cc',
       'password_form_manager.cc',
       'password_manager.cc',
       'plugin_installer.cc',
       'plugin_process_host.cc',
       'plugin_service.cc',
-      'point_buffer.cc',
       'printing/page_overlays.cc',
       'printing/print_job.cc',
       'printing/print_job_manager.cc',
@@ -243,20 +244,14 @@ if env['PLATFORM'] == 'win32':
       'safe_browsing/protocol_manager.cc',
       'safe_browsing/safe_browsing_blocking_page.cc',
       'safe_browsing/safe_browsing_database.cc',
+      'safe_browsing/safe_browsing_database_impl.cc',
       'safe_browsing/safe_browsing_service.cc',
       'sandbox_policy.cc',
-      'save_file.cc',
-      'save_file_manager.cc',
-      'save_item.cc',
-      'save_package.cc',
-      'save_page_model.cc',
       'session_backend.cc',
       'session_crashed_view.cc',
       'session_restore.cc',
       'session_service.cc',
       'shell_integration.cc',
-      'simple_vista_frame.cc',
-      'simple_xp_frame.cc',
       'site_instance.cc',
       'spellcheck_worditerator.cc',
       'spellchecker.cc',
@@ -267,16 +262,9 @@ if env['PLATFORM'] == 'win32':
       'status_view.cc',
       'suspend_controller.cc',
       'tab_contents.cc',
-      'tab_contents_container_view.cc',
       'tab_contents_factory.cc',
       'tab_restore_service.cc',
       'tab_util.cc',
-      'tabs/dragged_tab_controller.cc',
-      'tabs/dragged_tab_view.cc',
-      'tabs/hwnd_photobooth.cc',
-      'tabs/tab.cc',
-      'tabs/tab_renderer.cc',
-      'tabs/tab_strip.cc',
       'tabs/tab_strip_model.cc',
       'tabs/tab_strip_model_order_controller.cc',
       'task_manager.cc',
@@ -286,14 +274,11 @@ if env['PLATFORM'] == 'win32':
       'template_url_model.cc',
       'template_url_parser.cc',
       'template_url_prepopulate_data.cc',
-      'title_chomper.cc',
       'toolbar_model.cc',
       'url_fetcher.cc',
       'url_fixer_upper.cc',
-      'user_data_dir_dialog.cc',
       'view_source_contents.cc',
       'visitedlink_master.cc',
-      'vista_frame.cc',
       'web_app.cc',
       'web_app_icon_manager.cc',
       'web_app_launcher.cc',
@@ -302,10 +287,7 @@ if env['PLATFORM'] == 'win32':
       'web_drop_target.cc',
       'webdata/web_data_service.cc',
       'webdata/web_database.cc',
-      'window_clipping_info.cc',
       'window_sizer.cc',
-      'wizard/wizard.cc',
-      'xp_frame.cc',
   ])
 
 if env['PLATFORM'] in ('posix', 'win32'):
diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript
index 48b8f86..aec22cd 100644
--- a/chrome/browser/views/SConscript
+++ b/chrome/browser/views/SConscript
@@ -64,8 +64,10 @@ input_files = [
     'download_item_view.cc',
     'download_shelf_view.cc',
     'download_started_animation.cc',
+    'download_tab_view.cc',
     'edit_keyword_controller.cc',
     'event_utils.cc',
+    'external_protocol_dialog.cc',
     'first_run_bubble.cc',
     'first_run_customize_view.cc',
     'first_run_view.cc',
@@ -94,6 +96,12 @@ input_files = [
     'keyword_editor_view.cc',
     'location_bar_view.cc',
     'login_view.cc',
+    'old_frames/frame_view.cc',
+    'old_frames/point_buffer.cc',
+    'old_frames/simple_vista_frame.cc',
+    'old_frames/simple_xp_frame.cc',
+    'old_frames/vista_frame.cc',
+    'old_frames/xp_frame.cc',
     'options/advanced_contents_view.cc',
     'options/advanced_page_view.cc',
     'options/content_page_view.cc',
@@ -106,6 +114,7 @@ input_files = [
     'options/options_group_view.cc',
     'options/options_page_view.cc',
     'options/options_window_view.cc',
+    'page_info_window.cc',
     'password_manager_view.cc',
     'restart_message_box.cc',
     'sad_tab_view.cc',
@@ -113,10 +122,18 @@ input_files = [
     'shell_dialogs.cc',
     'star_toggle.cc',
     'status_bubble.cc',
+    'tabs/dragged_tab_controller.cc',
+    'tabs/dragged_tab_view.cc',
+    'tabs/hwnd_photobooth.cc',
+    'tabs/tab.cc',
+    'tabs/tab_renderer.cc',
+    'tabs/tab_strip.cc',
     'tab_icon_view.cc',
+    'tab_contents_container_view.cc',
     'theme_helpers.cc',
     'toolbar_star_toggle.cc',
     'toolbar_view.cc',
+    'user_data_dir_dialog.cc',
 ]
 
 env.ChromeStaticLibrary('browser_views', input_files)
diff --git a/chrome/common/SConscript b/chrome/common/SConscript
index ee658a3..7cc8c4d 100644
--- a/chrome/common/SConscript
+++ b/chrome/common/SConscript
@@ -105,6 +105,7 @@ if env['PLATFORM'] == 'win32':
       'logging_chrome.cc',
       'message_router.cc',
       'net/url_request_intercept_job.cc',
+      'notification_registrar.cc',
       'os_exchange_data.cc',
       'plugin_messages.cc',
       'pref_service.cc',
diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript
index 72c28df..b6a9975 100644
--- a/chrome/test/interactive_ui/SConscript
+++ b/chrome/test/interactive_ui/SConscript
@@ -71,16 +71,17 @@ env_test.Prepend(
 
 input_files = [
     '$CHROME_DIR/browser/browser_focus_uitest.cc',
+    '$CHROME_DIR/browser/views/bookmark_bar_view_test.cc',
     '$CHROME_DIR/browser/tabs/tab_dragging_test.cc',
     '$CHROME_DIR/browser/views/constrained_window_impl_interactive_uitest.cc',
     '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
     '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
     '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
     '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
+    'view_event_test_base.cc',
 ]
 
 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/views/SConscript b/chrome/views/SConscript
index a34067d..3963a77 100644
--- a/chrome/views/SConscript
+++ b/chrome/views/SConscript
@@ -52,8 +52,6 @@ input_files = [
     'event.cc',
     'external_focus_tracker.cc',
     'focus_manager.cc',
-    # This was in the Visual Studio build, but seems unnecessary.
-    #'focus_manager_unittest.cc',
     'grid_layout.cc',
     'group_table_view.cc',
     'hwnd_view.cc',