Shuffle unit_tests.scons.

Add missing mock_render_process_host.*.
Remove focus_manager_unittest.cc duplicate entry in unit_tests.vcproj.
Review URL: http://codereview.chromium.org/18411

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

2 files changed, 167 insertions, 150 deletions

diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons
index f3643de..c9d94d2 100644
--- a/chrome/test/unit/unit_tests.scons
+++ b/chrome/test/unit/unit_tests.scons
@@ -111,25 +111,135 @@ if env.Bit('windows'):
   )
 
 input_files = ChromeFileList([
-  MSVSFilter('Common', [
-    '$CHROME_DIR/browser/browser_resources.h',
-    '$CHROME_DIR/browser/browser_resources.rc',
+  MSVSFilter('browser', [
+    '$CHROME_DIR/browser/autocomplete/autocomplete_unittest.cc',
+    '$CHROME_DIR/browser/back_forward_menu_model_unittest.cc',
+    '$CHROME_DIR/browser/safe_browsing/bloom_filter_unittest.cc',
+    '$CHROME_DIR/browser/bookmarks/bookmark_context_menu_test.cc',
+    '$CHROME_DIR/browser/bookmarks/bookmark_drag_data_unittest.cc',
+    '$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc',
+    '$CHROME_DIR/browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
+    '$CHROME_DIR/browser/bookmarks/bookmark_html_writer_unittest.cc',
+    '$CHROME_DIR/browser/bookmarks/bookmark_model_unittest.cc',
+    '$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc',
+    '$CHROME_DIR/browser/bookmarks/bookmark_utils_unittest.cc',
+    '$CHROME_DIR/browser/browser_commands_unittest.cc',
+    '$CHROME_DIR/browser/cache_manager_host_unittest.cc',
+    '$CHROME_DIR/browser/chrome_thread_unittest.cc',
+    '$CHROME_DIR/browser/safe_browsing/chunk_range_unittest.cc',
+    '$CHROME_DIR/browser/controller_unittest.cc',
+    '$CHROME_DIR/browser/net/dns_host_info_unittest.cc',
+    '$CHROME_DIR/browser/net/dns_master_unittest.cc',
+    '$CHROME_DIR/browser/download/download_manager_unittest.cc',
+    '$CHROME_DIR/browser/download/download_request_manager_unittest.cc',
+    '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc',
+    '$CHROME_DIR/browser/history/expire_history_backend_unittest.cc',
+    '$CHROME_DIR/browser/extensions/extension_protocols_unittest.cc',
+    '$CHROME_DIR/browser/extensions/extension_unittest.cc',
+    '$CHROME_DIR/browser/extensions/extensions_service_unittest.cc',
+    '$CHROME_DIR/browser/importer/firefox_importer_unittest.cc',
+    '$CHROME_DIR/browser/google_url_tracker_unittest.cc',
+    '$CHROME_DIR/browser/history/history_backend_unittest.cc',
+    '$CHROME_DIR/browser/autocomplete/history_contents_provider_unittest.cc',
+    '$CHROME_DIR/browser/history/history_querying_unittest.cc',
+    '$CHROME_DIR/browser/history/history_types_unittest.cc',
+    '$CHROME_DIR/browser/history/history_unittest.cc',
+    '$CHROME_DIR/browser/autocomplete/history_url_provider_unittest.cc',
+    '$CHROME_DIR/browser/importer/importer_unittest.cc',
+    '$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc',
+    '$CHROME_DIR/browser/autocomplete/keyword_provider_unittest.cc',
+    '$CHROME_DIR/browser/login_prompt_unittest.cc',
+    '$CHROME_DIR/browser/metrics/metrics_log_unittest.cc',
+    '$CHROME_DIR/browser/metrics/metrics_response_unittest.cc',
+    '$CHROME_DIR/browser/navigation_controller_unittest.cc',
+    '$CHROME_DIR/browser/printing/page_number_unittest.cc',
+    '$CHROME_DIR/browser/printing/page_overlays_unittest.cc',
+    '$CHROME_DIR/browser/printing/page_range_unittest.cc',
+    '$CHROME_DIR/browser/printing/page_setup_unittest.cc',
+    '$CHROME_DIR/browser/password_manager/password_form_manager_unittest.cc',
+    '$CHROME_DIR/browser/printing/print_job_unittest.cc',
+    '$CHROME_DIR/browser/printing/printing_test.h',
+    '$CHROME_DIR/browser/profile_manager_unittest.cc',
+    '$CHROME_DIR/browser/safe_browsing/protocol_manager_unittest.cc',
+    '$CHROME_DIR/browser/safe_browsing/protocol_parser_unittest.cc',
+    '$CHROME_DIR/browser/history/query_parser_unittest.cc',
+    '$CHROME_DIR/browser/renderer_security_policy_unittest.cc',
+    '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_unittest.cc',
+    '$CHROME_DIR/browser/rlz/rlz_unittest.cc',
+    '$CHROME_DIR/browser/safe_browsing/safe_browsing_database_unittest.cc',
+    '$CHROME_DIR/browser/safe_browsing/safe_browsing_util_unittest.cc',
+    '$CHROME_DIR/browser/download/save_package_unittest.cc',
+    '$CHROME_DIR/browser/sessions/session_backend_unittest.cc',
+    '$CHROME_DIR/browser/sessions/session_service_test_helper.cc',
+    '$CHROME_DIR/browser/sessions/session_service_test_helper.h',
+    '$CHROME_DIR/browser/sessions/session_service_unittest.cc',
+    '$CHROME_DIR/browser/site_instance_unittest.cc',
+    '$CHROME_DIR/browser/history/snippet_unittest.cc',
+    '$CHROME_DIR/browser/spellcheck_unittest.cc',
+    '$CHROME_DIR/browser/history/starred_url_database_unittest.cc',
+    '$CHROME_DIR/browser/sessions/tab_restore_service_unittest.cc',
+    '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc',
+    '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc',
+    '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc',
+    '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc',
+    '$CHROME_DIR/browser/search_engines/template_url_unittest.cc',
+    '$CHROME_DIR/browser/history/text_database_manager_unittest.cc',
+    '$CHROME_DIR/browser/history/text_database_unittest.cc',
+    '$CHROME_DIR/browser/history/thumbnail_database_unittest.cc',
+    '$CHROME_DIR/browser/printing/units_unittest.cc',
+    '$CHROME_DIR/browser/history/url_database_unittest.cc',
+    '$CHROME_DIR/browser/net/url_fetcher_unittest.cc',
+    '$CHROME_DIR/browser/net/url_fixer_upper_unittest.cc',
+    '$CHROME_DIR/browser/extensions/user_script_master_unittest.cc',
+    '$CHROME_DIR/browser/history/visit_database_unittest.cc',
+    '$CHROME_DIR/browser/history/visit_tracker_unittest.cc',
+    '$CHROME_DIR/browser/visitedlink_unittest.cc',
+    '$CHROME_DIR/browser/tab_contents/web_contents_unittest.cc',
+    '$CHROME_DIR/browser/webdata/web_database_unittest.cc',
+    '$CHROME_DIR/browser/printing/win_printing_context_unittest.cc',
+    '$CHROME_DIR/browser/window_sizer_unittest.cc',
+
+    # test_infrastructure
     '$CHROME_DIR/test/browser_with_test_window_test.cc',
     '$CHROME_DIR/test/browser_with_test_window_test.h',
-    'chrome_test_suite.h',
-    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
-    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
-    'run_all_unittests.cc',
+    '$CHROME_DIR/browser/renderer_host/mock_render_process_host.cc',
+    '$CHROME_DIR/browser/renderer_host/mock_render_process_host.h',
     '$CHROME_DIR/test/test_browser_window.h',
-    '$CHROME_DIR/test/test_notification_tracker.cc',
-    '$CHROME_DIR/test/test_notification_tracker.h',
     '$CHROME_DIR/test/test_tab_contents.cc',
     '$CHROME_DIR/test/test_tab_contents.h',
-    '$CHROME_DIR/test/testing_browser_process.h',
-    '$CHROME_DIR/test/testing_profile.cc',
-    '$CHROME_DIR/test/testing_profile.h',
-    '$CHROME_DIR/../net/url_request/url_request_test_job$OBJSUFFIX',
-    '$CHROME_DIR/../net/url_request/url_request_test_job.h',
+  ]),
+  MSVSFilter('common', [
+    '$CHROME_DIR/common/animation_unittest.cc',
+    '$CHROME_DIR/common/bzip2_unittest.cc',
+    '$CHROME_DIR/common/chrome_plugin_unittest.cc',
+    '$CHROME_DIR/common/gfx/emf_unittest.cc',
+    '$CHROME_DIR/common/gfx/icon_util_unittest.cc',
+    '$CHROME_DIR/common/ipc_message_unittest.cc',
+    '$CHROME_DIR/common/ipc_sync_channel_unittest.cc',
+    '$CHROME_DIR/common/ipc_sync_channel_unittest.h',
+    '$CHROME_DIR/common/ipc_sync_message_unittest.cc',
+    '$CHROME_DIR/common/ipc_sync_message_unittest.h',
+    '$CHROME_DIR/common/jpeg_codec_unittest.cc',
+    '$CHROME_DIR/common/json_value_serializer_unittest.cc',
+    '$CHROME_DIR/common/l10n_util_unittest.cc',
+    '$CHROME_DIR/common/mru_cache_unittest.cc',
+    '$CHROME_DIR/common/notification_service_unittest.cc',
+    '$CHROME_DIR/common/os_exchange_data_unittest.cc',
+    '$CHROME_DIR/common/pref_member_unittest.cc',
+    '$CHROME_DIR/common/pref_service_unittest.cc',
+    '$CHROME_DIR/common/property_bag_unittest.cc',
+    '$CHROME_DIR/common/resource_dispatcher_unittest.cc',
+    '$CHROME_DIR/common/gfx/text_elider_unittest.cc',
+    '$CHROME_DIR/common/time_format_unittest.cc',
+    '$CHROME_DIR/common/unzip_unittest.cc',
+    '$CHROME_DIR/common/win_util_unittest.cc',
+    '$CHROME_DIR/common/worker_thread_ticker_unittest.cc',
+  ]),
+  MSVSFilter('googleurl', [
+    '$CHROME_DIR/../googleurl/src/gurl_unittest$OBJSUFFIX',
+    '$CHROME_DIR/../googleurl/src/url_canon_unittest$OBJSUFFIX',
+    '$CHROME_DIR/../googleurl/src/url_parse_unittest$OBJSUFFIX',
+    '$CHROME_DIR/../googleurl/src/url_util_unittest$OBJSUFFIX',
   ]),
   MSVSFilter('hunspell', [
     '$CHROME_DIR/tools/convert_dict/aff_reader$OBJSUFFIX',
@@ -145,138 +255,47 @@ input_files = ChromeFileList([
     '$CHROME_DIR/tools/convert_dict/hunspell_reader.h',
     '$CHROME_DIR/third_party/hunspell/google/hunspell_tests.cc',
   ]),
-  '$CHROME_DIR/common/animation_unittest.cc',
-  '$CHROME_DIR/browser/autocomplete/autocomplete_unittest.cc',
-  '$CHROME_DIR/browser/back_forward_menu_model_unittest.cc',
-  '$CHROME_DIR/browser/safe_browsing/bloom_filter_unittest.cc',
-  '$CHROME_DIR/browser/bookmarks/bookmark_context_menu_test.cc',
-  '$CHROME_DIR/browser/bookmarks/bookmark_drag_data_unittest.cc',
-  '$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc',
-  '$CHROME_DIR/browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
-  '$CHROME_DIR/browser/bookmarks/bookmark_html_writer_unittest.cc',
-  '$CHROME_DIR/browser/bookmarks/bookmark_model_unittest.cc',
-  '$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc',
-  '$CHROME_DIR/browser/bookmarks/bookmark_utils_unittest.cc',
-  '$CHROME_DIR/browser/browser_commands_unittest.cc',
-  '$CHROME_DIR/common/bzip2_unittest.cc',
-  '$CHROME_DIR/browser/cache_manager_host_unittest.cc',
-  '$CHROME_DIR/common/chrome_plugin_unittest.cc',
-  '$CHROME_DIR/browser/chrome_thread_unittest.cc',
-  '$CHROME_DIR/browser/safe_browsing/chunk_range_unittest.cc',
-  '$CHROME_DIR/browser/controller_unittest.cc',
-  '$CHROME_DIR/browser/net/dns_host_info_unittest.cc',
-  '$CHROME_DIR/browser/net/dns_master_unittest.cc',
-  '$CHROME_DIR/browser/download/download_manager_unittest.cc',
-  '$CHROME_DIR/browser/download/download_request_manager_unittest.cc',
-  '$CHROME_DIR/common/gfx/emf_unittest.cc',
-  '$CHROME_DIR/browser/password_manager/encryptor_unittest.cc',
-  '$CHROME_DIR/browser/history/expire_history_backend_unittest.cc',
-  '$CHROME_DIR/browser/extensions/extension_protocols_unittest.cc',
-  '$CHROME_DIR/browser/extensions/extension_unittest.cc',
-  '$CHROME_DIR/browser/extensions/extensions_service_unittest.cc',
-  '$CHROME_DIR/browser/importer/firefox_importer_unittest.cc',
-  '$CHROME_DIR/views/focus_manager_unittest.cc',
-  '$CHROME_DIR/browser/google_url_tracker_unittest.cc',
-  '$CHROME_DIR/views/grid_layout_unittest.cc',
-  '$CHROME_DIR/../googleurl/src/gurl_unittest$OBJSUFFIX',
-  '$CHROME_DIR/browser/history/history_backend_unittest.cc',
-  '$CHROME_DIR/browser/autocomplete/history_contents_provider_unittest.cc',
-  '$CHROME_DIR/browser/history/history_querying_unittest.cc',
-  '$CHROME_DIR/browser/history/history_types_unittest.cc',
-  '$CHROME_DIR/browser/history/history_unittest.cc',
-  '$CHROME_DIR/browser/autocomplete/history_url_provider_unittest.cc',
-  '$CHROME_DIR/common/gfx/icon_util_unittest.cc',
-  '$CHROME_DIR/browser/importer/importer_unittest.cc',
-  '$CHROME_DIR/common/ipc_message_unittest.cc',
-  '$CHROME_DIR/common/ipc_sync_channel_unittest.cc',
-  '$CHROME_DIR/common/ipc_sync_channel_unittest.h',
-  '$CHROME_DIR/common/ipc_sync_message_unittest.cc',
-  '$CHROME_DIR/common/ipc_sync_message_unittest.h',
-  '$CHROME_DIR/common/jpeg_codec_unittest.cc',
-  '$CHROME_DIR/common/ipc_test_sink.cc',
-  '$CHROME_DIR/common/json_value_serializer_unittest.cc',
-  '$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc',
-  '$CHROME_DIR/browser/autocomplete/keyword_provider_unittest.cc',
-  '$CHROME_DIR/common/l10n_util_unittest.cc',
-  '$CHROME_DIR/views/label_unittest.cc',
-  '$CHROME_DIR/browser/login_prompt_unittest.cc',
-  '$CHROME_DIR/browser/metrics/metrics_log_unittest.cc',
-  '$CHROME_DIR/browser/metrics/metrics_response_unittest.cc',
-  '$CHROME_DIR/renderer/mock_render_process.h',
-  '$CHROME_DIR/renderer/mock_render_thread.cc',
-  '$CHROME_DIR/renderer/mock_render_thread.h',
-  '$CHROME_DIR/common/mru_cache_unittest.cc',
-  '$CHROME_DIR/browser/navigation_controller_unittest.cc',
-  '$CHROME_DIR/common/notification_service_unittest.cc',
-  '$CHROME_DIR/common/os_exchange_data_unittest.cc',
-  '$CHROME_DIR/browser/printing/page_number_unittest.cc',
-  '$CHROME_DIR/browser/printing/page_overlays_unittest.cc',
-  '$CHROME_DIR/browser/printing/page_range_unittest.cc',
-  '$CHROME_DIR/browser/printing/page_setup_unittest.cc',
-  '$CHROME_DIR/browser/password_manager/password_form_manager_unittest.cc',
-  '$CHROME_DIR/common/pref_member_unittest.cc',
-  '$CHROME_DIR/common/pref_service_unittest.cc',
-  '$CHROME_DIR/browser/printing/print_job_unittest.cc',
-  '$CHROME_DIR/browser/printing/printing_test.h',
-  '$CHROME_DIR/browser/profile_manager_unittest.cc',
-  '$CHROME_DIR/common/property_bag_unittest.cc',
-  '$CHROME_DIR/browser/safe_browsing/protocol_manager_unittest.cc',
-  '$CHROME_DIR/browser/safe_browsing/protocol_parser_unittest.cc',
-  '$CHROME_DIR/browser/history/query_parser_unittest.cc',
-  '$CHROME_DIR/renderer/net/render_dns_master_unittest.cc',
-  '$CHROME_DIR/renderer/net/render_dns_queue_unittest.cc',
-  '$CHROME_DIR/renderer/render_view_unittest.cc',
-  '$CHROME_DIR/renderer/render_widget_unittest.cc',
-  '$CHROME_DIR/browser/renderer_security_policy_unittest.cc',
-  '$CHROME_DIR/test/data/resource.h',
-  '$CHROME_DIR/test/data/resource.rc',
-  '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_unittest.cc',
-  '$CHROME_DIR/common/resource_dispatcher_unittest.cc',
-  '$CHROME_DIR/browser/rlz/rlz_unittest.cc',
-  '$CHROME_DIR/browser/safe_browsing/safe_browsing_database_unittest.cc',
-  '$CHROME_DIR/browser/safe_browsing/safe_browsing_util_unittest.cc',
-  '$CHROME_DIR/browser/download/save_package_unittest.cc',
-  '$CHROME_DIR/browser/sessions/session_backend_unittest.cc',
-  '$CHROME_DIR/browser/sessions/session_service_test_helper.cc',
-  '$CHROME_DIR/browser/sessions/session_service_test_helper.h',
-  '$CHROME_DIR/browser/sessions/session_service_unittest.cc',
-  '$CHROME_DIR/browser/site_instance_unittest.cc',
-  '$CHROME_DIR/browser/history/snippet_unittest.cc',
-  '$CHROME_DIR/browser/spellcheck_unittest.cc',
-  '$CHROME_DIR/browser/history/starred_url_database_unittest.cc',
-  '$CHROME_DIR/browser/sessions/tab_restore_service_unittest.cc',
-  '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc',
-  '$CHROME_DIR/views/table_view_unittest.cc',
-  '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc',
-  '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc',
-  '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc',
-  '$CHROME_DIR/browser/search_engines/template_url_unittest.cc',
-  '$CHROME_DIR/browser/history/text_database_manager_unittest.cc',
-  '$CHROME_DIR/browser/history/text_database_unittest.cc',
-  '$CHROME_DIR/common/gfx/text_elider_unittest.cc',
-  '$CHROME_DIR/browser/history/thumbnail_database_unittest.cc',
-  '$CHROME_DIR/common/time_format_unittest.cc',
-  '$CHROME_DIR/views/tree_node_iterator_unittest.cc',
-  '$CHROME_DIR/browser/printing/units_unittest.cc',
-  '$CHROME_DIR/common/unzip_unittest.cc',
-  '$CHROME_DIR/../googleurl/src/url_canon_unittest$OBJSUFFIX',
-  '$CHROME_DIR/browser/history/url_database_unittest.cc',
-  '$CHROME_DIR/browser/net/url_fetcher_unittest.cc',
-  '$CHROME_DIR/browser/net/url_fixer_upper_unittest.cc',
-  '$CHROME_DIR/../googleurl/src/url_parse_unittest$OBJSUFFIX',
-  '$CHROME_DIR/../googleurl/src/url_util_unittest$OBJSUFFIX',
-  '$CHROME_DIR/browser/extensions/user_script_master_unittest.cc',
-  '$CHROME_DIR/renderer/user_script_slave_unittest.cc',
-  '$CHROME_DIR/views/view_unittest.cc',
-  '$CHROME_DIR/browser/history/visit_database_unittest.cc',
-  '$CHROME_DIR/browser/history/visit_tracker_unittest.cc',
-  '$CHROME_DIR/browser/visitedlink_unittest.cc',
-  '$CHROME_DIR/browser/tab_contents/web_contents_unittest.cc',
-  '$CHROME_DIR/browser/webdata/web_database_unittest.cc',
-  '$CHROME_DIR/browser/printing/win_printing_context_unittest.cc',
-  '$CHROME_DIR/common/win_util_unittest.cc',
-  '$CHROME_DIR/browser/window_sizer_unittest.cc',
-  '$CHROME_DIR/common/worker_thread_ticker_unittest.cc',
+  MSVSFilter('renderer', [
+    '$CHROME_DIR/renderer/net/render_dns_master_unittest.cc',
+    '$CHROME_DIR/renderer/net/render_dns_queue_unittest.cc',
+    '$CHROME_DIR/renderer/render_view_unittest.cc',
+    '$CHROME_DIR/renderer/render_widget_unittest.cc',
+    '$CHROME_DIR/renderer/user_script_slave_unittest.cc',
+
+    # test_infrastructure
+    '$CHROME_DIR/renderer/mock_render_process.h',
+    '$CHROME_DIR/renderer/mock_render_thread.cc',
+    '$CHROME_DIR/renderer/mock_render_thread.h',
+  ]),
+  MSVSFilter('resources', [
+    '$CHROME_DIR/test/data/resource.h',
+    '$CHROME_DIR/test/data/resource.rc',
+    '$CHROME_DIR/browser/browser_resources.h',
+    '$CHROME_DIR/browser/browser_resources.rc',
+  ]),
+  MSVSFilter('test_infrastructure', [
+    'chrome_test_suite.h',
+    '$CHROME_DIR/common/ipc_test_sink.cc',
+    '$CHROME_DIR/common/ipc_test_sink.h',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
+    '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
+    'run_all_unittests.cc',
+    '$CHROME_DIR/test/test_notification_tracker.cc',
+    '$CHROME_DIR/test/test_notification_tracker.h',
+    '$CHROME_DIR/test/testing_browser_process.h',
+    '$CHROME_DIR/test/testing_profile.cc',
+    '$CHROME_DIR/test/testing_profile.h',
+    '$CHROME_DIR/../net/url_request/url_request_test_job$OBJSUFFIX',
+    '$CHROME_DIR/../net/url_request/url_request_test_job.h',
+  ]),
+  MSVSFilter('views', [
+    '$CHROME_DIR/views/focus_manager_unittest.cc',
+    '$CHROME_DIR/views/grid_layout_unittest.cc',
+    '$CHROME_DIR/views/label_unittest.cc',
+    '$CHROME_DIR/views/table_view_unittest.cc',
+    '$CHROME_DIR/views/tree_node_iterator_unittest.cc',
+    '$CHROME_DIR/views/view_unittest.cc',
+  ]),
 ])
 
 if env.Bit('mac'):
@@ -363,6 +382,8 @@ if not env.Bit('windows'):
       '$CHROME_DIR/browser/importer/importer_unittest.cc',
       '$CHROME_DIR/browser/login_prompt_unittest.cc',
       '$CHROME_DIR/browser/metrics/metrics_log_unittest.cc',
+      '$CHROME_DIR/browser/renderer_host/mock_render_process_host.cc',
+      '$CHROME_DIR/browser/renderer_host/mock_render_process_host.h',
       '$CHROME_DIR/browser/navigation_controller_unittest.cc',
       '$CHROME_DIR/browser/net/dns_master_unittest.cc',
       '$CHROME_DIR/browser/net/url_fixer_upper_unittest.cc',
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index 2b18d7c..cb1f448 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -822,10 +822,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\views\focus_manager_unittest.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\views\grid_layout_unittest.cc"
 				>
 			</File>