Porting changes in chrome/{browser,common}, also enabling more unit tests....

chrome/browser/SConscript

Index: chrome/browser/SConscript
===================================================================
--- chrome/browser/SConscript	(revision 2402)
+++ chrome/browser/SConscript	(working copy)
@@ -60,13 +60,28 @@
 if env['PLATFORM'] in ('posix', 'win32'):
   # TODO: Port to Mac.
   input_files.extend([
+      'browser_process.cc',
+      'cancelable_request.cc',
+      'chrome_thread.cc',
+      'cross_site_request_manager.cc',
+      'google_url_tracker.cc',
+      'google_util.cc',
+      'meta_table_helper.cc',
+      'metrics_response.cc',
+      'net/dns_host_info.cc',
+      'page_state.cc',
+      'printing/page_number.cc',
       'printing/page_setup.cc',
+      'printing/page_range.cc',
       'printing/units.cc',
-      'net/dns_host_info.cc',
+      'renderer_security_policy.cc',
       'safe_browsing/bloom_filter.cc',
       'safe_browsing/chunk_range.cc',
       'safe_browsing/protocol_parser.cc',
       'safe_browsing/safe_browsing_util.cc',
+      'session_startup_pref.cc',
+      'url_fetcher_protect.cc',
+      'user_metrics.cc',
   ])
 
 if env['PLATFORM'] == 'win32':
@@ -105,7 +120,6 @@
       'browser_list.cc',
       'browser_main.cc',
       'browser_prefs.cc',
-      'browser_process.cc',
       'browser_process_impl.cc',
       'browser_shutdown.cc',
       'browser_url_handler.cc',
@@ -113,14 +127,11 @@
       'browsing_data_remover.cc',
       'browsing_instance.cc',
       'cache_manager_host.cc',
-      'cancelable_request.cc',
       'cert_store.cc',
       'character_encoding.cc',
       'chrome_plugin_browsing_context.cc',
       'chrome_plugin_host.cc',
-      'chrome_thread.cc',
       'controller.cc',
-      'cross_site_request_manager.cc',
       'dom_ui/chrome_url_data_manager.cc',
       'dom_ui/dom_ui_host.cc',
       'dom_ui/html_dialog_contents.cc',
@@ -148,8 +159,6 @@
       'frame_util.cc',
       'frame_view.cc',
       'gears_integration.cc',
-      'google_url_tracker.cc',
-      'google_util.cc',
       'hang_monitor/hung_plugin_action.cc',
       'hang_monitor/hung_window_detector.cc',
       'history/archived_database.cc',
@@ -187,9 +196,7 @@
       'jsmessage_box_handler.cc',
       'login_prompt.cc',
       'memory_details.cc',
-      'meta_table_helper.cc',
       'metrics_log.cc',
-      'metrics_response.cc',
       'metrics_service.cc',
       'modal_html_dialog_delegate.cc',
       'mork_reader.cc',
@@ -202,16 +209,13 @@
       'network_status_view.cc',
       'google_update.cc',
       'page_info_window.cc',
-      'page_state.cc',
       'password_form_manager.cc',
       'password_manager.cc',
       'plugin_installer.cc',
       'plugin_process_host.cc',
       'plugin_service.cc',
       'point_buffer.cc',
-      'printing/page_number.cc',
       'printing/page_overlays.cc',
-      'printing/page_range.cc',
       'printing/print_job.cc',
       'printing/print_job_manager.cc',
       'printing/print_job_worker.cc',
@@ -232,7 +236,6 @@
       'render_widget_helper.cc',
       'render_widget_host.cc',
       'render_widget_host_hwnd.cc',
-      'renderer_security_policy.cc',
       'repost_Form_warning_dialog.cc',
       'resource_dispatcher_host.cc',
       'resource_message_filter.cc',
@@ -251,7 +254,6 @@
       'session_crashed_view.cc',
       'session_restore.cc',
       'session_service.cc',
-      'session_startup_pref.cc',
       'shell_integration.cc',
       'simple_vista_frame.cc',
       'simple_xp_frame.cc',
@@ -287,10 +289,8 @@
       'title_chomper.cc',
       'toolbar_model.cc',
       'url_fetcher.cc',
-      'url_fetcher_protect.cc',
       'url_fixer_upper.cc',
       'user_data_dir_dialog.cc',
-      'user_metrics.cc',
       'view_source_contents.cc',
       'visitedlink_master.cc',
       'vista_frame.cc',