diff options
Diffstat (limited to 'chromium/chrome/chrome_tests_unit.gypi')
| -rw-r--r-- | chromium/chrome/chrome_tests_unit.gypi | 1161 |
1 files changed, 558 insertions, 603 deletions
diff --git a/chromium/chrome/chrome_tests_unit.gypi b/chromium/chrome/chrome_tests_unit.gypi index 1fcfb9287b8..0e3721c3bc2 100644 --- a/chromium/chrome/chrome_tests_unit.gypi +++ b/chromium/chrome/chrome_tests_unit.gypi @@ -18,6 +18,15 @@ 'common', '../base/base.gyp:base_prefs_test_support', '../base/base.gyp:test_support_base', + '../components/components.gyp:bookmarks_test_support', + '../components/components.gyp:gcm_driver_test_support', + '../components/components.gyp:history_core_test_support', + '../components/components.gyp:invalidation_test_support', + '../components/components.gyp:metrics_test_support', + '../components/components.gyp:password_manager_core_browser_test_support', + '../components/components.gyp:pref_registry_test_support', + '../components/components.gyp:signin_core_browser_test_support', + '../components/components.gyp:sync_driver_test_support', '../content/content.gyp:content_app_both', '../content/content_shell_and_tests.gyp:test_support_content', '../net/net.gyp:net', @@ -33,28 +42,14 @@ ], 'export_dependent_settings': [ '../base/base.gyp:test_support_base', + '../content/content_shell_and_tests.gyp:test_support_content', ], 'include_dirs': [ '..', ], 'sources': [ - '../extensions/browser/test_management_policy.cc', - '../extensions/browser/test_management_policy.h', - '../extensions/common/extension_builder.cc', - '../extensions/common/extension_builder.h', - '../extensions/common/value_builder.cc', - '../extensions/common/value_builder.h', - '../google_apis/drive/dummy_auth_service.cc', - '../google_apis/drive/dummy_auth_service.h', - '../google_apis/drive/test_util.cc', - '../google_apis/drive/test_util.h', 'app/chrome_main_delegate.cc', 'app/chrome_main_delegate.h', - 'browser/android/bookmarks/partner_bookmarks_shim_unittest.cc', - 'browser/android/mock_google_location_settings_helper.cc', - 'browser/android/mock_google_location_settings_helper.h', - 'browser/bookmarks/bookmark_test_helpers.cc', - 'browser/bookmarks/bookmark_test_helpers.h', 'browser/browsing_data/mock_browsing_data_appcache_helper.cc', 'browser/browsing_data/mock_browsing_data_appcache_helper.h', 'browser/browsing_data/mock_browsing_data_cookie_helper.cc', @@ -73,38 +68,42 @@ 'browser/browsing_data/mock_browsing_data_quota_helper.h', 'browser/browsing_data/mock_browsing_data_server_bound_cert_helper.cc', 'browser/browsing_data/mock_browsing_data_server_bound_cert_helper.h', - 'browser/chromeos/contacts/contact_test_util.cc', - 'browser/chromeos/contacts/contact_test_util.h', + 'browser/chromeos/app_mode/fake_cws.cc', + 'browser/chromeos/app_mode/fake_cws.h', 'browser/chromeos/input_method/mock_candidate_window_controller.cc', 'browser/chromeos/input_method/mock_candidate_window_controller.h', + 'browser/chromeos/input_method/mock_input_method_engine.cc', + 'browser/chromeos/input_method/mock_input_method_engine.h', 'browser/chromeos/input_method/mock_input_method_manager.cc', 'browser/chromeos/input_method/mock_input_method_manager.h', 'browser/chromeos/login/fake_login_utils.cc', 'browser/chromeos/login/fake_login_utils.h', - 'browser/chromeos/login/fake_supervised_user_manager.cc', - 'browser/chromeos/login/fake_supervised_user_manager.h', - 'browser/chromeos/login/fake_user_manager.cc', - 'browser/chromeos/login/fake_user_manager.h', - 'browser/chromeos/login/mock_authenticator.cc', - 'browser/chromeos/login/mock_authenticator.h', - 'browser/chromeos/login/mock_login_display.cc', - 'browser/chromeos/login/mock_login_display.h', - 'browser/chromeos/login/mock_login_display_host.cc', - 'browser/chromeos/login/mock_login_display_host.h', - 'browser/chromeos/login/mock_login_status_consumer.cc', - 'browser/chromeos/login/mock_login_status_consumer.h', + 'browser/chromeos/login/auth/mock_authenticator.cc', + 'browser/chromeos/login/auth/mock_authenticator.h', + 'browser/chromeos/login/auth/mock_login_status_consumer.cc', + 'browser/chromeos/login/auth/mock_login_status_consumer.h', + 'browser/chromeos/login/auth/mock_url_fetchers.cc', + 'browser/chromeos/login/auth/mock_url_fetchers.h', 'browser/chromeos/login/mock_login_utils.cc', 'browser/chromeos/login/mock_login_utils.h', - 'browser/chromeos/login/mock_url_fetchers.cc', - 'browser/chromeos/login/mock_url_fetchers.h', - 'browser/chromeos/login/mock_user_image_manager.cc', - 'browser/chromeos/login/mock_user_image_manager.h', - 'browser/chromeos/login/mock_user_manager.cc', - 'browser/chromeos/login/mock_user_manager.h', + 'browser/chromeos/login/users/avatar/mock_user_image_manager.cc', + 'browser/chromeos/login/users/avatar/mock_user_image_manager.h', + 'browser/chromeos/login/users/fake_supervised_user_manager.cc', + 'browser/chromeos/login/users/fake_supervised_user_manager.h', + 'browser/chromeos/login/users/fake_user_manager.cc', + 'browser/chromeos/login/users/fake_user_manager.h', + 'browser/chromeos/login/users/mock_user_manager.cc', + 'browser/chromeos/login/users/mock_user_manager.h', 'browser/chromeos/login/test/oobe_screen_waiter.cc', 'browser/chromeos/login/test/oobe_screen_waiter.h', 'browser/chromeos/login/test/js_checker.cc', 'browser/chromeos/login/test/js_checker.h', + 'browser/chromeos/login/ui/mock_login_display.cc', + 'browser/chromeos/login/ui/mock_login_display.h', + 'browser/chromeos/login/ui/mock_login_display_host.cc', + 'browser/chromeos/login/ui/mock_login_display_host.h', + 'browser/chromeos/net/network_portal_detector_test_utils.cc', + 'browser/chromeos/net/network_portal_detector_test_utils.h', 'browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc', 'browser/chromeos/policy/cloud_external_data_manager_base_test_util.h', 'browser/chromeos/policy/device_policy_builder.cc', @@ -115,6 +114,8 @@ 'browser/chromeos/settings/device_settings_test_helper.h', 'browser/chromeos/settings/mock_owner_key_util.cc', 'browser/chromeos/settings/mock_owner_key_util.h', + 'browser/chromeos/system/fake_input_device_settings.cc', + 'browser/chromeos/system/fake_input_device_settings.h', # The only thing used from browser is Browser::Type. 'browser/download/download_test_file_activity_observer.cc', 'browser/download/download_test_file_activity_observer.h', @@ -124,16 +125,22 @@ 'browser/drive/dummy_drive_service.h', 'browser/drive/fake_drive_service.cc', 'browser/drive/fake_drive_service.h', + 'browser/drive/test_util.cc', + 'browser/drive/test_util.h', 'browser/extensions/api/messaging/native_messaging_test_util.cc', 'browser/extensions/api/messaging/native_messaging_test_util.h', 'browser/extensions/extension_notification_observer.cc', 'browser/extensions/extension_notification_observer.h', + 'browser/extensions/extension_test_message_listener.cc', + 'browser/extensions/extension_test_message_listener.h', 'browser/extensions/fake_safe_browsing_database_manager.cc', 'browser/extensions/fake_safe_browsing_database_manager.h', 'browser/extensions/mock_extension_special_storage_policy.cc', 'browser/extensions/mock_extension_special_storage_policy.h', 'browser/extensions/test_blacklist.cc', 'browser/extensions/test_blacklist.h', + 'browser/extensions/test_blacklist_state_fetcher.cc', + 'browser/extensions/test_blacklist_state_fetcher.h', 'browser/extensions/test_extension_environment.cc', 'browser/extensions/test_extension_environment.h', 'browser/extensions/test_extension_prefs.cc', @@ -142,6 +149,8 @@ 'browser/extensions/test_extension_service.h', 'browser/extensions/test_extension_system.cc', 'browser/extensions/test_extension_system.h', + 'browser/invalidation/fake_invalidation_service.cc', + 'browser/invalidation/fake_invalidation_service.h', 'browser/media/fake_desktop_media_list.cc', 'browser/media/fake_desktop_media_list.h', 'browser/media_galleries/media_galleries_test_util.cc', @@ -152,12 +161,12 @@ 'browser/net/url_request_mock_util.h', 'browser/notifications/notification_test_util.cc', 'browser/notifications/notification_test_util.h', - 'browser/password_manager/mock_password_store.cc', - 'browser/password_manager/mock_password_store.h', - 'browser/password_manager/password_form_data.cc', - 'browser/password_manager/password_form_data.h', - 'browser/password_manager/test_password_store.cc', - 'browser/password_manager/test_password_store.h', + 'browser/password_manager/mock_password_store_service.cc', + 'browser/password_manager/mock_password_store_service.h', + 'browser/password_manager/null_password_store_service.cc', + 'browser/password_manager/null_password_store_service.h', + 'browser/password_manager/test_password_store_service.cc', + 'browser/password_manager/test_password_store_service.h', 'browser/policy/test/local_policy_test_server.cc', 'browser/policy/test/local_policy_test_server.h', 'browser/prefs/pref_service_mock_factory.cc', @@ -170,16 +179,16 @@ 'browser/sessions/session_service_test_helper.h', 'browser/signin/fake_profile_oauth2_token_service.cc', 'browser/signin/fake_profile_oauth2_token_service.h', + 'browser/signin/fake_profile_oauth2_token_service_builder.cc', + 'browser/signin/fake_profile_oauth2_token_service_builder.h', 'browser/signin/fake_signin_manager.cc', 'browser/signin/fake_signin_manager.h', 'browser/ssl/ssl_client_auth_requestor_mock.cc', 'browser/ssl/ssl_client_auth_requestor_mock.h', - 'browser/storage_monitor/test_media_transfer_protocol_manager_linux.cc', - 'browser/storage_monitor/test_media_transfer_protocol_manager_linux.h', - 'browser/storage_monitor/test_storage_monitor.cc', - 'browser/storage_monitor/test_storage_monitor.h', 'browser/sync/profile_sync_service_mock.cc', 'browser/sync/profile_sync_service_mock.h', + 'browser/ui/app_list/test/chrome_app_list_test_support.cc', + 'browser/ui/app_list/test/chrome_app_list_test_support.h', 'browser/ui/browser.h', 'browser/ui/cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm', 'browser/ui/cocoa/run_loop_testing.h', @@ -190,32 +199,25 @@ 'browser/ui/fullscreen/fullscreen_controller_state_tests.h', 'browser/ui/fullscreen/fullscreen_controller_test.cc', 'browser/ui/fullscreen/fullscreen_controller_test.h', - 'browser/ui/gtk/find_bar_host_unittest_util_gtk.cc', + 'browser/ui/passwords/manage_passwords_ui_controller_mock.cc', + 'browser/ui/passwords/manage_passwords_ui_controller_mock.h', 'browser/ui/test/test_confirm_bubble_model.cc', 'browser/ui/test/test_confirm_bubble_model.h', 'browser/ui/views/find_bar_host_unittest_util_views.cc', + 'browser/ui/website_settings/mock_permission_bubble_request.cc', + 'browser/ui/website_settings/mock_permission_bubble_request.h', 'common/extensions/extension_test_util.cc', 'common/extensions/extension_test_util.h', 'renderer/chrome_mock_render_thread.cc', 'renderer/chrome_mock_render_thread.h', 'renderer/media/mock_webrtc_logging_message_filter.cc', 'renderer/media/mock_webrtc_logging_message_filter.h', - 'renderer/mock_printer.cc', - 'renderer/mock_printer.h', + 'renderer/printing/mock_printer.cc', + 'renderer/printing/mock_printer.h', 'renderer/safe_browsing/mock_feature_extractor_clock.cc', 'renderer/safe_browsing/mock_feature_extractor_clock.h', 'renderer/safe_browsing/test_utils.cc', 'renderer/safe_browsing/test_utils.h', - 'test/automation/automation_handle_tracker.cc', - 'test/automation/automation_handle_tracker.h', - 'test/automation/automation_proxy.cc', - 'test/automation/automation_proxy.h', - 'test/automation/browser_proxy.cc', - 'test/automation/browser_proxy.h', - 'test/automation/tab_proxy.cc', - 'test/automation/tab_proxy.h', - 'test/automation/window_proxy.cc', - 'test/automation/window_proxy.h', 'test/base/chrome_process_util.cc', 'test/base/chrome_process_util.h', 'test/base/chrome_process_util_mac.cc', @@ -233,8 +235,6 @@ 'test/base/history_index_restore_observer.h', 'test/base/in_process_browser_test.cc', 'test/base/in_process_browser_test.h', - 'test/base/javascript_test_observer.cc', - 'test/base/javascript_test_observer.h', 'test/base/module_system_test.cc', 'test/base/module_system_test.h', 'test/base/profile_mock.cc', @@ -281,15 +281,11 @@ 'test/ppapi/ppapi_test.h', '../ui/gfx/image/image_unittest_util.cc', '../ui/gfx/image/image_unittest_util.h', - '../webkit/browser/quota/mock_quota_manager.cc', - '../webkit/browser/quota/mock_quota_manager.h', - '../webkit/browser/quota/mock_special_storage_policy.cc', - '../webkit/browser/quota/mock_special_storage_policy.h', ], 'conditions': [ ['OS!="ios"', { 'dependencies': [ - 'common/extensions/api/api.gyp:api', + 'common/extensions/api/api.gyp:chrome_api', 'plugin', 'renderer', 'utility', @@ -300,7 +296,11 @@ '../content/content.gyp:content_utility', '../content/content.gyp:content_worker', '../components/components.gyp:autofill_core_test_support', + '../components/components.gyp:captive_portal_test_support', '../components/components.gyp:sessions_test_support', + '../components/components.gyp:storage_monitor_test_support', + '../extensions/extensions.gyp:extensions_test_support', + '../google_apis/google_apis.gyp:google_apis_test_support', '../ipc/ipc.gyp:test_support_ipc', '../media/media.gyp:media_test_support', '../ppapi/ppapi_internal.gyp:ppapi_shared', @@ -356,12 +356,7 @@ ['exclude', '^browser/extensions/fake_safe_browsing_database_manager.h'], ], }], - ['toolkit_uses_gtk == 1', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - ], - }], - ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', { + ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:ssl', ], @@ -373,13 +368,17 @@ }], ['enable_printing==0', { 'sources/': [ - ['exclude', '^renderer/mock_printer.cc'], - ['exclude', '^renderer/mock_printer.h'], + ['exclude', '^renderer/printing/mock_printer.cc'], + ['exclude', '^renderer/printing/mock_printer.h'], ], }], ['OS=="android"', { + 'dependencies!': [ + '../components/components.gyp:storage_monitor_test_support', + ], 'sources/': [ ['exclude', '^browser/media_galleries/'], + ['exclude', '^browser/extensions/api/messaging/native_messaging_'], ], }], ['OS=="win"', { @@ -400,6 +399,7 @@ }], ['OS=="win" or OS=="mac"', { 'sources': [ + 'common/extensions/api/networking_private/networking_private_crypto_unittest.cc', 'common/media_galleries/picasa_test_util.cc', 'common/media_galleries/picasa_test_util.cc', 'common/media_galleries/pmp_test_util.cc', @@ -408,7 +408,13 @@ }], ['OS=="mac"', { 'dependencies': [ - '../components/components.gyp:breakpad_stubs', + '../breakpad/breakpad.gyp:breakpad', + '../components/components.gyp:breakpad_component', + ], + 'sources': [ + 'app/chrome_breakpad_client.cc', + 'app/chrome_breakpad_client_mac.mm', + 'app/chrome_main_mac.mm', ], }], ['enable_mdns == 1', { @@ -417,12 +423,23 @@ 'browser/local_discovery/test_service_discovery_client.h', ] }], + ['enable_app_list==0', { + 'sources/': [ + ['exclude', '^browser/ui/app_list/'], + ], + }], ['enable_webrtc==0', { 'sources!': [ 'renderer/media/mock_webrtc_logging_message_filter.cc', 'renderer/media/mock_webrtc_logging_message_filter.h', ], }], + ['enable_wifi_bootstrapping', { + "sources" : [ + 'browser/local_discovery/wifi/mock_wifi_manager.cc', + 'browser/local_discovery/wifi/mock_wifi_manager.h', + ] + }] ], }, { @@ -448,17 +465,6 @@ 'browser/sync/glue/session_sync_test_helper.h', 'test/base/run_all_unittests.cc', ], - 'conditions': [ - ['toolkit_uses_gtk == 1', { - 'dependencies': [ - # Needed for the following #include chain: - # test/base/run_all_unittests.cc - # test/base/chrome_test_suite.h - # gtk/gtk.h - '../build/linux/system.gyp:gtk', - ], - }], - ], }, { 'target_name': 'unit_tests', @@ -472,6 +478,8 @@ '<@(chromium_child_dependencies)', # 2) test-specific support libraries: '../base/base.gyp:test_support_base', + '../components/components_resources.gyp:components_resources', + '../content/content_shell_and_tests.gyp:test_support_content', '../content/content.gyp:content_app_both', '../net/net.gyp:net', '../net/net.gyp:net_test_support', @@ -492,16 +500,12 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', + '../ui/base/ui_base.gyp:ui_base_test_support', + '../ui/gfx/gfx.gyp:gfx_test_support', '../ui/resources/ui_resources.gyp:ui_resources', - '../ui/ui_unittests.gyp:ui_test_support', 'chrome_resources.gyp:chrome_resources', 'chrome_resources.gyp:chrome_strings', ], - # TODO(joi): Remove this section once the google_apis tests are - # a separate unit test binary. - 'includes': [ - '../google_apis/determine_use_official_keys.gypi', - ], 'include_dirs': [ '..', ], @@ -514,34 +518,70 @@ ], }, }, - 'variables': { - 'win_use_external_manifest': 1, - }, 'sources': [ - '../apps/app_keep_alive_service_unittest.cc', '../apps/app_shim/app_shim_host_mac_unittest.cc', - '../apps/saved_files_service_unittest.cc', '../apps/app_shim/extension_app_shim_handler_mac_unittest.cc', - '../apps/shell_window_geometry_cache_unittest.cc', + '../apps/app_window_geometry_cache_unittest.cc', + '../apps/saved_files_service_unittest.cc', '../components/autofill/content/renderer/test_password_autofill_agent.cc', '../components/autofill/content/renderer/test_password_autofill_agent.h', + '../components/autofill/content/renderer/test_password_generation_agent.cc', + '../components/autofill/content/renderer/test_password_generation_agent.h', + # TODO(tfarina): Move these entries over to extensions_unittests target. + # http://crbug.com/348066. They are duplicated here because we haven't + # extensions_unittests running in the bots yet. Until that happens, + # they should be kept here. '../extensions/browser/admin_policy_unittest.cc', + '../extensions/browser/api/api_resource_manager_unittest.cc', + '../extensions/browser/api/storage/settings_quota_unittest.cc', + '../extensions/browser/api/storage/settings_test_util.cc', + '../extensions/browser/api/storage/settings_test_util.h', + '../extensions/browser/api/storage/storage_api_unittest.cc', + '../extensions/browser/api/storage/storage_frontend_unittest.cc', + '../extensions/browser/content_hash_tree_unittest.cc', + '../extensions/browser/error_map_unittest.cc', '../extensions/browser/event_listener_map_unittest.cc', '../extensions/browser/event_router_unittest.cc', + '../extensions/browser/extension_error_test_util.cc', + '../extensions/browser/extension_error_test_util.h', + '../extensions/browser/extension_icon_image_unittest.cc', + '../extensions/browser/extension_pref_value_map_unittest.cc', + '../extensions/browser/extension_protocols_unittest.cc', + '../extensions/browser/extension_registry_unittest.cc', '../extensions/browser/file_highlighter_unittest.cc', '../extensions/browser/file_reader_unittest.cc', + '../extensions/browser/image_loader_unittest.cc', + '../extensions/browser/image_util_unittest.cc', '../extensions/browser/info_map_unittest.cc', '../extensions/browser/lazy_background_task_queue_unittest.cc', '../extensions/browser/management_policy_unittest.cc', + '../extensions/browser/process_manager_unittest.cc', '../extensions/browser/process_map_unittest.cc', '../extensions/browser/quota_service_unittest.cc', + '../extensions/browser/runtime_data_unittest.cc', + '../extensions/browser/value_store/leveldb_value_store_unittest.cc', + '../extensions/browser/value_store/testing_value_store_unittest.cc', + '../extensions/browser/value_store/value_store_change_unittest.cc', + '../extensions/browser/value_store/value_store_frontend_unittest.cc', + '../extensions/browser/value_store/value_store_unittest.cc', + '../extensions/browser/value_store/value_store_unittest.h', + '../extensions/browser/verified_contents_unittest.cc', + '../extensions/common/api/sockets/sockets_manifest_permission_unittest.cc', '../extensions/common/csp_validator_unittest.cc', '../extensions/common/event_filter_unittest.cc', + '../extensions/common/extension_l10n_util_unittest.cc', '../extensions/common/extension_resource_unittest.cc', + '../extensions/common/extension_set_unittest.cc', + '../extensions/common/features/base_feature_provider_unittest.cc', + '../extensions/common/features/complex_feature_unittest.cc', + '../extensions/common/features/simple_feature_unittest.cc', '../extensions/common/file_util_unittest.cc', '../extensions/common/id_util_unittest.cc', '../extensions/common/manifest_handler_unittest.cc', + '../extensions/common/manifest_handlers/externally_connectable_unittest.cc', + '../extensions/common/manifest_handlers/file_handler_manifest_unittest.cc', '../extensions/common/manifest_handlers/shared_module_manifest_unittest.cc', + '../extensions/common/message_bundle_unittest.cc', '../extensions/common/one_shot_event_unittest.cc', '../extensions/common/permissions/api_permission_set_unittest.cc', '../extensions/common/permissions/manifest_permission_set_unittest.cc', @@ -549,36 +589,42 @@ '../extensions/common/url_pattern_set_unittest.cc', '../extensions/common/url_pattern_unittest.cc', '../extensions/common/user_script_unittest.cc', + '../extensions/renderer/activity_log_converter_strategy_unittest.cc', + '../extensions/renderer/script_context_set_unittest.cc', 'app/chrome_dll.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc', # All unittests in browser, common, renderer and service. 'browser/about_flags_unittest.cc', + 'browser/android/bookmarks/partner_bookmarks_shim_unittest.cc', + # mock_google_location_settings_helper could logically go in + # test_support_unit. However tests suites in the internal repository + # depend on an alternate implementation so instead each test suite + # includes the relevant version directly. + 'browser/android/mock_google_location_settings_helper.cc', + 'browser/android/mock_google_location_settings_helper.h', 'browser/app_controller_mac_unittest.mm', + 'browser/apps/drive/drive_app_mapping_unittest.cc', + 'browser/apps/ephemeral_app_service_unittest.cc', 'browser/autocomplete/autocomplete_input_unittest.cc', 'browser/autocomplete/autocomplete_match_unittest.cc', 'browser/autocomplete/autocomplete_provider_unittest.cc', 'browser/autocomplete/autocomplete_result_unittest.cc', 'browser/autocomplete/bookmark_provider_unittest.cc', 'browser/autocomplete/builtin_provider_unittest.cc', - 'browser/autocomplete/contact_provider_chromeos_unittest.cc', 'browser/autocomplete/extension_app_provider_unittest.cc', 'browser/autocomplete/history_quick_provider_unittest.cc', 'browser/autocomplete/history_url_provider_unittest.cc', 'browser/autocomplete/keyword_provider_unittest.cc', 'browser/autocomplete/search_provider_unittest.cc', + 'browser/autocomplete/shortcuts_backend_unittest.cc', 'browser/autocomplete/shortcuts_provider_unittest.cc', - 'browser/automation/chrome_frame_automation_provider_win_unittest.cc', + 'browser/autocomplete/zero_suggest_provider_unittest.cc', + 'browser/autofill/autofill_cc_infobar_delegate_unittest.cc', 'browser/background/background_application_list_model_unittest.cc', 'browser/background/background_contents_service_unittest.cc', 'browser/background/background_mode_manager_unittest.cc', - 'browser/bookmarks/bookmark_codec_unittest.cc', - 'browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc', + 'browser/bitmap_fetcher/bitmap_fetcher_service_unittest.cc', 'browser/bookmarks/bookmark_html_writer_unittest.cc', - 'browser/bookmarks/bookmark_index_unittest.cc', - 'browser/bookmarks/bookmark_model_unittest.cc', - 'browser/bookmarks/bookmark_node_data_unittest.cc', - 'browser/bookmarks/bookmark_tag_model_unittest.cc', - 'browser/bookmarks/bookmark_utils_unittest.cc', + 'browser/bookmarks/chrome_bookmark_client_unittest.cc', 'browser/browser_about_handler_unittest.cc', 'browser/browser_commands_unittest.cc', 'browser/browsing_data/browsing_data_appcache_helper_unittest.cc', @@ -590,15 +636,15 @@ 'browser/browsing_data/browsing_data_local_storage_helper_unittest.cc', 'browser/browsing_data/browsing_data_quota_helper_unittest.cc', 'browser/browsing_data/browsing_data_remover_unittest.cc', + 'browser/browsing_data/browsing_data_remover_test_util.cc', + 'browser/browsing_data/browsing_data_remover_test_util.h', 'browser/browsing_data/browsing_data_server_bound_cert_helper_unittest.cc', 'browser/browsing_data/cookies_tree_model_unittest.cc', - 'browser/captive_portal/captive_portal_detector_unittest.cc', 'browser/captive_portal/captive_portal_service_unittest.cc', 'browser/captive_portal/captive_portal_tab_helper_unittest.cc', 'browser/captive_portal/captive_portal_tab_reloader_unittest.cc', - 'browser/captive_portal/testing_utils.cc', - 'browser/captive_portal/testing_utils.h', 'browser/chrome_browser_application_mac_unittest.mm', + 'browser/chrome_elf_init_unittest_win.cc', 'browser/chrome_page_zoom_unittest.cc', 'browser/chrome_process_singleton_win_unittest.cc', 'browser/chromeos/accessibility/magnification_manager_unittest.cc', @@ -607,19 +653,6 @@ 'browser/chromeos/attestation/fake_certificate.cc', 'browser/chromeos/attestation/fake_certificate.h', 'browser/chromeos/attestation/platform_verification_flow_unittest.cc', - 'browser/chromeos/contacts/contact_database_unittest.cc', - 'browser/chromeos/contacts/contact_manager_stub.cc', - 'browser/chromeos/contacts/contact_manager_stub.h', - 'browser/chromeos/contacts/contact_manager_unittest.cc', - 'browser/chromeos/contacts/contact_map_unittest.cc', - 'browser/chromeos/contacts/fake_contact_database.cc', - 'browser/chromeos/contacts/fake_contact_database.h', - 'browser/chromeos/contacts/fake_contact_store.cc', - 'browser/chromeos/contacts/fake_contact_store.h', - 'browser/chromeos/contacts/gdata_contacts_service_stub.cc', - 'browser/chromeos/contacts/gdata_contacts_service_stub.h', - 'browser/chromeos/contacts/gdata_contacts_service_unittest.cc', - 'browser/chromeos/contacts/google_contact_store_unittest.cc', 'browser/chromeos/customization_document_unittest.cc', 'browser/chromeos/dbus/cros_dbus_service_unittest.cc', 'browser/chromeos/dbus/printer_service_provider_unittest.cc', @@ -629,11 +662,12 @@ 'browser/chromeos/display/display_preferences_unittest.cc', 'browser/chromeos/drive/change_list_loader_unittest.cc', 'browser/chromeos/drive/change_list_processor_unittest.cc', + 'browser/chromeos/drive/directory_loader_unittest.cc', 'browser/chromeos/drive/download_handler_unittest.cc', - 'browser/chromeos/drive/drive_app_registry_unittest.cc', 'browser/chromeos/drive/drive_file_stream_reader_unittest.cc', 'browser/chromeos/drive/drive_integration_service_unittest.cc', 'browser/chromeos/drive/drive_url_request_job_unittest.cc', + 'browser/chromeos/drive/dummy_file_system.cc', 'browser/chromeos/drive/dummy_file_system.h', 'browser/chromeos/drive/fake_file_system.cc', 'browser/chromeos/drive/fake_file_system.h', @@ -655,11 +689,11 @@ 'browser/chromeos/drive/file_system/search_operation_unittest.cc', 'browser/chromeos/drive/file_system/touch_operation_unittest.cc', 'browser/chromeos/drive/file_system/truncate_operation_unittest.cc', - 'browser/chromeos/drive/file_system/update_operation_unittest.cc', 'browser/chromeos/drive/file_system_unittest.cc', 'browser/chromeos/drive/file_system_util_unittest.cc', 'browser/chromeos/drive/file_write_watcher_unittest.cc', - 'browser/chromeos/drive/fileapi_worker_unittest.cc', + 'browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc', + 'browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc', 'browser/chromeos/drive/job_queue_unittest.cc', 'browser/chromeos/drive/job_scheduler_unittest.cc', 'browser/chromeos/drive/local_file_reader_unittest.cc', @@ -674,12 +708,15 @@ 'browser/chromeos/drive/sync_client_unittest.cc', 'browser/chromeos/drive/test_util.cc', 'browser/chromeos/drive/test_util.h', - 'browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc', 'browser/chromeos/drive/write_on_cache_file_unittest.cc', + 'browser/chromeos/events/event_rewriter_unittest.cc', + 'browser/chromeos/events/keyboard_driven_event_rewriter_unittest.cc', 'browser/chromeos/extensions/default_app_order_unittest.cc', 'browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc', 'browser/chromeos/extensions/external_cache_unittest.cc', - 'browser/chromeos/file_manager/desktop_notifications_unittest.cc', + 'browser/chromeos/extensions/device_local_account_management_policy_provider_unittest.cc', + 'browser/chromeos/extensions/wallpaper_private_api_unittest.cc', + 'browser/chromeos/external_metrics_unittest.cc', 'browser/chromeos/file_manager/fake_disk_mount_manager.cc', 'browser/chromeos/file_manager/fake_disk_mount_manager.h', 'browser/chromeos/file_manager/file_tasks_unittest.cc', @@ -689,38 +726,52 @@ 'browser/chromeos/file_manager/path_util_unittest.cc', 'browser/chromeos/file_manager/url_util_unittest.cc', 'browser/chromeos/file_manager/volume_manager_unittest.cc', - 'browser/chromeos/extensions/device_local_account_management_policy_provider_unittest.cc', - 'browser/chromeos/extensions/wallpaper_private_api_unittest.cc', - 'browser/chromeos/external_metrics_unittest.cc', + 'browser/chromeos/file_system_provider/fake_provided_file_system.cc', + 'browser/chromeos/file_system_provider/fake_provided_file_system.h', + 'browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc', + 'browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc', + 'browser/chromeos/file_system_provider/mount_path_util_unittest.cc', + 'browser/chromeos/file_system_provider/operations/close_file_unittest.cc', + 'browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc', + 'browser/chromeos/file_system_provider/operations/open_file_unittest.cc', + 'browser/chromeos/file_system_provider/operations/read_directory_unittest.cc', + 'browser/chromeos/file_system_provider/operations/read_file_unittest.cc', + 'browser/chromeos/file_system_provider/operations/unmount_unittest.cc', + 'browser/chromeos/file_system_provider/request_manager_unittest.cc', + 'browser/chromeos/file_system_provider/service_unittest.cc', 'browser/chromeos/fileapi/file_access_permissions_unittest.cc', 'browser/chromeos/fileapi/file_system_backend_unittest.cc', + 'browser/chromeos/geolocation/simple_geolocation_unittest.cc', 'browser/chromeos/imageburner/burn_device_handler_unittest.cc', 'browser/chromeos/imageburner/burn_manager_unittest.cc', 'browser/chromeos/input_method/browser_state_monitor_unittest.cc', - 'browser/chromeos/input_method/candidate_window_controller_impl_unittest.cc', - 'browser/chromeos/input_method/candidate_window_view_unittest.cc', 'browser/chromeos/input_method/input_method_configuration_unittest.cc', + 'browser/chromeos/input_method/input_method_engine_unittest.cc', 'browser/chromeos/input_method/input_method_manager_impl_unittest.cc', 'browser/chromeos/input_method/input_method_persistence_unittest.cc', 'browser/chromeos/input_method/input_method_util_unittest.cc', - 'browser/chromeos/keyboard_driven_event_rewriter_unittest.cc', 'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc', 'browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc', + 'browser/chromeos/login/auth/key_unittest.cc', + 'browser/chromeos/login/auth/mock_auth_attempt_state_resolver.cc', + 'browser/chromeos/login/auth/mock_auth_attempt_state_resolver.h', + 'browser/chromeos/login/auth/online_attempt_unittest.cc', + 'browser/chromeos/login/auth/parallel_authenticator_unittest.cc', 'browser/chromeos/login/existing_user_controller_auto_login_unittest.cc', 'browser/chromeos/login/hwid_checker_unittest.cc', - 'browser/chromeos/login/merge_session_load_page_unittest.cc', - 'browser/chromeos/login/mock_auth_attempt_state_resolver.cc', - 'browser/chromeos/login/mock_auth_attempt_state_resolver.h', - 'browser/chromeos/login/multi_profile_user_controller_unittest.cc', - 'browser/chromeos/login/online_attempt_unittest.cc', - 'browser/chromeos/login/parallel_authenticator_unittest.cc', + 'browser/chromeos/login/managed/supervised_user_authentication_unittest.cc', + 'browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc', 'browser/chromeos/login/screens/screen_context_unittest.cc', - 'browser/chromeos/login/user_manager_unittest.cc', - 'browser/chromeos/login/wallpaper_manager_unittest.cc', + 'browser/chromeos/login/signin/merge_session_load_page_unittest.cc', + 'browser/chromeos/login/users/multi_profile_user_controller_unittest.cc', + 'browser/chromeos/login/users/user_manager_unittest.cc', + 'browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc', 'browser/chromeos/memory/oom_priority_manager_unittest.cc', 'browser/chromeos/mobile/mobile_activator_unittest.cc', 'browser/chromeos/mobile_config_unittest.cc', + 'browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc', 'browser/chromeos/net/network_portal_detector_impl_unittest.cc', + 'browser/chromeos/net/network_portal_notification_controller_unittest.cc', 'browser/chromeos/net/onc_utils_unittest.cc', 'browser/chromeos/offline/offline_load_page_unittest.cc', 'browser/chromeos/options/network_property_ui_data_unittest.cc', @@ -733,19 +784,18 @@ 'browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc', 'browser/chromeos/policy/device_local_account_policy_service_unittest.cc', 'browser/chromeos/policy/enterprise_install_attributes_unittest.cc', - 'browser/chromeos/policy/login_screen_power_management_policy_unittest.cc', 'browser/chromeos/policy/network_configuration_updater_unittest.cc', - 'browser/chromeos/policy/proxy_policy_provider_unittest.cc', 'browser/chromeos/policy/recommendation_restorer_unittest.cc', + 'browser/chromeos/policy/server_backed_state_keys_broker_unittest.cc', 'browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc', 'browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc', + 'browser/chromeos/power/power_data_collector_unittest.cc', 'browser/chromeos/power/power_prefs_unittest.cc', 'browser/chromeos/preferences_unittest.cc', 'browser/chromeos/profiles/profile_list_chromeos_unittest.cc', 'browser/chromeos/session_length_limiter_unittest.cc', 'browser/chromeos/proxy_config_service_impl_unittest.cc', 'browser/chromeos/settings/cros_settings_unittest.cc', - 'browser/chromeos/settings/device_oauth2_token_service_factory_unittest.cc', 'browser/chromeos/settings/device_oauth2_token_service_unittest.cc', 'browser/chromeos/settings/device_settings_provider_unittest.cc', 'browser/chromeos/settings/device_settings_service_unittest.cc', @@ -753,15 +803,18 @@ 'browser/chromeos/settings/session_manager_operation_unittest.cc', 'browser/chromeos/settings/stub_cros_settings_provider_unittest.cc', 'browser/chromeos/system/automatic_reboot_manager_unittest.cc', + 'browser/chromeos/timezone/timezone_unittest.cc', + 'browser/chromeos/ui/idle_app_name_notification_view_unittest.cc', 'browser/chromeos/version_loader_unittest.cc', 'browser/command_updater_unittest.cc', + 'browser/component_updater/test/cld_component_installer_unittest.cc', 'browser/component_updater/test/component_installers_unittest.cc', - 'browser/component_updater/test/component_patcher_mock.h', 'browser/component_updater/test/component_patcher_unittest.cc', 'browser/component_updater/test/component_updater_ping_manager_unittest.cc', 'browser/component_updater/test/component_updater_service_unittest.cc', 'browser/component_updater/test/crx_downloader_unittest.cc', 'browser/component_updater/test/test_installer.cc', + 'browser/component_updater/test/update_checker_unittest.cc', 'browser/component_updater/test/update_response_unittest.cc', 'browser/component_updater/test/url_request_post_interceptor.cc', 'browser/content_settings/content_settings_default_provider_unittest.cc', @@ -785,6 +838,8 @@ 'browser/custom_handlers/protocol_handler_registry_unittest.cc', 'browser/diagnostics/diagnostics_model_unittest.cc', 'browser/diagnostics/diagnostics_controller_unittest.cc', + 'browser/devtools/devtools_contents_resizing_strategy_unittest.cc', + 'browser/devtools/devtools_network_controller_unittest.cc', 'browser/download/all_download_item_notifier_unittest.cc', 'browser/download/chrome_download_manager_delegate_unittest.cc', 'browser/download/download_history_unittest.cc', @@ -797,25 +852,29 @@ 'browser/download/download_status_updater_unittest.cc', 'browser/download/download_target_determiner_unittest.cc', 'browser/download/download_ui_controller_unittest.cc', + 'browser/drive/drive_app_registry_unittest.cc', 'browser/drive/drive_api_util_unittest.cc', 'browser/drive/drive_uploader_unittest.cc', 'browser/drive/event_logger_unittest.cc', 'browser/drive/fake_drive_service_unittest.cc', 'browser/enumerate_modules_model_unittest_win.cc', 'browser/extensions/active_tab_unittest.cc', + 'browser/extensions/active_script_controller_unittest.cc', 'browser/extensions/activity_log/activity_database_unittest.cc', 'browser/extensions/activity_log/activity_log_enabled_unittest.cc', 'browser/extensions/activity_log/activity_log_unittest.cc', 'browser/extensions/activity_log/activity_log_policy_unittest.cc', + 'browser/extensions/activity_log/ad_injection_unittest.cc', 'browser/extensions/activity_log/counting_policy_unittest.cc', 'browser/extensions/activity_log/database_string_table_unittest.cc', 'browser/extensions/activity_log/fullstream_ui_policy_unittest.cc', + 'browser/extensions/activity_log/hashed_ad_network_database_unittest.cc', 'browser/extensions/activity_log/uma_policy_unittest.cc', 'browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc', 'browser/extensions/api/alarms/alarms_api_unittest.cc', - 'browser/extensions/api/api_resource_manager_unittest.cc', 'browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc', 'browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc', + 'browser/extensions/api/cast_channel/cast_channel_api_unittest.cc', 'browser/extensions/api/cast_channel/cast_socket_unittest.cc', 'browser/extensions/api/content_settings/content_settings_store_unittest.cc', 'browser/extensions/api/content_settings/content_settings_unittest.cc', @@ -835,24 +894,26 @@ 'browser/extensions/api/dial/dial_device_data_unittest.cc', 'browser/extensions/api/dial/dial_registry_unittest.cc', 'browser/extensions/api/dial/dial_service_unittest.cc', - 'browser/extensions/api/discovery/discovery_api_unittest.cc', 'browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc', 'browser/extensions/api/extension_action/extension_action_prefs_unittest.cc', - 'browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc', 'browser/extensions/api/file_system/file_system_api_unittest.cc', 'browser/extensions/api/identity/account_tracker_unittest.cc', 'browser/extensions/api/identity/extension_token_key_unittest.cc', 'browser/extensions/api/identity/gaia_web_auth_flow_unittest.cc', 'browser/extensions/api/identity/identity_mint_queue_unittest.cc', 'browser/extensions/api/idle/idle_api_unittest.cc', + 'browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc', 'browser/extensions/api/image_writer_private/operation_manager_unittest.cc', 'browser/extensions/api/image_writer_private/operation_unittest.cc', + 'browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc', 'browser/extensions/api/image_writer_private/test_utils.cc', 'browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc', + 'browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc', 'browser/extensions/api/log_private/syslog_parser_unittest.cc', + 'browser/extensions/api/mdns/dns_sd_registry_unittest.cc', 'browser/extensions/api/messaging/native_message_process_host_unittest.cc', 'browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc', - 'browser/extensions/api/mdns/dns_sd_registry_unittest.cc', + 'browser/extensions/api/messaging/native_messaging_policy_handler_unittest.cc', 'browser/extensions/api/omnibox/omnibox_unittest.cc', 'browser/extensions/api/permissions/permissions_api_helpers_unittest.cc', 'browser/extensions/api/power/power_api_unittest.cc', @@ -860,7 +921,6 @@ 'browser/extensions/api/proxy/proxy_api_helpers_unittest.cc', 'browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher_unittest.cc', 'browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc', - 'browser/extensions/api/serial/serial_port_enumerator_unittest.cc', 'browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc', 'browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc', 'browser/extensions/api/signed_in_devices/signed_in_devices_manager_unittest.cc', @@ -871,12 +931,9 @@ 'browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc', 'browser/extensions/api/sockets_udp/sockets_udp_api_unittest.cc', 'browser/extensions/api/storage/policy_value_store_unittest.cc', - 'browser/extensions/api/storage/settings_frontend_unittest.cc', - 'browser/extensions/api/storage/settings_quota_unittest.cc', 'browser/extensions/api/storage/settings_sync_unittest.cc', - 'browser/extensions/api/storage/settings_test_util.cc', - 'browser/extensions/api/storage/settings_test_util.h', 'browser/extensions/api/streams_private/streams_private_manifest_unittest.cc', + 'browser/extensions/api/synced_notifications_private/synced_notifications_shim_unittest.cc', 'browser/extensions/api/system_display/display_info_provider_chromeos_unittest.cc', 'browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc', 'browser/extensions/api/web_request/form_data_parser_unittest.cc', @@ -886,6 +943,8 @@ 'browser/extensions/api/web_request/web_request_time_tracker_unittest.cc', 'browser/extensions/app_sync_data_unittest.cc', 'browser/extensions/blacklist_unittest.cc', + 'browser/extensions/blacklist_state_fetcher_unittest.cc', + 'browser/extensions/bookmark_app_helper_unittest.cc', 'browser/extensions/browser_permissions_policy_delegate_unittest.cc', 'browser/extensions/chrome_app_sorting_unittest.cc', 'browser/extensions/component_loader_unittest.cc', @@ -894,41 +953,47 @@ 'browser/extensions/default_apps_unittest.cc', 'browser/extensions/error_console/error_console_unittest.cc', 'browser/extensions/event_router_forwarder_unittest.cc', + 'browser/extensions/extension_api_unittest.cc', + 'browser/extensions/extension_api_unittest.h', 'browser/extensions/extension_action_icon_factory_unittest.cc', 'browser/extensions/extension_action_unittest.cc', 'browser/extensions/extension_context_menu_model_unittest.cc', 'browser/extensions/extension_creator_filter_unittest.cc', + 'browser/extensions/extension_error_controller_unittest.cc', 'browser/extensions/extension_function_test_utils.cc', 'browser/extensions/extension_function_test_utils.h', - 'browser/extensions/extension_icon_image_unittest.cc', + 'browser/extensions/extension_garbage_collector_unittest.cc', + 'browser/extensions/extension_garbage_collector_chromeos_unittest.cc', + 'browser/extensions/extension_gcm_app_handler_unittest.cc', 'browser/extensions/extension_icon_manager_unittest.cc', 'browser/extensions/extension_message_bubble_controller_unittest.cc', - 'browser/extensions/extension_pref_value_map_unittest.cc', 'browser/extensions/extension_prefs_unittest.cc', 'browser/extensions/extension_prefs_unittest.h', - 'browser/extensions/extension_protocols_unittest.cc', + 'browser/extensions/extension_service_test_base.h', + 'browser/extensions/extension_service_test_base.cc', 'browser/extensions/extension_service_unittest.cc', - 'browser/extensions/extension_service_unittest.h', 'browser/extensions/extension_special_storage_policy_unittest.cc', 'browser/extensions/extension_sync_data_unittest.cc', + 'browser/extensions/extension_test_message_listener_unittest.cc', 'browser/extensions/extension_ui_unittest.cc', 'browser/extensions/extension_warning_badge_service_unittest.cc', 'browser/extensions/extension_warning_service_unittest.cc', + 'browser/extensions/extension_web_ui_unittest.cc', 'browser/extensions/external_policy_loader_unittest.cc', 'browser/extensions/external_provider_impl_unittest.cc', 'browser/extensions/external_provider_impl_chromeos_unittest.cc', - 'browser/extensions/image_loader_unittest.cc', + 'browser/extensions/favicon_downloader_unittest.cc', 'browser/extensions/menu_manager_unittest.cc', 'browser/extensions/pack_extension_unittest.cc', 'browser/extensions/page_action_controller_unittest.cc', 'browser/extensions/permissions_updater_unittest.cc', 'browser/extensions/policy_handlers_unittest.cc', - 'browser/extensions/process_manager_unittest.cc', 'browser/extensions/sandboxed_unpacker_unittest.cc', - 'browser/extensions/script_badge_controller_unittest.cc', - 'browser/extensions/script_bubble_controller_unittest.cc', - 'browser/extensions/token_cache/token_cache_service_unittest.cc', + 'browser/extensions/shared_module_service_unittest.cc', 'browser/extensions/standard_management_policy_provider_unittest.cc', + 'browser/extensions/token_cache/token_cache_service_unittest.cc', + 'browser/extensions/updater/extension_cache_fake.h', + 'browser/extensions/updater/extension_cache_fake.cc', 'browser/extensions/updater/extension_updater_unittest.cc', 'browser/extensions/user_script_listener_unittest.cc', 'browser/extensions/user_script_master_unittest.cc', @@ -938,12 +1003,14 @@ 'browser/favicon/favicon_handler_unittest.cc', 'browser/file_select_helper_unittest.cc', 'browser/first_run/first_run_unittest.cc', - 'browser/geolocation/chrome_geolocation_permission_context_unittest.cc', + 'browser/geolocation/geolocation_permission_context_unittest.cc', 'browser/global_keyboard_shortcuts_mac_unittest.mm', + 'browser/google/google_search_counter_android_unittest.cc', 'browser/google/google_search_counter_unittest.cc', 'browser/google/google_update_settings_unittest.cc', 'browser/google/google_url_tracker_unittest.cc', 'browser/google/google_util_unittest.cc', + 'browser/guest_view/guest_view_manager_unittest.cc', 'browser/history/android/android_cache_database_unittest.cc', 'browser/history/android/android_history_provider_service_unittest.cc', 'browser/history/android/android_history_types_unittest.cc', @@ -964,12 +1031,9 @@ 'browser/history/in_memory_url_index_types_unittest.cc', 'browser/history/in_memory_url_index_unittest.cc', 'browser/history/most_visited_tiles_experiment_unittest.cc', - 'browser/history/query_parser_unittest.cc', 'browser/history/scored_history_match_unittest.cc', 'browser/history/select_favicon_frames_unittest.cc', - 'browser/history/shortcuts_backend_unittest.cc', 'browser/history/shortcuts_database_unittest.cc', - 'browser/history/snippet_unittest.cc', 'browser/history/thumbnail_database_unittest.cc', 'browser/history/top_sites_cache_unittest.cc', 'browser/history/top_sites_database_unittest.cc', @@ -980,6 +1044,7 @@ 'browser/history/visit_database_unittest.cc', 'browser/history/visit_filter_unittest.cc', 'browser/history/visit_tracker_unittest.cc', + 'browser/image_holder_unittest.cc', 'browser/importer/firefox_profile_lock_unittest.cc', 'browser/importer/profile_writer_unittest.cc', 'browser/internal_auth_unittest.cc', @@ -991,52 +1056,61 @@ 'browser/install_verification/win/module_list_unittest.cc', 'browser/install_verification/win/module_verification_test.cc', 'browser/install_verification/win/module_verification_test.h', + 'browser/invalidation/gcm_invalidation_bridge_unittest.cc', 'browser/invalidation/invalidation_service_android_unittest.cc', - 'browser/invalidation/invalidation_service_test_template.cc', - 'browser/invalidation/invalidation_service_test_template.h', 'browser/invalidation/invalidator_storage_unittest.cc', - 'browser/invalidation/ticl_invalidation_service_unittest.cc', - 'browser/language_usage_metrics_unittest.cc', + 'browser/invalidation/ticl_profile_settings_provider_unittest.cc', + 'browser/local_discovery/gcd_api_flow_unittest.cc', + 'browser/local_discovery/gcd_registration_ticket_request_unittest.cc', 'browser/local_discovery/privet_confirm_api_flow_unittest.cc', 'browser/local_discovery/privet_http_unittest.cc', 'browser/local_discovery/privet_url_fetcher_unittest.cc', - 'browser/local_discovery/cloud_print_account_manager_unittest.cc', + 'browser/local_discovery/storage/path_util_unittest.cc', 'browser/local_discovery/cloud_print_printer_list_unittest.cc', + 'browser/local_discovery/cloud_device_list_unittest.cc', 'browser/local_discovery/service_discovery_client_mac_unittest.mm', 'browser/logging_chrome_unittest.cc', 'browser/mac/keystone_glue_unittest.mm', - 'browser/managed_mode/managed_mode_url_filter_unittest.cc', - 'browser/managed_mode/managed_user_service_unittest.cc', - 'browser/managed_mode/managed_user_sync_service_unittest.cc', - 'browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc', - 'browser/managed_mode/managed_user_registration_utility_unittest.cc', - 'browser/managed_mode/managed_user_settings_service_unittest.cc', - 'browser/managed_mode/supervised_user_pref_store_unittest.cc', + 'browser/media/audio_stream_monitor_unittest.cc', + 'browser/media/cast_transport_host_filter_unittest.cc', + 'browser/media/desktop_media_list_ash_unittest.cc', 'browser/media/native_desktop_media_list_unittest.cc', 'browser/media/webrtc_log_uploader_unittest.cc', + 'browser/media/webrtc_log_util_unittest.cc', + 'browser/media/webrtc_rtp_dump_handler_unittest.cc', + 'browser/media/webrtc_rtp_dump_writer_unittest.cc', 'browser/media_galleries/fileapi/native_media_file_util_unittest.cc', 'browser/media_galleries/linux/mtp_device_object_enumerator_unittest.cc', 'browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm', 'browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc', 'browser/media_galleries/media_file_system_registry_unittest.cc', + 'browser/media_galleries/media_folder_finder_unittest.cc', 'browser/media_galleries/media_galleries_dialog_controller_mock.cc', 'browser/media_galleries/media_galleries_dialog_controller_mock.h', + 'browser/media_galleries/media_galleries_dialog_controller_test_util.cc', + 'browser/media_galleries/media_galleries_dialog_controller_test_util.h', + 'browser/media_galleries/media_galleries_permission_controller_unittest.cc', 'browser/media_galleries/media_galleries_permissions_unittest.cc', - 'browser/media_galleries/media_galleries_dialog_controller_unittest.cc', 'browser/media_galleries/media_galleries_preferences_unittest.cc', + 'browser/media_galleries/media_galleries_scan_result_controller_unittest.cc', + 'browser/media_galleries/media_scan_manager_unittest.cc', 'browser/media_galleries/win/mtp_device_object_enumerator_unittest.cc', - 'browser/metrics/compression_utils_unittest.cc', - 'browser/metrics/metrics_log_unittest.cc', - 'browser/metrics/metrics_log_serializer_unittest.cc', - 'browser/metrics/metrics_reporting_scheduler_unittest.cc', - 'browser/metrics/metrics_service_unittest.cc', + 'browser/metrics/chrome_metrics_service_accessor_unittest.cc', + 'browser/metrics/cloned_install_detector_unittest.cc', + 'browser/metrics/extensions_metrics_provider_unittest.cc', + 'browser/metrics/gpu_metrics_provider_unittest.cc', + 'browser/metrics/plugin_metrics_provider_unittest.cc', + 'browser/metrics/profiler_metrics_provider_unittest.cc', + 'browser/metrics/rappor/sampling_unittest.cc', 'browser/metrics/thread_watcher_unittest.cc', + 'browser/metrics/thread_watcher_android_unittest.cc', 'browser/metrics/time_ticks_experiment_unittest.cc', 'browser/metrics/variations/variations_http_header_provider_unittest.cc', - 'browser/metrics/variations/variations_service_unittest.cc', + 'browser/metrics/variations/variations_request_scheduler_mobile_unittest.cc', 'browser/metrics/variations/variations_request_scheduler_unittest.cc', + 'browser/metrics/variations/variations_seed_store_unittest.cc', + 'browser/metrics/variations/variations_service_unittest.cc', 'browser/net/chrome_fraudulent_certificate_reporter_unittest.cc', - 'browser/net/chrome_network_data_saving_metrics_unittest.cc', 'browser/net/chrome_network_delegate_unittest.cc', 'browser/net/client_hints_unittest.cc', 'browser/net/connection_tester_unittest.cc', @@ -1044,8 +1118,6 @@ 'browser/net/dns_probe_service_unittest.cc', 'browser/net/evicted_domain_cookie_counter_unittest.cc', 'browser/net/firefox_proxy_settings_unittest.cc', - 'browser/net/gaia/gaia_oauth_fetcher_unittest.cc', - 'browser/net/http_pipelining_compatibility_client_unittest.cc', 'browser/net/http_server_properties_manager_unittest.cc', 'browser/net/net_error_tab_helper_unittest.cc', 'browser/net/net_log_temp_file_unittest.cc', @@ -1054,74 +1126,72 @@ 'browser/net/pref_proxy_config_tracker_impl_unittest.cc', 'browser/net/probe_message_unittest.cc', 'browser/net/proxy_policy_handler_unittest.cc', - 'browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc', - 'browser/net/spdyproxy/data_reduction_proxy_settings_unittest.h', + 'browser/net/spdyproxy/data_reduction_proxy_chrome_configurator_unittest.cc', 'browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc', - 'browser/net/spdyproxy/http_auth_handler_spdyproxy_unittest.cc', 'browser/net/sqlite_server_bound_cert_store_unittest.cc', 'browser/net/ssl_config_service_manager_pref_unittest.cc', 'browser/net/url_info_unittest.cc', - 'browser/network_time/navigation_time_helper_unittest.cc', - 'browser/network_time/network_time_tracker_unittest.cc', 'browser/notifications/desktop_notification_service_unittest.cc', + 'browser/notifications/extension_welcome_notification_unittest.cc', 'browser/notifications/login_state_notification_blocker_chromeos_unittest.cc', 'browser/notifications/message_center_notifications_unittest_win.cc', 'browser/notifications/message_center_settings_controller_unittest.cc', - 'browser/notifications/multi_user_notification_blocker_chromeos_unittest.cc', 'browser/notifications/sync_notifier/chrome_notifier_delegate_unittest.cc', 'browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc', 'browser/notifications/sync_notifier/synced_notification_unittest.cc', + 'browser/notifications/sync_notifier/synced_notification_app_info_unittest.cc', + 'browser/notifications/sync_notifier/synced_notification_app_info_service_unittest.cc', 'browser/notifications/sync_notifier/sync_notifier_test_utils.cc', 'browser/notifications/sync_notifier/sync_notifier_test_utils.h', - 'browser/notifications/welcome_notification_unittest.cc', + 'browser/notifications/sync_notifier/welcome_delegate_unittest.cc', 'browser/omnibox/omnibox_field_trial_unittest.cc', + 'browser/omaha_query_params/omaha_query_params_unittest.cc', 'browser/parsers/metadata_parser_filebase_unittest.cc', - 'browser/password_manager/login_database_unittest.cc', + 'browser/password_manager/chrome_password_manager_client_unittest.cc', 'browser/password_manager/native_backend_gnome_x_unittest.cc', 'browser/password_manager/native_backend_kwallet_x_unittest.cc', - 'browser/password_manager/password_form_manager_unittest.cc', - 'browser/password_manager/password_generation_manager_unittest.cc', + 'browser/password_manager/password_manager_internals_service_unittest.cc', 'browser/password_manager/password_manager_metrics_util_unittest.cc', - 'browser/password_manager/password_manager_unittest.cc', - 'browser/password_manager/password_store_unittest.cc', - 'browser/password_manager/password_store_default_unittest.cc', 'browser/password_manager/password_store_mac_unittest.cc', 'browser/password_manager/password_store_win_unittest.cc', 'browser/password_manager/password_store_x_unittest.cc', - 'browser/password_manager/psl_matching_helper_unittest.cc', 'browser/performance_monitor/database_unittest.cc', 'browser/plugins/plugin_finder_unittest.cc', + 'browser/plugins/plugin_info_message_filter_unittest.cc', + 'browser/plugins/plugin_installer_unittest.cc', 'browser/plugins/plugin_metadata_unittest.cc', 'browser/plugins/plugin_prefs_unittest.cc', - 'browser/policy/autofill_policy_handler_unittest.cc', - 'browser/policy/browser_policy_connector_unittest.cc', 'browser/policy/cloud/cloud_policy_invalidator_unittest.cc', 'browser/policy/cloud/user_policy_signin_service_unittest.cc', - 'browser/policy/configuration_policy_handler_unittest.cc', - 'browser/policy/configuration_policy_pref_store_test.cc', - 'browser/policy/configuration_policy_pref_store_test.h', - 'browser/policy/configuration_policy_pref_store_unittest.cc', 'browser/policy/file_selection_dialogs_policy_handler_unittest.cc', 'browser/policy/javascript_policy_handler_unittest.cc', + 'browser/policy/managed_bookmarks_policy_handler_unittest.cc', 'browser/policy/policy_path_parser_unittest.cc', + 'browser/policy/profile_policy_connector_unittest.cc', 'browser/policy/url_blacklist_manager_unittest.cc', - 'browser/policy/url_blacklist_policy_handler_unittest.cc', 'browser/predictors/autocomplete_action_predictor_table_unittest.cc', 'browser/predictors/autocomplete_action_predictor_unittest.cc', - 'browser/predictors/resource_prefetch_predictor_unittest.cc', - 'browser/predictors/resource_prefetch_predictor_tables_unittest.cc', - 'browser/predictors/resource_prefetcher_unittest.cc', 'browser/prefs/chrome_pref_service_unittest.cc', 'browser/prefs/command_line_pref_store_unittest.cc', 'browser/prefs/incognito_mode_prefs_unittest.cc', - 'browser/prefs/pref_metrics_service_unittest.cc', + 'browser/prefs/leveldb_pref_store_unittest.cc', + 'browser/prefs/mock_validation_delegate.cc', + 'browser/prefs/mock_validation_delegate.h', + 'browser/prefs/pref_hash_calculator_unittest.cc', + 'browser/prefs/pref_hash_filter_unittest.cc', + 'browser/prefs/pref_hash_store_impl_unittest.cc', 'browser/prefs/pref_model_associator_unittest.cc', + 'browser/prefs/prefs_syncable_service_unittest.cc', + 'browser/prefs/profile_pref_store_manager_unittest.cc', 'browser/prefs/proxy_config_dictionary_unittest.cc', 'browser/prefs/proxy_policy_unittest.cc', 'browser/prefs/proxy_prefs_unittest.cc', 'browser/prefs/session_startup_pref_unittest.cc', + 'browser/prefs/tracked/pref_hash_calculator_helper_win_unittest.cc', + 'browser/prefs/tracked/pref_service_hash_store_contents_unittest.cc', + 'browser/prefs/tracked/segregated_pref_store_unittest.cc', + 'browser/prefs/tracked/tracked_preferences_migration_unittest.cc', 'browser/prerender/prerender_history_unittest.cc', - 'browser/prerender/prerender_manager_unittest.cc', 'browser/prerender/prerender_tracker_unittest.cc', 'browser/prerender/prerender_unittest.cc', 'browser/prerender/prerender_util_unittest.cc', @@ -1132,8 +1202,7 @@ 'browser/printing/print_preview_test.cc', 'browser/printing/print_preview_test.h', 'browser/process_info_snapshot_mac_unittest.cc', - 'browser/process_singleton_linux_unittest.cc', - 'browser/process_singleton_mac_unittest.cc', + 'browser/process_singleton_posix_unittest.cc', 'browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc', 'browser/profile_resetter/automatic_profile_resetter_unittest.cc', 'browser/profile_resetter/jtl_interpreter_unittest.cc', @@ -1145,13 +1214,18 @@ 'browser/profiles/profile_downloader_unittest.cc', 'browser/profiles/profile_info_cache_unittest.cc', 'browser/profiles/profile_info_cache_unittest.h', - 'browser/profiles/profile_info_util_unittest.cc', + 'browser/profiles/profile_avatar_icon_util_unittest.cc', 'browser/profiles/profile_list_desktop_unittest.cc', 'browser/profiles/profile_manager_unittest.cc', 'browser/profiles/profile_shortcut_manager_unittest_win.cc', - 'browser/renderer_host/plugin_info_message_filter_unittest.cc', + 'browser/renderer_context_menu/context_menu_content_type_unittest.cc', + 'browser/renderer_context_menu/render_view_context_menu_test_util.cc', + 'browser/renderer_context_menu/render_view_context_menu_test_util.h', + 'browser/renderer_context_menu/render_view_context_menu_unittest.cc', 'browser/renderer_host/web_cache_manager_unittest.cc', 'browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm', + 'browser/resources/chromeos/braille_ime/braille_ime.js', + 'browser/resources/chromeos/braille_ime/braille_ime_unittest.gtestjs', 'browser/resources/google_now/background.js', 'browser/resources/google_now/background_test_util.js', 'browser/resources/google_now/background_unittest.gtestjs', @@ -1167,6 +1241,7 @@ 'browser/resources/print_preview/print_preview_utils_unittest.gtestjs', 'browser/resources_util_unittest.cc', 'browser/rlz/rlz_unittest.cc', + 'browser/safe_browsing/binary_feature_extractor_win_unittest.cc', 'browser/safe_browsing/browser_feature_extractor_unittest.cc', 'browser/safe_browsing/chunk_range_unittest.cc', 'browser/safe_browsing/client_side_detection_host_unittest.cc', @@ -1175,9 +1250,16 @@ 'browser/safe_browsing/download_feedback_service_unittest.cc', 'browser/safe_browsing/download_feedback_unittest.cc', 'browser/safe_browsing/download_protection_service_unittest.cc', + 'browser/safe_browsing/environment_data_collection_win_unittest.cc', + 'browser/safe_browsing/incident_report_uploader_impl_unittest.cc', + 'browser/safe_browsing/incident_reporting_service_unittest.cc', + 'browser/safe_browsing/last_download_finder_unittest.cc', 'browser/safe_browsing/local_two_phase_testserver.cc', 'browser/safe_browsing/malware_details_unittest.cc', + 'browser/safe_browsing/path_sanitizer_unittest.cc', + 'browser/safe_browsing/pe_image_reader_win_unittest.cc', 'browser/safe_browsing/ping_manager_unittest.cc', + 'browser/safe_browsing/preference_validation_delegate_unittest.cc', 'browser/safe_browsing/prefix_set_unittest.cc', 'browser/safe_browsing/protocol_manager_unittest.cc', 'browser/safe_browsing/protocol_parser_unittest.cc', @@ -1185,16 +1267,21 @@ 'browser/safe_browsing/safe_browsing_database_unittest.cc', 'browser/safe_browsing/safe_browsing_store_file_unittest.cc', 'browser/safe_browsing/safe_browsing_store_unittest.cc', - 'browser/safe_browsing/safe_browsing_store_unittest_helper.cc', 'browser/safe_browsing/safe_browsing_util_unittest.cc', - 'browser/safe_browsing/signature_util_win_unittest.cc', 'browser/safe_browsing/two_phase_uploader_unittest.cc', + 'browser/search/hotword_service_unittest.cc', 'browser/search/iframe_source_unittest.cc', 'browser/search/instant_service_unittest.cc', 'browser/search/instant_unittest_base.cc', 'browser/search/instant_unittest_base.h', 'browser/search/most_visited_iframe_source_unittest.cc', 'browser/search/search_unittest.cc', + 'browser/search/search_android_unittest.cc', + 'browser/search/suggestions/suggestions_service_unittest.cc', + 'browser/search/suggestions/suggestions_store_unittest.cc', + 'browser/search/suggestions/thumbnail_manager_unittest.cc', + 'browser/search_engines/default_search_manager_unittest.cc', + 'browser/search_engines/default_search_pref_migration_unittest.cc', 'browser/search_engines/default_search_policy_handler_unittest.cc', 'browser/search_engines/search_host_to_urls_map_unittest.cc', 'browser/search_engines/search_provider_install_data_unittest.cc', @@ -1206,8 +1293,8 @@ 'browser/search_engines/template_url_prepopulate_data_unittest.cc', 'browser/search_engines/template_url_scraper_unittest.cc', 'browser/search_engines/template_url_unittest.cc', - 'browser/services/gcm/gcm_client_mock.cc', - 'browser/services/gcm/gcm_client_mock.h', + 'browser/services/gcm/fake_signin_manager.cc', + 'browser/services/gcm/fake_signin_manager.h', 'browser/services/gcm/gcm_profile_service_unittest.cc', 'browser/sessions/persistent_tab_restore_service_unittest.cc', 'browser/sessions/restore_on_startup_policy_handler_unittest.cc', @@ -1217,19 +1304,16 @@ 'browser/shell_integration_linux_unittest.cc', 'browser/shell_integration_win_unittest.cc', 'browser/signin/account_reconcilor_unittest.cc', - 'browser/signin/fake_auth_status_provider.cc', - 'browser/signin/fake_auth_status_provider.h', - 'browser/signin/google_auto_login_helper_unittest.cc', + 'browser/signin/account_service_flag_fetcher_unittest.cc', 'browser/signin/local_auth_unittest.cc', - 'browser/signin/mutable_profile_oauth2_token_service_unittest.cc', - 'browser/signin/profile_oauth2_token_service_request_unittest.cc', + 'browser/signin/signin_error_notifier_ash_unittest.cc', 'browser/signin/signin_global_error_unittest.cc', 'browser/signin/signin_manager_unittest.cc', 'browser/signin/signin_names_io_thread_unittest.cc', + 'browser/signin/signin_promo_unittest.cc', 'browser/signin/signin_tracker_unittest.cc', - 'browser/signin/ubertoken_fetcher_unittest.cc', + 'browser/signin/test_signin_client_builder.cc', 'browser/speech/extension_api/extension_manifests_tts_unittest.cc', - 'browser/speech/speech_recognition_bubble_controller_unittest.cc', 'browser/speech/tts_controller_unittest.cc', 'browser/spellchecker/feedback_sender_unittest.cc', 'browser/spellchecker/feedback_unittest.cc', @@ -1246,111 +1330,88 @@ 'browser/status_icons/status_icon_menu_model_unittest.cc', 'browser/status_icons/status_icon_unittest.cc', 'browser/status_icons/status_tray_unittest.cc', - 'browser/storage_monitor/image_capture_device_manager_unittest.mm', - 'browser/storage_monitor/media_storage_util_unittest.cc', - 'browser/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc', - 'browser/storage_monitor/mock_removable_storage_observer.cc', - 'browser/storage_monitor/mock_removable_storage_observer.h', - 'browser/storage_monitor/storage_info_unittest.cc', - 'browser/storage_monitor/storage_monitor_chromeos_unittest.cc', - 'browser/storage_monitor/storage_monitor_linux_unittest.cc', - 'browser/storage_monitor/storage_monitor_mac_unittest.mm', - 'browser/storage_monitor/storage_monitor_win_unittest.cc', - 'browser/storage_monitor/storage_monitor_unittest.cc', - 'browser/storage_monitor/test_portable_device_watcher_win.cc', - 'browser/storage_monitor/test_portable_device_watcher_win.h', - 'browser/storage_monitor/test_storage_monitor_win.cc', - 'browser/storage_monitor/test_storage_monitor_win.h', - 'browser/storage_monitor/test_volume_mount_watcher_win.cc', - 'browser/storage_monitor/test_volume_mount_watcher_win.h', + 'browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc', + 'browser/supervised_user/supervised_user_pref_store_unittest.cc', + 'browser/supervised_user/supervised_user_refresh_token_fetcher_unittest.cc', + 'browser/supervised_user/supervised_user_registration_utility_unittest.cc', + 'browser/supervised_user/supervised_user_service_unittest.cc', + 'browser/supervised_user/supervised_user_settings_service_unittest.cc', + 'browser/supervised_user/supervised_user_shared_settings_service_unittest.cc', + 'browser/supervised_user/supervised_user_shared_settings_update_unittest.cc', + 'browser/supervised_user/supervised_user_sync_service_unittest.cc', + 'browser/supervised_user/supervised_user_url_filter_unittest.cc', 'browser/sync/about_sync_util_unittest.cc', 'browser/sync/abstract_profile_sync_service_test.cc', 'browser/sync/abstract_profile_sync_service_test.h', 'browser/sync/backend_migrator_unittest.cc', - 'browser/sync/fake_oauth2_token_service.cc', - 'browser/sync/fake_oauth2_token_service.h', + 'browser/sync/backup_rollback_controller_unittest.cc', 'browser/sync/glue/autofill_data_type_controller_unittest.cc', 'browser/sync/glue/bookmark_data_type_controller_unittest.cc', 'browser/sync/glue/browser_thread_model_worker_unittest.cc', - 'browser/sync/glue/change_processor_mock.cc', - 'browser/sync/glue/change_processor_mock.h', - 'browser/sync/glue/chrome_encryptor_unittest.cc', - 'browser/sync/glue/data_type_controller_mock.cc', - 'browser/sync/glue/data_type_controller_mock.h', - 'browser/sync/glue/data_type_error_handler_mock.cc', - 'browser/sync/glue/data_type_error_handler_mock.h', - 'browser/sync/glue/data_type_manager_impl_unittest.cc', - 'browser/sync/glue/data_type_manager_mock.cc', - 'browser/sync/glue/data_type_manager_mock.h', 'browser/sync/glue/extensions_activity_monitor_unittest.cc', - 'browser/sync/glue/fake_data_type_controller.cc', - 'browser/sync/glue/fake_data_type_controller.h', - 'browser/sync/glue/fake_generic_change_processor.cc', - 'browser/sync/glue/fake_generic_change_processor.h', 'browser/sync/glue/favicon_cache_unittest.cc', 'browser/sync/glue/frontend_data_type_controller_mock.cc', 'browser/sync/glue/frontend_data_type_controller_mock.h', 'browser/sync/glue/frontend_data_type_controller_unittest.cc', - 'browser/sync/glue/generic_change_processor_unittest.cc', - 'browser/sync/glue/model_association_manager_unittest.cc', - 'browser/sync/glue/model_associator_mock.cc', - 'browser/sync/glue/model_associator_mock.h', 'browser/sync/glue/non_frontend_data_type_controller_mock.cc', 'browser/sync/glue/non_frontend_data_type_controller_mock.h', 'browser/sync/glue/non_frontend_data_type_controller_unittest.cc', - 'browser/sync/glue/non_ui_data_type_controller_mock.cc', - 'browser/sync/glue/non_ui_data_type_controller_mock.h', - 'browser/sync/glue/non_ui_data_type_controller_unittest.cc', 'browser/sync/glue/search_engine_data_type_controller_unittest.cc', - 'browser/sync/glue/session_model_associator_unittest.cc', - 'browser/sync/glue/shared_change_processor_mock.cc', - 'browser/sync/glue/shared_change_processor_mock.h', - 'browser/sync/glue/shared_change_processor_unittest.cc', 'browser/sync/glue/sync_backend_host_impl_unittest.cc', 'browser/sync/glue/sync_backend_host_mock.cc', 'browser/sync/glue/sync_backend_host_mock.h', 'browser/sync/glue/sync_backend_registrar_unittest.cc', 'browser/sync/glue/synced_device_tracker_unittest.cc', 'browser/sync/glue/synced_session_tracker_unittest.cc', - 'browser/sync/glue/tab_node_pool_unittest.cc', 'browser/sync/glue/typed_url_model_associator_unittest.cc', - 'browser/sync/glue/ui_data_type_controller_unittest.cc', 'browser/sync/glue/ui_model_worker_unittest.cc', + 'browser/sync/profile_sync_auth_provider_unittest.cc', 'browser/sync/profile_sync_components_factory_impl_unittest.cc', 'browser/sync/profile_sync_components_factory_mock.cc', 'browser/sync/profile_sync_components_factory_mock.h', 'browser/sync/profile_sync_service_autofill_unittest.cc', 'browser/sync/profile_sync_service_bookmark_unittest.cc', - 'browser/sync/profile_sync_service_password_unittest.cc', - 'browser/sync/profile_sync_service_preference_unittest.cc', - 'browser/sync/profile_sync_service_session_unittest.cc', 'browser/sync/profile_sync_service_startup_unittest.cc', 'browser/sync/profile_sync_service_typed_url_unittest.cc', 'browser/sync/profile_sync_service_unittest.cc', 'browser/sync/profile_sync_test_util.cc', 'browser/sync/profile_sync_test_util.h', - 'browser/sync/sessions2/sessions_sync_manager_unittest.cc', - 'browser/sync/sessions2/tab_node_pool2_unittest.cc', + 'browser/sync/sessions/sessions_sync_manager_unittest.cc', + 'browser/sync/sessions/tab_node_pool_unittest.cc', + 'browser/sync/startup_controller_unittest.cc', + 'browser/sync/sync_error_notifier_ash_unittest.cc', 'browser/sync/sync_global_error_unittest.cc', 'browser/sync/sync_policy_handler_unittest.cc', - 'browser/sync/sync_prefs_unittest.cc', 'browser/sync/sync_startup_tracker_unittest.cc', 'browser/sync/sync_ui_util_unittest.cc', 'browser/sync/test/test_http_bridge_factory.cc', 'browser/sync/test/test_http_bridge_factory.h', 'browser/sync/test_profile_sync_service.cc', 'browser/sync/test_profile_sync_service.h', + 'browser/sync_file_system/drive_backend/callback_helper_unittest.cc', + 'browser/sync_file_system/drive_backend/callback_tracker_unittest.cc', 'browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc', + 'browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc', 'browser/sync_file_system/drive_backend/drive_backend_test_util.cc', 'browser/sync_file_system/drive_backend/drive_backend_test_util.h', + 'browser/sync_file_system/drive_backend/fake_drive_service_helper.cc', + 'browser/sync_file_system/drive_backend/fake_drive_service_helper.h', + 'browser/sync_file_system/drive_backend/fake_drive_uploader.cc', + 'browser/sync_file_system/drive_backend/fake_drive_uploader.h', + 'browser/sync_file_system/drive_backend/fake_sync_worker.cc', + 'browser/sync_file_system/drive_backend/fake_sync_worker.h', 'browser/sync_file_system/drive_backend/list_changes_task_unittest.cc', 'browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc', + 'browser/sync_file_system/drive_backend/metadata_database_index_unittest.cc', 'browser/sync_file_system/drive_backend/metadata_database_unittest.cc', 'browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc', 'browser/sync_file_system/drive_backend/register_app_task_unittest.cc', 'browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc', 'browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc', 'browser/sync_file_system/drive_backend/sync_engine_unittest.cc', + 'browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc', + 'browser/sync_file_system/drive_backend/sync_worker_unittest.cc', + 'browser/sync_file_system/drive_backend/task_dependency_manager_unittest.cc', 'browser/sync_file_system/drive_backend_v1/api_util_unittest.cc', 'browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc', 'browser/sync_file_system/drive_backend_v1/drive_file_sync_service_sync_unittest.cc', @@ -1359,10 +1420,6 @@ 'browser/sync_file_system/drive_backend_v1/fake_api_util.cc', 'browser/sync_file_system/drive_backend_v1/fake_api_util.h', 'browser/sync_file_system/drive_backend_v1/fake_api_util_unittest.cc', - 'browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.cc', - 'browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.h', - 'browser/sync_file_system/drive_backend_v1/fake_drive_uploader.cc', - 'browser/sync_file_system/drive_backend_v1/fake_drive_uploader.h', 'browser/sync_file_system/drive_backend_v1/local_sync_operation_resolver_unittest.cc', 'browser/sync_file_system/drive_backend_v1/origin_operation_queue_unittest.cc', 'browser/sync_file_system/drive_backend_v1/remote_sync_operation_resolver_unittest.cc', @@ -1386,15 +1443,11 @@ 'browser/sync_file_system/mock_remote_change_processor.h', 'browser/sync_file_system/mock_remote_file_sync_service.cc', 'browser/sync_file_system/mock_remote_file_sync_service.h', + 'browser/sync_file_system/subtree_set_unittest.cc', 'browser/sync_file_system/sync_file_system_service_unittest.cc', 'browser/sync_file_system/sync_file_system_test_util.cc', 'browser/sync_file_system/sync_file_system_test_util.h', - 'browser/sync_file_system/sync_task_manager_unittest.cc', 'browser/sync_file_system/syncable_file_system_util_unittest.cc', - 'browser/tab_contents/language_state_unittest.cc', - 'browser/tab_contents/render_view_context_menu_test_util.cc', - 'browser/tab_contents/render_view_context_menu_test_util.h', - 'browser/tab_contents/render_view_context_menu_unittest.cc', 'browser/task_manager/task_manager_unittest.cc', 'browser/task_manager/task_manager_util_unittest.cc', 'browser/task_profiler/task_profiler_data_serializer_unittest.cc', @@ -1404,42 +1457,59 @@ 'browser/themes/theme_syncable_service_unittest.cc', 'browser/thumbnails/content_analysis_unittest.cc', 'browser/thumbnails/content_based_thumbnailing_algorithm_unittest.cc', - 'browser/thumbnails/render_widget_snapshot_taker_unittest.cc', 'browser/thumbnails/simple_thumbnail_crop_unittest.cc', 'browser/thumbnails/thumbnail_service_unittest.cc', - 'browser/translate/translate_browser_metrics_unittest.cc', - 'browser/translate/translate_manager_unittest.cc', - 'browser/translate/translate_prefs_unittest.cc', - 'browser/translate/translate_script_unittest.cc', + 'browser/translate/translate_manager_render_view_host_unittest.cc', + 'browser/translate/translate_service_unittest.cc', 'browser/ui/android/tab_model/tab_model_unittest.cc', - 'browser/ui/ash/event_rewriter_unittest.cc', + 'browser/ui/app_list/app_list_positioner_unittest.cc', + 'browser/ui/app_list/app_list_service_mac_unittest.mm', + 'browser/ui/app_list/app_list_service_unittest.cc', + 'browser/ui/app_list/app_list_shower_views_unittest.cc', + 'browser/ui/app_list/app_list_test_util.cc', + 'browser/ui/app_list/app_list_test_util.h', + 'browser/ui/app_list/extension_app_model_builder_unittest.cc', + 'browser/ui/app_list/profile_loader_unittest.cc', + 'browser/ui/app_list/test/fake_profile.cc', + 'browser/ui/app_list/test/fake_profile.h', + 'browser/ui/app_list/test/fake_profile_store.cc', + 'browser/ui/app_list/test/fake_profile_store.h', + 'browser/ui/app_list/test/fast_show_pickler_unittest.cc', 'browser/ui/ash/ime_controller_chromeos_unittest.cc', + 'browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc', 'browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc', 'browser/ui/ash/launcher/launcher_context_menu_unittest.cc', 'browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc', + 'browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc', 'browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc', 'browser/ui/ash/screenshot_taker_unittest.cc', 'browser/ui/ash/session_state_delegate_chromeos_unittest.cc', 'browser/ui/ash/window_positioner_unittest.cc', 'browser/ui/autofill/account_chooser_model_unittest.cc', 'browser/ui/autofill/autofill_dialog_controller_unittest.cc', + 'browser/ui/autofill/autofill_dialog_i18n_input_unittest.cc', 'browser/ui/autofill/autofill_dialog_models_unittest.cc', 'browser/ui/autofill/autofill_dialog_types_unittest.cc', 'browser/ui/autofill/autofill_popup_controller_unittest.cc', + 'browser/ui/autofill/country_combobox_model_unittest.cc', 'browser/ui/autofill/data_model_wrapper_unittest.cc', 'browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc', + 'browser/ui/autofill/mock_address_validator.cc', + 'browser/ui/autofill/mock_address_validator.h', 'browser/ui/autofill/mock_autofill_dialog_view_delegate.cc', 'browser/ui/autofill/mock_autofill_dialog_view_delegate.h', 'browser/ui/autofill/mock_new_credit_card_bubble_controller.cc', 'browser/ui/autofill/mock_new_credit_card_bubble_controller.h', + 'browser/ui/autofill/popup_controller_common_unittest.cc', 'browser/ui/autofill/test_generated_credit_card_bubble_controller.cc', 'browser/ui/autofill/test_generated_credit_card_bubble_controller.h', 'browser/ui/autofill/test_generated_credit_card_bubble_view.cc', 'browser/ui/autofill/test_generated_credit_card_bubble_view.h', + 'browser/ui/autofill/test_popup_controller_common.cc', + 'browser/ui/autofill/test_popup_controller_common.h', 'browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc', 'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc', 'browser/ui/bookmarks/bookmark_editor_unittest.cc', - 'browser/ui/bookmarks/bookmark_prompt_controller_unittest.cc', 'browser/ui/bookmarks/bookmark_ui_utils_unittest.cc', 'browser/ui/bookmarks/bookmark_unittest.cc', 'browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc', @@ -1474,6 +1544,7 @@ 'browser/ui/cocoa/autofill/autofill_section_view_unittest.mm', 'browser/ui/cocoa/autofill/autofill_sign_in_container_unittest.mm', 'browser/ui/cocoa/autofill/autofill_suggestion_container_unittest.mm', + 'browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm', 'browser/ui/cocoa/autofill/down_arrow_popup_menu_cell_unittest.mm', 'browser/ui/cocoa/autofill/layout_view_unittest.mm', 'browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa_unittest.mm', @@ -1504,12 +1575,8 @@ 'browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm', 'browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm', 'browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell_unittest.mm', - 'browser/ui/cocoa/browser/avatar_button_controller_unittest.mm', - 'browser/ui/cocoa/browser/avatar_label_button_unittest.mm', - 'browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm', 'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm', 'browser/ui/cocoa/browser/password_generation_bubble_controller_unittest.mm', - 'browser/ui/cocoa/browser/profile_chooser_controller_unittest.mm', 'browser/ui/cocoa/browser/zoom_bubble_controller_unittest.mm', 'browser/ui/cocoa/browser_window_cocoa_unittest.mm', 'browser/ui/cocoa/browser_window_controller_unittest.mm', @@ -1529,6 +1596,7 @@ 'browser/ui/cocoa/constrained_window/constrained_window_button_unittest.mm', 'browser/ui/cocoa/constrained_window/constrained_window_custom_window_unittest.mm', 'browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm', + 'browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm', 'browser/ui/cocoa/content_settings/cookie_details_unittest.mm', 'browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm', 'browser/ui/cocoa/custom_frame_view_unittest.mm', @@ -1583,7 +1651,6 @@ 'browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm', 'browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm', 'browser/ui/cocoa/menu_button_unittest.mm', - 'browser/ui/cocoa/notifications/balloon_controller_unittest.mm', 'browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm', 'browser/ui/cocoa/nsmenuitem_additions_unittest.mm', 'browser/ui/cocoa/nsview_additions_unittest.mm', @@ -1594,9 +1661,16 @@ 'browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm', 'browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm', 'browser/ui/cocoa/panels/panel_cocoa_unittest.mm', - 'browser/ui/cocoa/profile_menu_controller_unittest.mm', + 'browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm', + 'browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm', + 'browser/ui/cocoa/profiles/avatar_label_button_unittest.mm', + 'browser/ui/cocoa/profiles/avatar_menu_bubble_controller_unittest.mm', + 'browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm', + 'browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm', + 'browser/ui/cocoa/profiles/user_manager_mac_unittest.mm', 'browser/ui/cocoa/run_loop_testing_unittest.mm', 'browser/ui/cocoa/screen_capture_notification_ui_cocoa_unittest.mm', + 'browser/ui/cocoa/sprite_view_unittest.mm', 'browser/ui/cocoa/status_bubble_mac_unittest.mm', 'browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm', 'browser/ui/cocoa/styled_text_field_cell_unittest.mm', @@ -1606,24 +1680,25 @@ 'browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm', 'browser/ui/cocoa/tab_contents/sad_tab_view_unittest.mm', 'browser/ui/cocoa/table_row_nsimage_cache_unittest.mm', - 'browser/ui/cocoa/tabpose_window_unittest.mm', 'browser/ui/cocoa/tabs/media_indicator_view_unittest.mm', 'browser/ui/cocoa/tabs/tab_controller_unittest.mm', 'browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm', 'browser/ui/cocoa/tabs/tab_strip_view_unittest.mm', 'browser/ui/cocoa/tabs/tab_view_unittest.mm', - 'browser/ui/cocoa/tabs/throbber_view_unittest.mm', 'browser/ui/cocoa/task_manager_mac_unittest.mm', 'browser/ui/cocoa/toolbar/reload_button_unittest.mm', 'browser/ui/cocoa/toolbar/toolbar_button_unittest.mm', 'browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm', 'browser/ui/cocoa/toolbar/toolbar_view_unittest.mm', 'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell_unittest.mm', + 'browser/ui/cocoa/translate/translate_bubble_controller_unittest.mm', 'browser/ui/cocoa/vertical_gradient_view_unittest.mm', 'browser/ui/cocoa/validation_message_bubble_controller_unittest.mm', 'browser/ui/cocoa/view_resizer_pong.h', 'browser/ui/cocoa/view_resizer_pong.mm', - 'browser/ui/cocoa/website_settings_bubble_controller_unittest.mm', + 'browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm', + 'browser/ui/cocoa/website_settings/permission_selector_button_unittest.mm', + 'browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm', 'browser/ui/cocoa/web_dialog_window_controller_unittest.mm', 'browser/ui/cocoa/window_size_autosaver_unittest.mm', 'browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm', @@ -1634,29 +1709,18 @@ 'browser/ui/find_bar/find_backend_unittest.cc', 'browser/ui/fullscreen/fullscreen_controller_state_unittest.cc', 'browser/ui/global_error/global_error_service_unittest.cc', - 'browser/ui/gtk/accelerators_gtk_unittest.cc', - 'browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc', - 'browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc', - 'browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc', - 'browser/ui/gtk/event_utils_unittest.cc', - 'browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc', - 'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc', - 'browser/ui/gtk/gtk_theme_service_unittest.cc', - 'browser/ui/gtk/omnibox/omnibox_popup_view_gtk_unittest.cc', - 'browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc', - 'browser/ui/gtk/reload_button_gtk_unittest.cc', - 'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc', - 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc', 'browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2_unittest.cc', 'browser/ui/login/login_prompt_unittest.cc', 'browser/ui/omnibox/omnibox_controller_unittest.cc', 'browser/ui/omnibox/omnibox_edit_unittest.cc', + 'browser/ui/omnibox/omnibox_popup_model_unittest.cc', 'browser/ui/omnibox/omnibox_view_unittest.cc', - 'browser/ui/panels/display_settings_provider_win_unittest.cc', 'browser/ui/panels/panel_mouse_watcher_unittest.cc', + 'browser/ui/passwords/manage_passwords_icon_mock.cc', + 'browser/ui/passwords/manage_passwords_bubble_model_unittest.cc', + 'browser/ui/passwords/manage_passwords_ui_controller_unittest.cc', 'browser/ui/passwords/password_manager_presenter_unittest.cc', 'browser/ui/search_engines/keyword_editor_controller_unittest.cc', - 'browser/ui/search/instant_ntp_prerenderer_unittest.cc', 'browser/ui/search/instant_page_unittest.cc', 'browser/ui/search/instant_search_prerenderer_unittest.cc', 'browser/ui/search/search_delegate_unittest.cc', @@ -1666,11 +1730,11 @@ 'browser/ui/search/search_tab_helper_unittest.cc', 'browser/ui/startup/session_crashed_infobar_delegate_unittest.cc', 'browser/ui/sync/one_click_signin_helper_unittest.cc', + 'browser/ui/sync/one_click_signin_sync_observer_unittest.cc', 'browser/ui/sync/one_click_signin_sync_starter_unittest.cc', 'browser/ui/sync/profile_signin_confirmation_helper_unittest.cc', 'browser/ui/sync/sync_promo_ui_unittest.cc', 'browser/ui/tab_contents/tab_contents_iterator_unittest.cc', - 'browser/ui/tabs/dock_info_unittest.cc', 'browser/ui/tabs/pinned_tab_codec_unittest.cc', 'browser/ui/tabs/pinned_tab_service_unittest.cc', 'browser/ui/tabs/pinned_tab_test_utils.cc', @@ -1678,10 +1742,12 @@ 'browser/ui/tabs/tab_strip_model_unittest.cc', 'browser/ui/tabs/test_tab_strip_model_delegate.cc', 'browser/ui/tabs/test_tab_strip_model_delegate.h', + 'browser/ui/tests/elide_url_unittest.cc', 'browser/ui/tests/ui_gfx_image_unittest.cc', 'browser/ui/tests/ui_gfx_image_unittest.mm', 'browser/ui/toolbar/back_forward_menu_model_unittest.cc', 'browser/ui/toolbar/encoding_menu_controller_unittest.cc', + 'browser/ui/toolbar/origin_chip_info_unittest.cc', 'browser/ui/toolbar/recent_tabs_builder_test_helper.cc', 'browser/ui/toolbar/recent_tabs_builder_test_helper.h', 'browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc', @@ -1692,11 +1758,14 @@ 'browser/ui/toolbar/wrench_menu_model_unittest.cc', 'browser/ui/views/accelerator_table_unittest.cc', 'browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc', + 'browser/ui/views/app_list/linux/app_list_linux_unittest.cc', + 'browser/ui/views/app_list/win/app_list_win_unittest.cc', + 'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc', + 'browser/ui/views/apps/shaped_app_window_targeter_unittest.cc', 'browser/ui/views/autofill/autofill_dialog_views_unittest.cc', - 'browser/ui/views/autofill/decorated_textfield_unittest.cc', 'browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc', 'browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc', - 'browser/ui/views/bookmarks/bookmark_context_menu_test.cc', + 'browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc', 'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc', 'browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc', 'browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc', @@ -1705,6 +1774,7 @@ 'browser/ui/views/constrained_window_views_unittest.cc', 'browser/ui/views/crypto_module_password_dialog_view_unittest.cc', 'browser/ui/views/extensions/browser_action_drag_data_unittest.cc', + 'browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc', 'browser/ui/views/first_run_bubble_unittest.cc', 'browser/ui/views/frame/browser_view_layout_unittest.cc', 'browser/ui/views/frame/browser_view_unittest.cc', @@ -1712,10 +1782,12 @@ 'browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc', 'browser/ui/views/frame/test_with_browser_view.cc', 'browser/ui/views/frame/test_with_browser_view.h', + 'browser/ui/views/frame/web_contents_close_handler_unittest.cc', 'browser/ui/views/toolbar/reload_button_unittest.cc', 'browser/ui/views/select_file_dialog_extension_unittest.cc', 'browser/ui/views/status_icons/status_tray_win_unittest.cc', 'browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc', + 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_unittest.cc', 'browser/ui/views/tabs/fake_base_tab_strip_controller.cc', 'browser/ui/views/tabs/fake_base_tab_strip_controller.h', 'browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc', @@ -1723,7 +1795,10 @@ 'browser/ui/views/tabs/tab_strip_unittest.cc', 'browser/ui/views/translate/translate_bubble_view_unittest.cc', 'browser/ui/views/validation_message_bubble_delegate_unittest.cc', + 'browser/ui/website_settings/permission_bubble_manager_unittest.cc', + 'browser/ui/website_settings/permission_menu_model_unittest.cc', 'browser/ui/website_settings/website_settings_unittest.cc', + 'browser/ui/webui/chromeos/login/signin_userlist_unittest.cc', 'browser/ui/webui/fileicon_source_unittest.cc', 'browser/ui/webui/history_ui_unittest.cc', 'browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc', @@ -1734,7 +1809,6 @@ 'browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc', 'browser/ui/webui/print_preview/print_preview_ui_unittest.cc', 'browser/ui/webui/signin/login_ui_service_unittest.cc', - 'browser/ui/webui/sync_internals_ui_unittest.cc', 'browser/ui/webui/sync_setup_handler_unittest.cc', 'browser/ui/webui/theme_source_unittest.cc', 'browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc', @@ -1746,13 +1820,6 @@ 'browser/chrome_content_browser_client_unittest.cc', 'browser/undo/bookmark_undo_service_test.cc', 'browser/undo/undo_manager_test.cc', - 'browser/usb/usb_context_unittest.cc', - 'browser/value_store/leveldb_value_store_unittest.cc', - 'browser/value_store/testing_value_store_unittest.cc', - 'browser/value_store/value_store_change_unittest.cc', - 'browser/value_store/value_store_frontend_unittest.cc', - 'browser/value_store/value_store_unittest.cc', - 'browser/value_store/value_store_unittest.h', 'browser/web_applications/web_app_mac_unittest.mm', 'browser/web_applications/web_app_unittest.cc', 'browser/web_resource/eula_accepted_notifier_unittest.cc', @@ -1761,11 +1828,8 @@ 'browser/web_resource/resource_request_allowed_notifier_test_util.cc', 'browser/web_resource/resource_request_allowed_notifier_test_util.h', 'browser/web_resource/resource_request_allowed_notifier_unittest.cc', - 'browser/webdata/autofill_profile_syncable_service_unittest.cc', 'browser/webdata/keyword_table_unittest.cc', - 'browser/webdata/token_service_table_unittest.cc', 'browser/webdata/web_apps_table_unittest.cc', - 'common/cancelable_task_tracker_unittest.cc', 'common/chrome_paths_unittest.cc', 'common/chrome_content_client_unittest.cc', 'common/cloud_print/cloud_print_helpers_unittest.cc', @@ -1776,28 +1840,22 @@ 'common/extensions/api/commands/commands_manifest_unittest.cc', 'common/extensions/api/extension_action/browser_action_manifest_unittest.cc', 'common/extensions/api/extension_action/page_action_manifest_unittest.cc', - 'common/extensions/api/extension_action/script_badge_manifest_unittest.cc', 'common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc', - 'common/extensions/api/file_handlers/file_handlers_manifest_unittest.cc', 'common/extensions/api/i18n/default_locale_manifest_unittest.cc', 'common/extensions/api/identity/extension_manifests_auth_unittest.cc', - 'common/extensions/api/sockets/sockets_manifest_permission_unittest.cc', 'common/extensions/api/storage/storage_schema_manifest_handler_unittest.cc', 'common/extensions/command_unittest.cc', 'common/extensions/extension_file_util_unittest.cc', 'common/extensions/extension_icon_set_unittest.cc', - 'common/extensions/extension_l10n_util_unittest.cc', - 'common/extensions/extension_set_unittest.cc', 'common/extensions/extension_unittest.cc', 'common/extensions/feature_switch_unittest.cc', - 'common/extensions/features/base_feature_provider_unittest.cc', - 'common/extensions/features/complex_feature_unittest.cc', - 'common/extensions/features/simple_feature_unittest.cc', + 'common/extensions/manifest_handlers/automation_unittest.cc', 'common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc', 'common/extensions/manifest_handlers/exclude_matches_manifest_unittest.cc', - 'common/extensions/manifest_handlers/externally_connectable_unittest.cc', 'common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc', + 'common/extensions/manifest_handlers/ui_overrides_handler_unittest.cc', 'common/extensions/manifest_tests/extension_manifest_test.cc', + 'common/extensions/manifest_tests/extension_manifests_about_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_background_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_contentsecuritypolicy_unittest.cc', @@ -1820,14 +1878,15 @@ 'common/extensions/manifest_tests/extension_manifests_portsinpermissions_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_sandboxed_unittest.cc', + 'common/extensions/manifest_tests/extension_manifests_service_worker_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_storage_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_ui_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_update_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_validapp_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_web_accessible_resources_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_web_unittest.cc', + 'common/extensions/manifest_tests/extension_manifests_webview_accessible_resources_unittest.cc', 'common/extensions/manifest_unittest.cc', - 'common/extensions/message_bundle_unittest.cc', 'common/extensions/permissions/media_galleries_permission_unittest.cc', 'common/extensions/permissions/permission_set_unittest.cc', 'common/extensions/permissions/settings_override_permission_unittest.cc', @@ -1845,25 +1904,18 @@ 'common/mac/mock_launchd.h', 'common/mac/objc_method_swizzle_unittest.mm', 'common/mac/objc_zombie_unittest.mm', - 'common/metrics/caching_permuted_entropy_provider_unittest.cc', - 'common/metrics/metrics_log_base_unittest.cc', - 'common/metrics/metrics_log_manager_unittest.cc', - 'common/metrics/variations/experiment_labels_unittest.cc', - 'common/metrics/variations/variations_util_unittest.cc', 'common/multi_process_lock_unittest.cc', - 'common/net/url_fixer_upper_unittest.cc', 'common/net/x509_certificate_model_unittest.cc', 'common/partial_circular_buffer_unittest.cc', + 'common/pepper_permission_util_unittest.cc', 'common/pref_names_util_unittest.cc', 'common/search_urls_unittest.cc', 'common/service_process_util_unittest.cc', 'common/switch_utils_unittest.cc', - 'common/thumbnail_score_unittest.cc', + 'common/variations/experiment_labels_unittest.cc', 'common/worker_thread_ticker_unittest.cc', 'renderer/chrome_content_renderer_client_unittest.cc', 'renderer/content_settings_observer_unittest.cc', - 'renderer/extensions/activity_log_converter_strategy_unittest.cc', - 'renderer/extensions/chrome_v8_context_set_unittest.cc', 'renderer/extensions/event_unittest.cc', 'renderer/extensions/extension_localization_peer_unittest.cc', 'renderer/extensions/json_schema_unittest.cc', @@ -1871,12 +1923,17 @@ 'renderer/extensions/module_system_unittest.cc', 'renderer/extensions/renderer_permissions_policy_delegate_unittest.cc', 'renderer/extensions/safe_builtins_unittest.cc', + 'renderer/extensions/utils_unittest.cc', + 'renderer/media/cast_ipc_dispatcher_unittest.cc', 'renderer/media/chrome_webrtc_log_message_delegate_unittest.cc', - 'renderer/net/net_error_helper_unittest.cc', + 'renderer/net/net_error_helper_core_unittest.cc', 'renderer/net/predictor_queue_unittest.cc', 'renderer/net/renderer_predictor_unittest.cc', 'renderer/plugins/plugin_uma_unittest.cc', 'renderer/prerender/prerender_dispatcher_unittest.cc', + 'renderer/resources/extensions/notifications_custom_bindings.js', + 'renderer/resources/extensions/notifications_custom_bindings.gtestjs', + 'renderer/resources/extensions/notifications_test_util.js', 'renderer/safe_browsing/features_unittest.cc', 'renderer/safe_browsing/murmurhash3_util_unittest.cc', 'renderer/safe_browsing/phishing_term_feature_extractor_unittest.cc', @@ -1917,62 +1974,20 @@ 'tools/profile_reset/jtl_parser_unittest.cc', 'utility/cloud_print/pwg_encoder_unittest.cc', 'utility/extensions/unpacker_unittest.cc', + 'utility/image_writer/image_writer_unittest.cc', 'utility/importer/bookmark_html_reader_unittest.cc', 'utility/importer/bookmarks_file_importer_unittest.cc', 'utility/importer/firefox_importer_unittest.cc', + 'utility/importer/firefox_importer_unittest_messages_internal.h', + 'utility/importer/firefox_importer_unittest_utils.h', + 'utility/importer/firefox_importer_unittest_utils_mac.cc', 'utility/importer/safari_importer_unittest.mm', + 'utility/media_galleries/image_metadata_extractor_unittest.cc', # Duplicate these tests here because PathService has more items in # unit_tests than in base_unittests. '../base/path_service_unittest.cc', - # TODO(joi): Move to //components/components_tests.gypi once - # remaining dependencies back to //chrome are eliminated. - '../components/autofill/content/browser/autofill_driver_impl_unittest.cc', - '../components/autofill/content/browser/request_autocomplete_manager_unittest.cc', - '../components/autofill/content/browser/wallet/full_wallet_unittest.cc', - '../components/autofill/content/browser/wallet/instrument_unittest.cc', - '../components/autofill/content/browser/wallet/wallet_address_unittest.cc', - '../components/autofill/content/browser/wallet/wallet_client_unittest.cc', - '../components/autofill/content/browser/wallet/wallet_items_unittest.cc', - '../components/autofill/content/browser/wallet/wallet_service_url_unittest.cc', - '../components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc', - '../components/autofill/core/browser/address_field_unittest.cc', - '../components/autofill/core/browser/address_unittest.cc', - '../components/autofill/core/browser/android/auxiliary_profile_unittest_android.cc', - '../components/autofill/core/browser/autocomplete_history_manager_unittest.cc', - '../components/autofill/core/browser/autofill_country_unittest.cc', - '../components/autofill/core/browser/autofill_data_model_unittest.cc', - '../components/autofill/core/browser/autofill_download_unittest.cc', - '../components/autofill/core/browser/autofill_download_url_unittest.cc', - '../components/autofill/core/browser/autofill_external_delegate_unittest.cc', - '../components/autofill/core/browser/autofill_field_unittest.cc', - '../components/autofill/core/browser/autofill_ie_toolbar_import_win_unittest.cc', - '../components/autofill/core/browser/autofill_manager_unittest.cc', - '../components/autofill/core/browser/autofill_merge_unittest.cc', - '../components/autofill/core/browser/autofill_metrics_unittest.cc', - '../components/autofill/core/browser/autofill_profile_unittest.cc', - '../components/autofill/core/browser/autofill_regexes_unittest.cc', - '../components/autofill/core/browser/autofill_type_unittest.cc', - '../components/autofill/core/browser/autofill_xml_parser_unittest.cc', - '../components/autofill/core/browser/contact_info_unittest.cc', - '../components/autofill/core/browser/credit_card_field_unittest.cc', - '../components/autofill/core/browser/credit_card_unittest.cc', - '../components/autofill/core/browser/form_field_unittest.cc', - '../components/autofill/core/browser/form_structure_unittest.cc', - '../components/autofill/core/browser/name_field_unittest.cc', - '../components/autofill/core/browser/password_autofill_manager_unittest.cc', - '../components/autofill/core/browser/password_generator_unittest.cc', - '../components/autofill/core/browser/personal_data_manager_unittest.cc', - '../components/autofill/core/browser/phone_field_unittest.cc', - '../components/autofill/core/browser/phone_number_unittest.cc', - '../components/autofill/core/browser/phone_number_i18n_unittest.cc', - '../components/autofill/core/browser/validation_unittest.cc', - - # TODO(caitkp): Move to //components/components_tests.gypi once - # remaining dependencies back to //chrome are eliminated. - '../components/autofill/core/browser/webdata/autofill_table_unittest.cc', - # TODO(yael): Move to //components/components_tests.gypi once # nacl_defines is moved out of chrome.gyp into a common place. '../components/nacl/loader/nacl_ipc_adapter_unittest.cc', @@ -1982,38 +1997,11 @@ '../components/webdata/common/web_data_service_test_util.cc', '../components/webdata/common/web_data_service_test_util.h', - # TODO(joi): Move the google_apis tests to a separate - # google_apis_unittests executable. - '../google_apis/google_api_keys_unittest.cc', - '../google_apis/cup/client_update_protocol_unittest.cc', - '../google_apis/drive/base_requests_unittest.cc', - '../google_apis/drive/base_requests_server_unittest.cc', - '../google_apis/drive/drive_api_requests_unittest.cc', - '../google_apis/drive/drive_api_parser_unittest.cc', - '../google_apis/drive/drive_api_url_generator_unittest.cc', - '../google_apis/drive/gdata_wapi_parser_unittest.cc', - '../google_apis/drive/gdata_wapi_requests_unittest.cc', - '../google_apis/drive/gdata_wapi_url_generator_unittest.cc', - '../google_apis/drive/request_sender_unittest.cc', - '../google_apis/drive/request_util_unittest.cc', - '../google_apis/drive/time_util_unittest.cc', - '../google_apis/gaia/mock_url_fetcher_factory.h', - '../google_apis/gaia/gaia_auth_fetcher_unittest.cc', - '../google_apis/gaia/gaia_auth_util_unittest.cc', - '../google_apis/gaia/gaia_oauth_client_unittest.cc', - '../google_apis/gaia/google_service_auth_error_unittest.cc', - '../google_apis/gaia/oauth_request_signer_unittest.cc', - '../google_apis/gaia/oauth2_access_token_fetcher_unittest.cc', - '../google_apis/gaia/oauth2_api_call_flow_unittest.cc', - '../google_apis/gaia/oauth2_mint_token_flow_unittest.cc', - '../google_apis/gaia/oauth2_token_service_test_util.cc', - '../google_apis/gaia/oauth2_token_service_test_util.h', - '../google_apis/gaia/oauth2_token_service_unittest.cc', '../skia/ext/analysis_canvas_unittest.cc', '../skia/ext/bitmap_platform_device_mac_unittest.cc', '../skia/ext/convolver_unittest.cc', '../skia/ext/image_operations_unittest.cc', - '../skia/ext/lazy_pixel_ref_utils_unittest.cc', + '../skia/ext/pixel_ref_utils_unittest.cc', '../skia/ext/platform_canvas_unittest.cc', '../skia/ext/recursive_gaussian_convolution_unittest.cc', '../skia/ext/refptr_unittest.cc', @@ -2037,28 +2025,29 @@ '../tools/json_schema_compiler/test/simple_api_unittest.cc', '../tools/json_schema_compiler/test/error_generation_unittest.cc', '../ui/webui/resources/js/cr.js', - '../webkit/browser/blob/mock_blob_url_request_context.cc', - '../webkit/browser/blob/mock_blob_url_request_context.h', - '../webkit/browser/quota/mock_storage_client.cc', - '../webkit/browser/quota/mock_storage_client.h', ], 'conditions': [ ['OS!="ios"', { 'dependencies': [ - 'common/extensions/api/api.gyp:api', '../components/components.gyp:autofill_content_test_support', - '../components/component_strings.gyp:component_strings', + '../components/components.gyp:component_metrics_proto', + '../components/components.gyp:data_reduction_proxy_test_support', + '../components/components_strings.gyp:components_strings', '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', + '../extensions/extensions_resources.gyp:extensions_resources', + '../extensions/extensions_strings.gyp:extensions_strings', '../gpu/gpu.gyp:gpu_unittest_utils', '../media/media.gyp:media_test_support', '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', + '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput', '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', '../tools/json_schema_compiler/test/json_schema_compiler_tests.gyp:json_schema_compiler_tests', '../ui/gl/gl.gyp:gl', '../v8/tools/gyp/v8.gyp:v8', '../webkit/webkit_resources.gyp:webkit_resources', + 'common/extensions/api/api.gyp:chrome_api', ], # TODO(scr): Use this in browser_tests too. 'includes': [ @@ -2117,6 +2106,7 @@ }], ['enable_extensions==0', { 'sources/': [ + ['exclude', '^../apps/'], ['exclude', '^../extensions/'], ['exclude', '^browser/extensions/activity_log/'], ['exclude', '^browser/extensions/api/'], @@ -2129,14 +2119,25 @@ ['exclude', '^common/extensions/permissions/settings_override_permission_unittest.cc'], ], 'sources!': [ + '../extensions/renderer/activity_log_converter_strategy_unittest.cc', 'browser/extensions/extension_context_menu_model_unittest.cc', - 'browser/extensions/extension_protocols_unittest.cc', 'browser/extensions/extension_ui_unittest.cc', + 'browser/extensions/extension_web_ui_unittest.cc', + 'browser/extensions/menu_manager_unittest.cc', 'browser/extensions/pack_extension_unittest.cc', 'browser/extensions/permissions_updater_unittest.cc', 'browser/extensions/sandboxed_unpacker_unittest.cc', + 'browser/guest_view/guest_view_manager_unittest.cc', 'common/extensions/sync_type_unittest.cc', 'common/extensions/permissions/permission_set_unittest.cc', + 'renderer/extensions/chrome_v8_context_set_unittest.cc', + 'renderer/extensions/event_unittest.cc', + 'renderer/extensions/extension_localization_peer_unittest.cc', + 'renderer/extensions/json_schema_unittest.cc', + 'renderer/extensions/messaging_utils_unittest.cc', + 'renderer/extensions/module_system_unittest.cc', + 'renderer/extensions/renderer_permissions_policy_delegate_unittest.cc', + 'renderer/extensions/safe_builtins_unittest.cc', 'utility/extensions/unpacker_unittest.cc', ], }], @@ -2152,8 +2153,8 @@ 'browser/ui/app_list/search/tokenized_string_unittest.cc', ], 'dependencies': [ - '../ash/ash.gyp:ash_resources', '../ash/ash.gyp:ash_test_support', + '../ash/ash_resources.gyp:ash_resources', '../ash/ash_strings.gyp:ash_strings', ], # We eventually want to compile both in Win Aura builds, see @@ -2168,11 +2169,11 @@ }], ['use_aura==1', { 'dependencies': [ + '../ui/wm/wm.gyp:wm', '../ui/aura/aura.gyp:aura_test_support', ], 'sources/': [ ['exclude', '^browser/ui/views/extensions/browser_action_drag_data_unittest.cc'], - ['exclude', '^browser/ui/panels/display_settings_provider_win_unittest.cc'], ], }], ['use_aura==1 and use_ash==0 and use_ozone==0 and OS=="linux"', { @@ -2203,21 +2204,26 @@ ['enable_task_manager==0', { 'sources/': [ ['exclude', '^browser/task_manager/'], - ['exclude', '^browser/ui/webui/task_manager/'], ], }], - ['file_manager_extension==0', { + ['chromeos==0', { 'sources!': [ + 'browser/extensions/image_loader_unittest.cc', + # TODO(zturner): Enable this on Windows. See + # BrowserWithTestWindowTest::SetUp() for a comment explaining why + # this is broken. + 'browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc', 'browser/ui/views/select_file_dialog_extension_unittest.cc', ], }], ['enable_mdns == 1', { 'sources': [ - 'utility/local_discovery/local_domain_resolver_unittest.cc', - 'utility/local_discovery/service_discovery_client_unittest.cc', 'browser/local_discovery/privet_device_lister_unittest.cc', 'browser/local_discovery/privet_notifications_unittest.cc', 'browser/local_discovery/privet_local_printer_lister_unittest.cc', + 'browser/local_discovery/storage/privet_filesystem_attribute_cache_unittest.cc', + 'common/local_discovery/local_domain_resolver_unittest.cc', + 'common/local_discovery/service_discovery_client_unittest.cc', ] }], ['configuration_policy==0', { @@ -2262,29 +2268,33 @@ 'browser/ui/autofill/account_chooser_model_unittest.cc', 'browser/ui/autofill/autofill_credit_card_bubble_controller_unittest.cc', 'browser/ui/autofill/autofill_dialog_controller_unittest.cc', + 'browser/ui/autofill/autofill_dialog_i18n_input_unittest.cc', + 'browser/ui/autofill/country_combobox_model_unittest.cc', + 'browser/ui/autofill/data_model_wrapper_unittest.cc', + 'browser/ui/autofill/mock_address_validator.cc', + 'browser/ui/autofill/mock_address_validator.h', 'browser/ui/autofill/mock_autofill_dialog_view_delegate.cc', 'browser/ui/autofill/mock_autofill_dialog_view_delegate.h', 'browser/ui/autofill/test_autofill_credit_card_bubble.cc', 'browser/ui/autofill/test_autofill_credit_card_bubble.h', ], }], - ['enable_automation!=1', { - 'sources/': [ - ['exclude', '^browser/automation/'], - ], - }], ['enable_plugins==0', { 'sources/': [ ['exclude', '^browser/plugins/'], ], 'sources!': [ - 'browser/renderer_host/plugin_info_message_filter_unittest.cc', + 'browser/metrics/plugin_metrics_provider_unittest.cc', ], }], ['enable_printing!=1', { 'sources/': [ ['exclude', '^browser/printing/'], ['exclude', '^browser/ui/webui/print_preview/'], + ['exclude', '^service/'], + ], + 'sources!': [ + 'browser/local_discovery/privet_http_unittest.cc', ], }], ['enable_captive_portal_detection!=1', { @@ -2301,21 +2311,40 @@ ['enable_webrtc==0', { 'sources!': [ 'browser/media/webrtc_log_uploader_unittest.cc', + 'browser/media/webrtc_log_util_unittest.cc', + 'browser/media/webrtc_rtp_dump_handler_unittest.cc', + 'browser/media/webrtc_rtp_dump_writer_unittest.cc', 'renderer/media/chrome_webrtc_log_message_delegate_unittest.cc', ], }], ['chromeos==1', { + 'dependencies': [ + '../ash/ash_resources.gyp:ash_resources', + ], 'sources!': [ + 'browser/extensions/api/messaging/native_message_process_host_unittest.cc', + 'browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc', + 'browser/extensions/api/messaging/native_messaging_policy_handler_unittest.cc', 'browser/password_manager/native_backend_gnome_x_unittest.cc', 'browser/password_manager/native_backend_kwallet_x_unittest.cc', 'browser/policy/cloud/user_policy_signin_service_unittest.cc', 'browser/profiles/profile_list_desktop_unittest.cc', 'browser/safe_browsing/download_protection_service_unittest.cc', 'browser/shell_integration_linux_unittest.cc', + 'browser/signin/signin_global_error_unittest.cc', 'browser/signin/signin_manager_unittest.cc', - 'browser/storage_monitor/storage_monitor_linux_unittest.cc', + 'browser/signin/signin_names_io_thread_unittest.cc', + 'browser/sync/sync_global_error_unittest.cc', 'browser/ui/sync/one_click_signin_helper_unittest.cc', 'browser/ui/sync/one_click_signin_sync_starter_unittest.cc', + 'browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc', + ], + 'sources': [ + 'browser/extensions/updater/local_extension_cache_unittest.cc', + 'browser/metrics/chromeos_metrics_provider_unittest.cc', + ], + 'sources/': [ + ['exclude', '^browser/ui/views/app_list/linux/'], ], }, { # else: chromeos == 0 'sources/': [ @@ -2324,12 +2353,11 @@ ['exclude', '^browser/ui/webui/chromeos/login'], ['exclude', '^browser/ui/webui/options/chromeos/'], ['exclude', '^browser/ui/webui/options/chromeos/'], + ['exclude', '^browser/resources/chromeos/'], ], 'sources!': [ 'browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc', - 'browser/net/gaia/gaia_oauth_fetcher_unittest.cc', 'browser/notifications/login_state_notification_blocker_chromeos_unittest.cc', - 'browser/notifications/multi_user_notification_blocker_chromeos_unittest.cc', 'browser/extensions/api/log_private/syslog_parser_unittest.cc', ], }], @@ -2338,48 +2366,7 @@ '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], - ['toolkit_uses_gtk == 1', { - 'conditions': [ - ['toolkit_views==1', { - 'sources!': [ - 'browser/ui/gtk/accelerators_gtk_unittest.cc', - 'browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc', - 'browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc', - 'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc', - 'browser/ui/gtk/gtk_theme_service_unittest.cc', - 'browser/ui/gtk/omnibox/omnibox_popup_view_gtk_unittest.cc', - 'browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc', - 'browser/ui/gtk/reload_button_gtk_unittest.cc', - 'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc', - ], - }], - ['chromeos==0', { - 'conditions': [ - ['use_gnome_keyring==1', { - # We use a few library functions directly, so link directly. - 'dependencies': [ - '../build/linux/system.gyp:gnome_keyring_direct', - ], - }], - ], - }], - ], - 'dependencies': [ - '../build/linux/system.gyp:dbus', - '../build/linux/system.gyp:gtk', - '../dbus/dbus.gyp:dbus_test_support', - '../sandbox/sandbox.gyp:*', - ], - 'sources!': [ - 'browser/printing/print_job_unittest.cc', - ], - }, { # else: toolkit_uses_gtk != 1 - 'sources!': [ - 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc', - '../ui/views/focus/accelerator_handler_gtk_unittest.cc', - ], - }], - ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', { + ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:ssl', ], @@ -2389,6 +2376,11 @@ 'sources!': [ 'browser/password_manager/native_backend_gnome_x_unittest.cc', ], + }, { + # We use a few library functions directly, so link directly. + 'dependencies': [ + '../build/linux/system.gyp:gnome_keyring_direct', + ], }], ['OS=="linux" and use_aura==1', { 'dependencies': [ @@ -2408,7 +2400,7 @@ }], ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 'conditions': [ - ['linux_use_tcmalloc==1', { + ['use_allocator!="none"', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], @@ -2419,18 +2411,12 @@ # The test fetches resources which means Mac need the app bundle to # exist on disk so it can pull from it. 'dependencies': [ - 'chrome', + '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', '../third_party/ocmock/ocmock.gyp:ocmock', - ], - 'include_dirs': [ - '../third_party/GTM', - '../third_party/GTM/AppKit', + 'chrome', ], 'sources!': [ - 'browser/ui/tabs/dock_info_unittest.cc', 'browser/ui/tests/ui_gfx_image_unittest.cc', - 'browser/ui/gtk/reload_button_gtk_unittest.cc', - 'browser/password_manager/password_store_default_unittest.cc', 'tools/convert_dict/convert_dict_unittest.cc', 'renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc', ], @@ -2490,7 +2476,6 @@ 'dependencies': [ 'chrome_version_resources', 'installer_util_strings', - 'unit_tests_exe_pdb_workaround', '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', '../third_party/isimpledom/isimpledom.gyp:isimpledom', ], @@ -2505,21 +2490,14 @@ '<(DEPTH)/third_party/wtl/include', ], 'sources': [ - 'browser/extensions/api/networking_private/networking_private_crypto_unittest.cc', # TODO: It would be nice to have these pulled in # automatically from direct_dependent_settings in # their various targets (net.gyp:net_resources, etc.), # but that causes errors in other targets when # resulting .res files get referenced multiple times. - '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', - '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc', - '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', ], 'link_settings': { 'libraries': [ @@ -2545,12 +2523,21 @@ 'tools/profile_reset/jtl_compiler.gyp:jtl_compiler_lib', ], 'sources!': [ + 'browser/metrics/variations/variations_request_scheduler_mobile_unittest.cc', 'browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc', 'browser/net/spdyproxy/data_reduction_proxy_settings_unittest.h', 'browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc', ], }], ['OS=="android"', { + 'dependencies!': [ + '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput', + ], + 'ldflags': [ + # Some android targets still depend on --gc-sections to link. + # TODO: remove --gc-sections for Debug builds (crbug.com/159847). + '-Wl,--gc-sections', + ], 'sources!': [ # Bookmark export/import are handled via the BookmarkColumns # ContentProvider. @@ -2561,34 +2548,30 @@ # Sync setup uses native ui. 'browser/ui/webui/sync_setup_handler_unittest.cc', + 'browser/sync/sync_ui_util_unittest.cc', 'browser/browser_commands_unittest.cc', 'browser/download/download_shelf_unittest.cc', 'browser/extensions/extension_message_bubble_controller_unittest.cc', - 'browser/storage_monitor/media_storage_util_unittest.cc', - 'browser/net/gaia/gaia_oauth_fetcher_unittest.cc', + 'browser/extensions/extension_test_message_listener_unittest.cc', 'browser/policy/policy_path_parser_unittest.cc', + 'browser/process_singleton_posix_unittest.cc', 'browser/profiles/off_the_record_profile_impl_unittest.cc', 'browser/profiles/profile_list_desktop_unittest.cc', + 'browser/renderer_context_menu/render_view_context_menu_unittest.cc', 'browser/search/instant_service_unittest.cc', 'browser/search/search_unittest.cc', - 'browser/signin/mutable_profile_oauth2_token_service_unittest.cc', - 'browser/sync/profile_sync_service_session_unittest.cc', - 'browser/sync/sessions2/sessions_sync_manager_unittest.cc', + 'browser/sync/sessions/sessions_sync_manager_unittest.cc', 'browser/sync/sync_global_error_unittest.cc', - 'browser/tab_contents/language_state_unittest.cc', - 'browser/tab_contents/render_view_context_menu_unittest.cc', - 'browser/ui/autofill/autofill_dialog_controller_unittest.cc', + 'browser/translate/translate_manager_render_view_host_unittest.cc', 'browser/ui/browser_instant_controller_unittest.cc', 'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc', 'browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc', - 'browser/ui/bookmarks/bookmark_prompt_controller_unittest.cc', 'browser/ui/bookmarks/bookmark_unittest.cc', 'browser/ui/browser_command_controller_unittest.cc', 'browser/ui/browser_iterator_unittest.cc', 'browser/ui/fullscreen/fullscreen_controller_state_unittest.cc', 'browser/ui/fullscreen/fullscreen_controller_unittest.cc', - 'browser/ui/search/instant_ntp_prerenderer_unittest.cc', 'browser/ui/search/instant_page_unittest.cc', 'browser/ui/search/instant_search_prerenderer_unittest.cc', 'browser/ui/search/search_delegate_unittest.cc', @@ -2600,10 +2583,12 @@ 'browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc', 'browser/ui/toolbar/toolbar_model_unittest.cc', 'browser/ui/toolbar/wrench_menu_model_unittest.cc', + 'browser/ui/website_settings/permission_menu_model_unittest.cc', 'browser/ui/webui/ntp/suggestions_combiner_unittest.cc', 'browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc', 'browser/ui/window_sizer/window_sizer_common_unittest.cc', 'browser/ui/window_sizer/window_sizer_unittest.cc', + 'common/net/x509_certificate_model_unittest.cc', 'test/base/browser_with_test_window_test.cc', 'test/base/browser_with_test_window_test.h', 'test/base/test_browser_window.h', @@ -2615,28 +2600,28 @@ 'browser/drive/fake_drive_service_unittest.cc', 'browser/sync_file_system/drive_backend/api_util_unittest.cc', 'browser/sync_file_system/drive_backend/drive_file_sync_service_sync_unittest.cc', - '../google_apis/drive/base_requests_server_unittest.cc', - '../google_apis/drive/drive_api_parser_unittest.cc', - '../google_apis/drive/drive_api_requests_unittest.cc', - '../google_apis/drive/gdata_wapi_parser_unittest.cc', - '../google_apis/drive/gdata_wapi_requests_unittest.cc', # The autofill popup is implemented in mostly native code on # Android. 'browser/ui/autofill/autofill_popup_controller_unittest.cc', # Android uses a different invaliator. - 'browser/invalidation/ticl_invalidation_service_unittest.cc', + 'browser/invalidation/gcm_invalidation_bridge_unittest.cc', + 'browser/invalidation/ticl_profile_settings_provider_unittest.cc', # The importer code is not used on Android. 'common/importer/firefox_importer_utils_unittest.cc', - # USB service is not supported on Android. - 'browser/usb/usb_context_unittest.cc', - # Bookmark undo is not used on Android. 'browser/undo/bookmark_undo_service_test.cc', 'browser/undo/undo_manager_test.cc', + + # URL elider is not used on android. + 'browser/ui/tests/elide_url_unittest.cc', + + # GCMDriverAndroid is not yet implemented. + 'browser/extensions/extension_gcm_app_handler_unittest.cc', + 'browser/services/gcm/gcm_profile_service_unittest.cc', ], 'sources/': [ ['exclude', '^browser/captive_portal/'], @@ -2659,6 +2644,7 @@ ['exclude', '^browser/ui/webui/downloads_'], ['exclude', '^browser/ui/webui/flags_'], ['exclude', '^browser/ui/webui/help/'], + ['exclude', '^browser/ui/webui/ntp/'], ['exclude', '^browser/ui/webui/options/'], ['exclude', '^browser/ui/webui/options/'], ['exclude', '^browser/ui/webui/signin/'], @@ -2666,21 +2652,22 @@ ['exclude', '^browser/ui/webui/sync_promo'], ['exclude', '^tools/profile_reset/'], ['exclude', '^utility/importer/'], + ['exclude', '^utility/media_galleries/'], ], - 'conditions': [ - ['gtest_target_type == "shared_library"', { - 'dependencies': [ - '../testing/android/native_test.gyp:native_test_native_code', - ], - }], + 'dependencies': [ + '../testing/android/native_test.gyp:native_test_native_code', ], }], # OS == android ['OS!="android" and OS!="ios" and chromeos==0 and configuration_policy==1', { 'sources': [ - 'browser/download/download_dir_policy_handler_unittest.cc', 'browser/net/disk_cache_dir_policy_handler_unittest.cc', ], }], + ['OS!="android" and OS!="ios" and configuration_policy==1', { + 'sources': [ + 'browser/download/download_dir_policy_handler_unittest.cc' + ], + }], ['enable_printing!=1', { 'sources/': [ # No need for service process. @@ -2703,13 +2690,10 @@ '../ui/views/views.gyp:views', '../ui/views/views.gyp:views_test_support', ], - 'sources!': [ - 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc', - ], }, { # else: toolkit_views == 0 'sources/': [ - ['exclude', '^browser/bookmarks/bookmark_node_data_unittest.cc'], ['exclude', '^browser/ui/views/'], + ['exclude', '^../apps/ui/views/'], ['exclude', '^../ui/views/'], ], }], @@ -2721,7 +2705,7 @@ ['use_openssl==1', { 'sources!': [ # networking_private_crypto.cc uses NSS functions. - 'browser/extensions/api/networking_private/networking_private_crypto_unittest.cc', + 'common/extensions/api/networking_private/networking_private_crypto_unittest.cc', ], 'sources/': [ # OpenSSL build does not support firefox importer. See @@ -2756,11 +2740,37 @@ ], }], ['enable_app_list==1', { - 'sources': [ - 'browser/ui/app_list/extension_app_model_builder_unittest.cc', - 'browser/ui/app_list/test/fast_show_pickler_unittest.cc', + 'dependencies': [ + '../ui/app_list/app_list.gyp:app_list_test_support', + ], + }, { + 'sources/': [ + ['exclude', '^browser/apps/drive/'], + ['exclude', '^browser/ui/app_list/'], + ['exclude', '^browser/ui/views/app_list/'], + ], + }], + ['use_ozone==1', { + 'sources!': [ + # crbug.com/354036 + 'browser/chromeos/events/event_rewriter_unittest.cc', + + # crbug.com/362698 + 'browser/chromeos/input_method/input_method_engine_unittest.cc', + 'browser/chromeos/input_method/input_method_manager_impl_unittest.cc', + ], + }], + ['enable_plugin_installation==0', { + 'sources!': [ + 'browser/plugins/plugin_installer_unittest.cc', ], }], + ['enable_wifi_bootstrapping', { + 'sources' : [ + 'browser/local_discovery/wifi/bootstrapping_device_lister_unittest.cc', + 'browser/local_discovery/wifi/bootstrapping_network_switcher_unittest.cc', + ] + }], ], }, { @@ -2827,9 +2837,7 @@ ], 'conditions': [ - # Special target to wrap a gtest_target_type==shared_library - # unit_tests into an android apk for execution. - ['OS == "android" and gtest_target_type == "shared_library"', { + ['OS == "android"', { 'targets': [ { 'target_name': 'unit_tests_java', @@ -2852,7 +2860,6 @@ ], 'variables': { 'test_suite_name': 'unit_tests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)unit_tests<(SHARED_LIB_SUFFIX)', 'android_manifest_path': 'test/android/unit_tests_apk/AndroidManifest.xml', }, 'includes': [ '../build/apk_test.gypi' ], @@ -2877,57 +2884,5 @@ }, ], }], - ['OS=="win"', { - 'targets' : [ - { - # This target is only depended upon on Windows. - 'target_name': 'unit_tests_exe_pdb_workaround', - 'type': 'static_library', - 'sources': [ 'empty_pdb_workaround.cc' ], - 'msvs_settings': { - 'VCCLCompilerTool': { - # This *in the compile phase* must match the pdb name that's - # output by the final link. See empty_pdb_workaround.cc for - # more details. - 'DebugInformationFormat': '3', - 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/unit_tests.exe.pdb', - }, - }, - }, - ], - }], - ['enable_app_list==1', { - 'targets': [ - { - # Unit tests for chrome app list, not run on any bots, this is for faster - # compile/link/test cycles during development. - 'target_name': 'chrome_app_list_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '../base/base.gyp:run_all_unittests', - '../chrome/chrome.gyp:test_support_common', - '../skia/skia.gyp:skia', - '../testing/gtest.gyp:gtest', - 'browser_ui', - ], - 'sources': [ - 'browser/ui/app_list/app_list_positioner_unittest.cc', - 'browser/ui/app_list/app_list_service_mac_unittest.mm', - 'browser/ui/app_list/app_list_service_unittest.cc', - 'browser/ui/app_list/profile_loader_unittest.cc', - 'browser/ui/app_list/test/app_list_shower_unittest.cc', - 'browser/ui/app_list/test/fake_keep_alive_service.cc', - 'browser/ui/app_list/test/fake_keep_alive_service.h', - 'browser/ui/app_list/test/fake_profile.cc', - 'browser/ui/app_list/test/fake_profile.h', - 'browser/ui/app_list/test/fake_profile_store.cc', - 'browser/ui/app_list/test/fake_profile_store.h', - 'browser/ui/app_list/test/fast_show_pickler_unittest.cc', - 'browser/ui/views/app_list/linux/app_list_linux_unittest.cc', - 'browser/ui/views/app_list/win/app_list_win_unittest.cc', - ], - }, - ], - }], ], # 'conditions' } |