[M67 Dev][EFL] Format chromium-efl according to Chromium style

This commit formats chromium-efl code as per Chromium style
by using "git cl format".

Change-Id: I349fb24c9a08ec4d21915326b19ea5226417a8c4
Signed-off-by: Chandan Padhi <c.padhi@samsung.com>

diff --git a/base/BUILD.gn b/base/BUILD.gn
index 5f548c5..4f8c854 100644 (file)
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -2529,9 +2529,9 @@ test("base_unittests") {
       "posix/unix_domain_socket_linux.h",
       "process/internal_linux.cc",
       "process/internal_linux.h",
-      "process/process_iterator_linux.cc",
-      "process/process_handle_linux.cc",
       "process/memory_linux.cc",
+      "process/process_handle_linux.cc",
+      "process/process_iterator_linux.cc",
       "process/process_linux.cc",
       "process/process_metrics_linux.cc",
       "sys_info_linux.cc",

diff --git a/build/config/features.gni b/build/config/features.gni
index 4c1b2ef..8d24974 100644 (file)
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -52,6 +52,7 @@ declare_args() {
 
   use_gio = is_linux && !is_chromeos && !is_chromecast
 }
+
 #
 # =============================================
 #   PLEASE DO NOT ADD MORE FLAGS TO THIS FILE

diff --git a/build/config/ui.gni b/build/config/ui.gni
index 1ac6cfa..f6e9f13 100644 (file)
--- a/build/config/ui.gni
+++ b/build/config/ui.gni
@@ -23,7 +23,8 @@ declare_args() {
   # Indicates if Ozone is enabled. Ozone is a low-level library layer for Linux
   # that does not require X11. Enabling this feature disables use of glib, x11,
   # Pango, and Cairo.
-  use_ozone = use_efl || is_chromeos || (is_chromecast && !is_android) || is_fuchsia
+  use_ozone =
+      use_efl || is_chromeos || (is_chromecast && !is_android) || is_fuchsia
 
   # Indicates if Aura is enabled. Aura is a low-level windowing library, sort
   # of a replacement for GDI or GTK.

diff --git a/build/gn_helpers.pyc b/build/gn_helpers.pyc
index 7feab5e..e8f776b 100644 (file)
Binary files a/build/gn_helpers.pyc and b/build/gn_helpers.pyc differ

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 7e2cde0..191d1d1 100644 (file)
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2194,2317 +2194,2489 @@ if (is_mac) {
   }
 }
 if (!is_tizen) {
-test("unit_tests") {
-  sources = [
-    # enums.xml is analyzed by AboutFlagsHistogramTest, so this
-    # dependency is needed to make commit bots run unit_tests on
-    # enums.xml changes.
-    "../../tools/metrics/histograms/enums.xml",
-
-    # All unittests in browser, common, renderer and service.
-    "../browser/about_flags_unittest.cc",
-    "../browser/active_use_util_unittest.cc",
-    "../browser/after_startup_task_utils_unittest.cc",
-    "../browser/android/bookmarks/partner_bookmarks_shim_unittest.cc",
-    "../browser/android/compositor/layer/tab_layer_unittest.cc",
-    "../browser/android/contextualsearch/contextual_search_delegate_unittest.cc",
-    "../browser/android/contextualsearch/contextual_search_field_trial_unittest.cc",
-    "../browser/android/data_usage/data_use_matcher_unittest.cc",
-    "../browser/android/data_usage/data_use_tab_model_unittest.cc",
-    "../browser/android/data_usage/data_use_ui_tab_model_unittest.cc",
-    "../browser/android/data_usage/external_data_use_observer_unittest.cc",
-    "../browser/android/data_usage/external_data_use_reporter_unittest.cc",
-    "../browser/android/data_usage/tab_data_use_entry_unittest.cc",
-    "../browser/android/digital_asset_links/digital_asset_links_handler_unittest.cc",
-    "../browser/android/download/download_manager_service_unittest.cc",
-    "../browser/android/history_report/data_observer_unittest.cc",
-    "../browser/android/history_report/delta_file_backend_leveldb_unittest.cc",
-    "../browser/android/history_report/delta_file_commons_unittest.cc",
-    "../browser/android/history_report/usage_reports_buffer_backend_unittest.cc",
-    "../browser/android/locale/special_locale_handler_unittest.cc",
-    "../browser/android/tab_web_contents_delegate_android_unittest.cc",
-
-    # TODO(newt): move this to test_support_unit?
-    "../browser/android/chrome_backup_agent_unittest.cc",
-    "../browser/android/customtabs/detached_resource_request_unittest.cc",
-    "../browser/android/favicon_helper_unittest.cc",
-    "../browser/android/mock_location_settings.cc",
-    "../browser/android/mock_location_settings.h",
-    "../browser/android/ntp/content_suggestions_notifier_service_unittest.cc",
-    "../browser/android/ntp/content_suggestions_notifier_unittest.cc",
-    "../browser/android/oom_intervention/near_oom_monitor_unittest.cc",
-    "../browser/android/oom_intervention/oom_intervention_decider_unittest.cc",
-    "../browser/android/password_ui_view_android_unittest.cc",
-    "../browser/android/physical_web/physical_web_data_source_android_unittest.cc",
-    "../browser/android/preferences/pref_service_bridge_unittest.cc",
-    "../browser/android/preferences/prefs_unittest.cc",
-    "../browser/android/shortcut_info_unittest.cc",
-    "../browser/android/signin/signin_manager_android_unittest.cc",
-    "../browser/android/thumbnail/scoped_ptr_expiring_cache_unittest.cc",
-    "../browser/android/webapk/webapk_icon_hasher_unittest.cc",
-    "../browser/android/webapk/webapk_installer_unittest.cc",
-    "../browser/android/webapk/webapk_web_manifest_checker_unittest.cc",
-    "../browser/android/webapps/add_to_homescreen_data_fetcher_unittest.cc",
-    "../browser/app_controller_mac_unittest.mm",
-    "../browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc",
-    "../browser/autocomplete/chrome_autocomplete_scheme_classifier_unittest.cc",
-    "../browser/autocomplete/search_provider_unittest.cc",
-    "../browser/autocomplete/shortcuts_provider_extension_unittest.cc",
-    "../browser/background_sync/background_sync_controller_impl_unittest.cc",
-    "../browser/background_sync/background_sync_permission_context_unittest.cc",
-    "../browser/banners/app_banner_settings_helper_unittest.cc",
-    "../browser/bitmap_fetcher/bitmap_fetcher_service_unittest.cc",
-    "../browser/bookmarks/managed_bookmark_service_unittest.cc",
-    "../browser/browser_about_handler_unittest.cc",
-    "../browser/browser_process_impl_unittest.cc",
-    "../browser/browsing_data/browsing_data_appcache_helper_unittest.cc",
-    "../browser/browsing_data/browsing_data_cache_storage_helper_unittest.cc",
-    "../browser/browsing_data/browsing_data_channel_id_helper_unittest.cc",
-    "../browser/browsing_data/browsing_data_cookie_helper_unittest.cc",
-    "../browser/browsing_data/browsing_data_database_helper_unittest.cc",
-    "../browser/browsing_data/browsing_data_file_system_helper_unittest.cc",
-    "../browser/browsing_data/browsing_data_helper_unittest.cc",
-    "../browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc",
-    "../browser/browsing_data/browsing_data_local_storage_helper_unittest.cc",
-    "../browser/browsing_data/browsing_data_media_license_helper_unittest.cc",
-    "../browser/browsing_data/browsing_data_quota_helper_unittest.cc",
-    "../browser/browsing_data/browsing_data_service_worker_helper_unittest.cc",
-    "../browser/browsing_data/browsing_data_shared_worker_helper_unittest.cc",
-    "../browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc",
-    "../browser/browsing_data/cookies_tree_model_unittest.cc",
-    "../browser/browsing_data/counters/bookmark_counter_unittest.cc",
-    "../browser/browsing_data/counters/browsing_data_counter_utils_unittest.cc",
-    "../browser/browsing_data/counters/site_data_counting_helper_unittest.cc",
-    "../browser/browsing_data/counters/site_settings_counter_unittest.cc",
-    "../browser/browsing_data/site_data_size_collector_unittest.cc",
-    "../browser/budget_service/budget_database_unittest.cc",
-    "../browser/budget_service/budget_manager_unittest.cc",
-    "../browser/chrome_content_browser_client_unittest.cc",
-    "../browser/chrome_process_singleton_win_unittest.cc",
-    "../browser/client_hints/client_hints_unittest.cc",
-    "../browser/command_updater_impl_unittest.cc",
-    "../browser/component_updater/chrome_component_updater_configurator_unittest.cc",
-    "../browser/component_updater/component_installer_errors_unittest.cc",
-    "../browser/component_updater/optimization_hints_component_installer_unittest.cc",
-    "../browser/component_updater/origin_trials_component_installer_unittest.cc",
-    "../browser/component_updater/sth_set_component_installer_unittest.cc",
-    "../browser/component_updater/subresource_filter_component_installer_unittest.cc",
-    "../browser/component_updater/supervised_user_whitelist_installer_unittest.cc",
-    "../browser/component_updater/sw_reporter_installer_win_unittest.cc",
-    "../browser/conflicts/enumerate_input_method_editors_win_unittest.cc",
-    "../browser/conflicts/enumerate_shell_extensions_win_unittest.cc",
-    "../browser/conflicts/module_database_win_unittest.cc",
-    "../browser/conflicts/module_event_sink_impl_win_unittest.cc",
-    "../browser/conflicts/module_info_util_win_unittest.cc",
-    "../browser/conflicts/module_info_win_unittest.cc",
-    "../browser/conflicts/module_inspector_win_unittest.cc",
-    "../browser/content_settings/content_settings_default_provider_unittest.cc",
-    "../browser/content_settings/content_settings_mock_observer.cc",
-    "../browser/content_settings/content_settings_mock_observer.h",
-    "../browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc",
-    "../browser/content_settings/content_settings_policy_provider_unittest.cc",
-    "../browser/content_settings/content_settings_pref_provider_unittest.cc",
-    "../browser/content_settings/content_settings_usages_state_unittest.cc",
-    "../browser/content_settings/cookie_settings_factory_unittest.cc",
-    "../browser/content_settings/host_content_settings_map_unittest.cc",
-    "../browser/content_settings/mock_settings_observer.cc",
-    "../browser/content_settings/mock_settings_observer.h",
-    "../browser/content_settings/sound_content_setting_observer_unittest.cc",
-    "../browser/content_settings/tab_specific_content_settings_unittest.cc",
-    "../browser/custom_handlers/protocol_handler_registry_unittest.cc",
-    "../browser/data_usage/tab_id_annotator_unittest.cc",
-    "../browser/data_usage/tab_id_provider_unittest.cc",
-    "../browser/data_use_measurement/chrome_data_use_ascriber_unittest.cc",
-    "../browser/data_use_measurement/page_load_capping/page_load_capping_infobar_delegate_unittest.cc",
-    "../browser/download/chrome_download_manager_delegate_unittest.cc",
-    "../browser/download/download_history_unittest.cc",
-    "../browser/download/download_item_model_unittest.cc",
-    "../browser/download/download_path_reservation_tracker_unittest.cc",
-    "../browser/download/download_prefs_unittest.cc",
-    "../browser/download/download_query_unittest.cc",
-    "../browser/download/download_request_limiter_unittest.cc",
-    "../browser/download/download_resource_throttle_unittest.cc",
-    "../browser/download/download_status_updater_unittest.cc",
-    "../browser/download/download_target_determiner_unittest.cc",
-    "../browser/download/download_ui_controller_unittest.cc",
-    "../browser/engagement/important_sites_usage_counter_unittest.cc",
-    "../browser/engagement/important_sites_util_unittest.cc",
-    "../browser/engagement/site_engagement_helper_unittest.cc",
-    "../browser/engagement/site_engagement_score_unittest.cc",
-    "../browser/engagement/site_engagement_service_unittest.cc",
-    "../browser/engagement/top_sites/site_engagement_top_sites_provider_unittest.cc",
-    "../browser/external_protocol/external_protocol_handler_unittest.cc",
-    "../browser/file_select_helper_unittest.cc",
-    "../browser/font_pref_change_notifier_unittest.cc",
-    "../browser/geolocation/geolocation_permission_context_unittest.cc",
-    "../browser/global_keyboard_shortcuts_mac_unittest.mm",
-    "../browser/google/google_update_settings_unittest.cc",
-    "../browser/history/android/android_cache_database_unittest.cc",
-    "../browser/history/android/android_history_provider_service_unittest.cc",
-    "../browser/history/android/android_provider_backend_unittest.cc",
-    "../browser/history/android/android_urls_database_unittest.cc",
-    "../browser/history/android/bookmark_model_sql_handler_unittest.cc",
-    "../browser/history/android/sqlite_cursor_unittest.cc",
-    "../browser/history/android/urls_sql_handler_unittest.cc",
-    "../browser/history/android/visit_sql_handler_unittest.cc",
-    "../browser/infobars/mock_infobar_service.cc",
-    "../browser/infobars/mock_infobar_service.h",
-    "../browser/install_verification/win/loaded_module_verification_unittest.cc",
-    "../browser/install_verification/win/module_ids_unittest.cc",
-    "../browser/install_verification/win/module_info_unittest.cc",
-    "../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/installable/installable_manager_unittest.cc",
-    "../browser/installable/installable_task_queue_unittest.cc",
-    "../browser/internal_auth_unittest.cc",
-    "../browser/language/language_model_factory_unittest.cc",
-    "../browser/language/url_language_histogram_factory_unittest.cc",
-    "../browser/loader/chrome_navigation_data_unittest.cc",
-    "../browser/loader/chrome_resource_dispatcher_host_delegate_unittest.cc",
-    "../browser/logging_chrome_unittest.cc",
-    "../browser/mac/exception_processor_unittest.mm",
-    "../browser/mac/keystone_glue_unittest.mm",
-    "../browser/media/android/router/media_router_android_unittest.cc",
-    "../browser/media/cast_remoting_connector_unittest.cc",
-    "../browser/media/media_engagement_contents_observer_unittest.cc",
-    "../browser/media/media_engagement_preloaded_list_unittest.cc",
-    "../browser/media/media_engagement_score_unittest.cc",
-    "../browser/media/media_engagement_service_unittest.cc",
-    "../browser/media/media_engagement_session_unittest.cc",
-    "../browser/media/media_storage_id_salt_unittest.cc",
-    "../browser/media/midi_permission_context_unittest.cc",
-    "../browser/media/midi_sysex_permission_context_unittest.cc",
-    "../browser/media/router/issue_manager_unittest.cc",
-    "../browser/media/router/media_router_base_unittest.cc",
-    "../browser/media/router/media_router_dialog_controller_unittest.cc",
-    "../browser/media/router/media_router_factory_unittest.cc",
-    "../browser/media/router/media_router_metrics_unittest.cc",
-    "../browser/media/router/media_sinks_observer_unittest.cc",
-    "../browser/media/router/presentation/browser_presentation_connection_proxy_unittest.cc",
-    "../browser/media/router/presentation/local_presentation_manager_factory_unittest.cc",
-    "../browser/media/router/presentation/local_presentation_manager_unittest.cc",
-    "../browser/media/router/presentation/presentation_media_sinks_observer_unittest.cc",
-    "../browser/media/router/presentation/presentation_service_delegate_impl_unittest.cc",
-    "../browser/media/webrtc/media_stream_device_permission_context_unittest.cc",
-    "../browser/metrics/antivirus_metrics_provider_win_unittest.cc",
-    "../browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc",
-    "../browser/metrics/chrome_metrics_service_accessor_unittest.cc",
-    "../browser/metrics/chrome_metrics_service_client_unittest.cc",
-    "../browser/metrics/oom/out_of_memory_reporter_unittest.cc",
-    "../browser/metrics/perf/perf_provider_chromeos_unittest.cc",
-    "../browser/metrics/process_memory_metrics_emitter_unittest.cc",
-    "../browser/metrics/subprocess_metrics_provider_unittest.cc",
-    "../browser/metrics/thread_watcher_android_unittest.cc",
-    "../browser/metrics/thread_watcher_unittest.cc",
-    "../browser/mod_pagespeed/mod_pagespeed_metrics_unittest.cc",
-    "../browser/net/chrome_accept_language_settings_unittest.cc",
-    "../browser/net/chrome_network_delegate_unittest.cc",
-    "../browser/net/dns_probe_runner_unittest.cc",
-    "../browser/net/dns_probe_service_unittest.cc",
-    "../browser/net/file_downloader_unittest.cc",
-    "../browser/net/net_error_tab_helper_unittest.cc",
-    "../browser/net/predictor_unittest.cc",
-    "../browser/net/probe_message_unittest.cc",
-    "../browser/net/quota_policy_channel_id_store_unittest.cc",
-    "../browser/net/reporting_permissions_checker_unittest.cc",
-    "../browser/net/safe_search_util_unittest.cc",
-    "../browser/net/spdyproxy/data_reduction_proxy_chrome_settings_unittest.cc",
-    "../browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc",
-    "../browser/net/url_info_unittest.cc",
-    "../browser/notifications/desktop_notification_profile_util_unittest.cc",
-    "../browser/notifications/metrics/notification_metrics_logger_unittest.cc",
-    "../browser/notifications/notification_channels_provider_android_unittest.cc",
-    "../browser/notifications/notification_permission_context_unittest.cc",
-    "../browser/notifications/notification_platform_bridge_mac_unittest.mm",
-    "../browser/notifications/platform_notification_service_unittest.cc",
-    "../browser/notifications/stub_alert_dispatcher_mac.h",
-    "../browser/notifications/stub_alert_dispatcher_mac.mm",
-    "../browser/notifications/stub_notification_center_mac.h",
-    "../browser/notifications/stub_notification_center_mac.mm",
-    "../browser/ntp_snippets/bookmark_last_visit_updater_unittest.cc",
-    "../browser/ntp_snippets/download_suggestions_provider_unittest.cc",
-    "../browser/page_load_metrics/metrics_web_contents_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/aborts_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/ads_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/amp_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/data_reduction_proxy_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/google_captcha_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/local_network_requests_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/lofi_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/media_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/noscript_preview_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/offline_page_previews_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/page_capping_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc",
-    "../browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h",
-    "../browser/page_load_metrics/observers/page_load_metrics_observer_tester.cc",
-    "../browser/page_load_metrics/observers/page_load_metrics_observer_tester.h",
-    "../browser/page_load_metrics/observers/previews_ukm_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/protocol_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/service_worker_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/ukm_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/use_counter_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/page_load_metrics_util_unittest.cc",
-    "../browser/page_load_metrics/user_input_tracker_unittest.cc",
-    "../browser/password_manager/chrome_password_manager_client_unittest.cc",
-    "../browser/password_manager/password_manager_internals_service_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/payments/payment_handler_permission_context_unittest.cc",
-    "../browser/permissions/chooser_context_base_unittest.cc",
-    "../browser/permissions/permission_context_base_feature_policy_unittest.cc",
-    "../browser/permissions/permission_context_base_unittest.cc",
-    "../browser/permissions/permission_decision_auto_blocker_unittest.cc",
-    "../browser/permissions/permission_manager_unittest.cc",
-    "../browser/permissions/permission_request_manager_unittest.cc",
-    "../browser/permissions/permission_util_unittest.cc",
-    "../browser/plugins/pdf_iframe_navigation_throttle_unittest.cc",
-    "../browser/policy/browser_dm_token_storage_win_unittest.cc",
-    "../browser/policy/cloud/cloud_policy_invalidator_unittest.cc",
-    "../browser/policy/cloud/cloud_policy_test_utils.cc",
-    "../browser/policy/cloud/cloud_policy_test_utils.h",
-    "../browser/policy/cloud/remote_commands_invalidator_unittest.cc",
-    "../browser/policy/cloud/user_policy_signin_service_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/profile_policy_connector_unittest.cc",
-    "../browser/predictors/autocomplete_action_predictor_table_unittest.cc",
-    "../browser/predictors/autocomplete_action_predictor_unittest.cc",
-    "../browser/predictors/loading_data_collector_unittest.cc",
-    "../browser/predictors/loading_predictor_config_unittest.cc",
-    "../browser/predictors/loading_predictor_unittest.cc",
-    "../browser/predictors/loading_stats_collector_unittest.cc",
-    "../browser/predictors/preconnect_manager_unittest.cc",
-    "../browser/predictors/resource_prefetch_predictor_tables_unittest.cc",
-    "../browser/predictors/resource_prefetch_predictor_unittest.cc",
-    "../browser/prefs/chrome_command_line_pref_store_proxy_unittest.cc",
-    "../browser/prefs/chrome_command_line_pref_store_ssl_manager_unittest.cc",
-    "../browser/prefs/chrome_command_line_pref_store_unittest.cc",
-    "../browser/prefs/chrome_pref_service_unittest.cc",
-    "../browser/prefs/incognito_mode_prefs_unittest.cc",
-    "../browser/prefs/profile_pref_store_manager_unittest.cc",
-    "../browser/prefs/proxy_policy_unittest.cc",
-    "../browser/prefs/session_startup_pref_unittest.cc",
-    "../browser/prerender/prerender_history_unittest.cc",
-    "../browser/prerender/prerender_resource_throttle_unittest.cc",
-    "../browser/prerender/prerender_unittest.cc",
-    "../browser/prerender/prerender_util_unittest.cc",
-    "../browser/previews/previews_infobar_delegate_unittest.cc",
-    "../browser/previews/previews_infobar_tab_helper_unittest.cc",
-    "../browser/previews/previews_service_unittest.cc",
-    "../browser/process_singleton_win_unittest.cc",
-    "../browser/profiles/gaia_info_update_service_unittest.cc",
-    "../browser/profiles/guest_mode_policy_handler_unittest.cc",
-    "../browser/profiles/incognito_mode_policy_handler_unittest.cc",
-    "../browser/profiles/profile_attributes_storage_unittest.cc",
-    "../browser/profiles/profile_avatar_icon_util_unittest.cc",
-    "../browser/profiles/profile_downloader_unittest.cc",
-    "../browser/profiles/profile_info_cache_unittest.cc",
-    "../browser/profiles/profile_info_cache_unittest.h",
-    "../browser/profiles/profile_manager_unittest.cc",
-    "../browser/profiles/profile_shortcut_manager_unittest_win.cc",
-    "../browser/profiling_host/background_profiling_triggers_unittest.cc",
-    "../browser/profiling_host/chrome_client_connection_manager_unittest.cc",
-    "../browser/push_messaging/push_messaging_app_identifier_unittest.cc",
-    "../browser/push_messaging/push_messaging_notification_manager_unittest.cc",
-    "../browser/push_messaging/push_messaging_service_unittest.cc",
-    "../browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm",
-    "../browser/resources_util_unittest.cc",
-    "../browser/search/contextual_search_policy_handler_android_unittest.cc",
-    "../browser/search/thumbnail_source_unittest.cc",
-
-    # TODO(hashimoto): those tests should be componentized and moved to
-    # //components:components_unittests, http://crbug.com/527882.
-    "../browser/search_engines/template_url_fetcher_unittest.cc",
-    "../browser/search_engines/template_url_parser_unittest.cc",
-    "../browser/search_engines/template_url_service_sync_unittest.cc",
-    "../browser/search_engines/template_url_service_unittest.cc",
-    "../browser/service_process/service_process_control_mac_unittest.mm",
-    "../browser/sessions/chrome_serialized_navigation_driver_unittest.cc",
-    "../browser/sessions/restore_on_startup_policy_handler_unittest.cc",
-    "../browser/sessions/session_common_utils_unittest.cc",
-    "../browser/shell_integration_win_unittest.cc",
-    "../browser/signin/account_consistency_mode_manager_unittest.cc",
-    "../browser/signin/chrome_signin_client_unittest.cc",
-    "../browser/signin/chrome_signin_helper_unittest.cc",
-    "../browser/signin/chrome_signin_status_metrics_provider_delegate_unittest.cc",
-    "../browser/signin/local_auth_unittest.cc",
-    "../browser/signin/signin_status_metrics_provider_chromeos_unittest.cc",
-    "../browser/signin/signin_tracker_unittest.cc",
-    "../browser/signin/test_signin_client_builder.cc",
-    "../browser/signin/test_signin_client_builder.h",
-    "../browser/ssl/certificate_error_report_unittest.cc",
-    "../browser/ssl/certificate_error_reporter_unittest.cc",
-    "../browser/ssl/chrome_expect_ct_reporter_unittest.cc",
-    "../browser/ssl/insecure_sensitive_input_driver_unittest.cc",
-    "../browser/ssl/security_state_tab_helper_unittest.cc",
-    "../browser/ssl/ssl_error_assistant_unittest.cc",
-    "../browser/ssl/ssl_error_handler_unittest.cc",
-    "../browser/ssl/ssl_error_navigation_throttle_unittest.cc",
-    "../browser/ssl/ssl_error_tab_helper_unittest.cc",
-    "../browser/ssl/typed_navigation_timing_throttle_unittest.cc",
-    "../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/durable_storage_permission_context_unittest.cc",
-    "../browser/subresource_filter/subresource_filter_abusive_unittest.cc",
-    "../browser/subresource_filter/subresource_filter_configuration_unittest.cc",
-    "../browser/subresource_filter/subresource_filter_content_settings_manager_unittest.cc",
-    "../browser/subresource_filter/subresource_filter_test_harness.cc",
-    "../browser/subresource_filter/subresource_filter_test_harness.h",
-    "../browser/subresource_filter/subresource_filter_unittest.cc",
-    "../browser/sync/chrome_sync_client_unittest.cc",
-    "../browser/sync/profile_sync_service_factory_unittest.cc",
-    "../browser/sync/sessions/sync_sessions_web_contents_router_unittest.cc",
-    "../browser/sync/sync_startup_tracker_unittest.cc",
-    "../browser/thumbnails/thumbnail_service_unittest.cc",
-    "../browser/thumbnails/thumbnail_utils_unittest.cc",
-    "../browser/tracing/background_tracing_field_trial_unittest.cc",
-    "../browser/translate/chrome_translate_client_unittest.cc",
-    "../browser/translate/translate_service_unittest.cc",
-    "../browser/ui/android/tab_model/tab_model_list_unittest.cc",
-    "../browser/ui/android/tab_model/tab_model_unittest.cc",
-    "../browser/ui/autofill/autofill_dialog_models_unittest.cc",
-    "../browser/ui/autofill/autofill_popup_layout_model_unittest.cc",
-    "../browser/ui/autofill/popup_view_common_unittest.cc",
-    "../browser/ui/blocked_content/popup_opener_tab_helper_unittest.cc",
-    "../browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc",
-    "../browser/ui/blocked_content/scoped_visibility_tracker_unittest.cc",
-    "../browser/ui/bookmarks/bookmark_editor_unittest.cc",
-    "../browser/ui/bookmarks/bookmark_ui_utils_desktop_unittest.cc",
-    "../browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc",
-    "../browser/ui/chrome_select_file_policy_unittest.cc",
-    "../browser/ui/find_bar/find_backend_unittest.cc",
-    "../browser/ui/login/login_handler_unittest.cc",
-    "../browser/ui/page_info/page_info_unittest.cc",
-    "../browser/ui/passwords/manage_passwords_state_unittest.cc",
-    "../browser/ui/passwords/manage_passwords_view_utils_unittest.cc",
-    "../browser/ui/passwords/password_access_authenticator_unittest.cc",
-    "../browser/ui/passwords/password_manager_porter_unittest.cc",
-    "../browser/ui/passwords/password_manager_presenter_unittest.cc",
-    "../browser/ui/search_engines/keyword_editor_controller_unittest.cc",
-    "../browser/ui/sync/profile_signin_confirmation_helper_unittest.cc",
-    "../browser/ui/sync/sync_promo_ui_unittest.cc",
-    "../browser/ui/sync/tab_contents_synced_tab_delegate_unittest.cc",
-    "../browser/ui/tests/ui_gfx_image_unittest.cc",
-    "../browser/ui/tests/ui_gfx_image_unittest.mm",
-    "../browser/ui/webui/fileicon_source_unittest.cc",
-    "../browser/ui/webui/interventions_internals/interventions_internals_page_handler_unittest.cc",
-    "../browser/ui/webui/local_state/local_state_ui_unittest.cc",
-    "../browser/ui/webui/log_web_ui_url_unittest.cc",
-    "../browser/update_client/chrome_update_query_params_delegate_unittest.cc",
-    "../browser/vr/metrics/session_metrics_helper_unittest.cc",
-    "../browser/vr/vr_tab_helper_unittest.cc",
-    "../browser/webshare/share_target_pref_helper_unittest.cc",
-    "../browser/win/chrome_elf_init_unittest.cc",
-    "../browser/win/enumerate_modules_model_unittest.cc",
-    "../browser/win/jumplist_file_util_unittest.cc",
-    "../browser/win/jumplist_update_util_unittest.cc",
-    "../browser/win/taskbar_icon_finder_unittest.cc",
-    "../common/chrome_constants_win_unittest.cc",
-    "../common/chrome_content_client_unittest.cc",
-    "../common/chrome_paths_unittest.cc",
-    "../common/component_flash_hint_file_linux_unittest.cc",
-    "../common/conflicts/module_watcher_win_unittest.cc",
-    "../common/crash_keys_unittest.cc",
-    "../common/ini_parser_unittest.cc",
-    "../common/mac/cfbundle_blocker_unittest.mm",
-    "../common/mac/mock_launchd.cc",
-    "../common/mac/mock_launchd.h",
-    "../common/media_router/issue_unittest.cc",
-    "../common/media_router/media_route_unittest.cc",
-    "../common/media_router/media_sink_unittest.cc",
-    "../common/media_router/media_source_helper_unittest.cc",
-    "../common/media_router/media_source_unittest.cc",
-    "../common/origin_trials/chrome_origin_trial_policy_unittest.cc",
-    "../common/page_load_metrics/test/weak_mock_timer.cc",
-    "../common/page_load_metrics/test/weak_mock_timer.h",
-    "../common/pref_names_util_unittest.cc",
-    "../common/secure_origin_whitelist_unittest.cc",
-    "../common/thread_profiler_unittest.cc",
-    "../renderer/app_categorizer_unittest.cc",
-    "../renderer/chrome_content_renderer_client_unittest.cc",
-    "../renderer/content_settings_observer_unittest.cc",
-    "../renderer/instant_restricted_id_cache_unittest.cc",
-    "../renderer/media/chrome_key_systems_provider_unittest.cc",
-    "../renderer/net/net_error_helper_core_unittest.cc",
-    "../renderer/page_load_metrics/fake_page_timing_sender.cc",
-    "../renderer/page_load_metrics/fake_page_timing_sender.h",
-    "../renderer/page_load_metrics/metrics_render_frame_observer_unittest.cc",
-    "../renderer/page_load_metrics/page_timing_metrics_sender_unittest.cc",
-    "../renderer/plugins/plugin_uma_unittest.cc",
-    "../renderer/prerender/prerender_dispatcher_unittest.cc",
-    "../renderer/web_apps_unittest.cc",
-    "../test/base/chrome_render_view_test.cc",
-    "../test/base/chrome_render_view_test.h",
-    "../test/base/menu_model_test.cc",
-    "../test/base/menu_model_test.h",
-    "../test/base/v8_unit_test.cc",
-    "../test/base/v8_unit_test.h",
-    "../test/logging/win/mof_data_parser_unittest.cc",
-
-    # Duplicate these tests here because PathService has more items in
-    # unit_tests than in base_unittests.
-    "../../base/path_service_unittest.cc",
-    "../../testing/gtest_mac_unittest.mm",
-    "../../third_party/zlib/google/compression_utils_unittest.cc",
-    "../../third_party/zlib/google/zip_reader_unittest.cc",
-    "../../third_party/zlib/google/zip_unittest.cc",
-  ]
-
-  if (is_win) {
-    assert(toolkit_views)
-    sources += [
-      "../browser/notifications/mock_notification_image_retainer.cc",
-      "../browser/notifications/mock_notification_image_retainer.h",
-      "../browser/ui/views/try_chrome_dialog_win/button_layout_unittest.cc",
+  test("unit_tests") {
+    sources = [
+      # enums.xml is analyzed by AboutFlagsHistogramTest, so this
+      # dependency is needed to make commit bots run unit_tests on
+      # enums.xml changes.
+      "../../tools/metrics/histograms/enums.xml",
+
+      # All unittests in browser, common, renderer and service.
+      "../browser/about_flags_unittest.cc",
+      "../browser/active_use_util_unittest.cc",
+      "../browser/after_startup_task_utils_unittest.cc",
+      "../browser/android/bookmarks/partner_bookmarks_shim_unittest.cc",
+      "../browser/android/compositor/layer/tab_layer_unittest.cc",
+      "../browser/android/contextualsearch/contextual_search_delegate_unittest.cc",
+      "../browser/android/contextualsearch/contextual_search_field_trial_unittest.cc",
+      "../browser/android/data_usage/data_use_matcher_unittest.cc",
+      "../browser/android/data_usage/data_use_tab_model_unittest.cc",
+      "../browser/android/data_usage/data_use_ui_tab_model_unittest.cc",
+      "../browser/android/data_usage/external_data_use_observer_unittest.cc",
+      "../browser/android/data_usage/external_data_use_reporter_unittest.cc",
+      "../browser/android/data_usage/tab_data_use_entry_unittest.cc",
+      "../browser/android/digital_asset_links/digital_asset_links_handler_unittest.cc",
+      "../browser/android/download/download_manager_service_unittest.cc",
+      "../browser/android/history_report/data_observer_unittest.cc",
+      "../browser/android/history_report/delta_file_backend_leveldb_unittest.cc",
+      "../browser/android/history_report/delta_file_commons_unittest.cc",
+      "../browser/android/history_report/usage_reports_buffer_backend_unittest.cc",
+      "../browser/android/locale/special_locale_handler_unittest.cc",
+      "../browser/android/tab_web_contents_delegate_android_unittest.cc",
+
+      # TODO(newt): move this to test_support_unit?
+      "../browser/android/chrome_backup_agent_unittest.cc",
+      "../browser/android/customtabs/detached_resource_request_unittest.cc",
+      "../browser/android/favicon_helper_unittest.cc",
+      "../browser/android/mock_location_settings.cc",
+      "../browser/android/mock_location_settings.h",
+      "../browser/android/ntp/content_suggestions_notifier_service_unittest.cc",
+      "../browser/android/ntp/content_suggestions_notifier_unittest.cc",
+      "../browser/android/oom_intervention/near_oom_monitor_unittest.cc",
+      "../browser/android/oom_intervention/oom_intervention_decider_unittest.cc",
+      "../browser/android/password_ui_view_android_unittest.cc",
+      "../browser/android/physical_web/physical_web_data_source_android_unittest.cc",
+      "../browser/android/preferences/pref_service_bridge_unittest.cc",
+      "../browser/android/preferences/prefs_unittest.cc",
+      "../browser/android/shortcut_info_unittest.cc",
+      "../browser/android/signin/signin_manager_android_unittest.cc",
+      "../browser/android/thumbnail/scoped_ptr_expiring_cache_unittest.cc",
+      "../browser/android/webapk/webapk_icon_hasher_unittest.cc",
+      "../browser/android/webapk/webapk_installer_unittest.cc",
+      "../browser/android/webapk/webapk_web_manifest_checker_unittest.cc",
+      "../browser/android/webapps/add_to_homescreen_data_fetcher_unittest.cc",
+      "../browser/app_controller_mac_unittest.mm",
+      "../browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc",
+      "../browser/autocomplete/chrome_autocomplete_scheme_classifier_unittest.cc",
+      "../browser/autocomplete/search_provider_unittest.cc",
+      "../browser/autocomplete/shortcuts_provider_extension_unittest.cc",
+      "../browser/background_sync/background_sync_controller_impl_unittest.cc",
+      "../browser/background_sync/background_sync_permission_context_unittest.cc",
+      "../browser/banners/app_banner_settings_helper_unittest.cc",
+      "../browser/bitmap_fetcher/bitmap_fetcher_service_unittest.cc",
+      "../browser/bookmarks/managed_bookmark_service_unittest.cc",
+      "../browser/browser_about_handler_unittest.cc",
+      "../browser/browser_process_impl_unittest.cc",
+      "../browser/browsing_data/browsing_data_appcache_helper_unittest.cc",
+      "../browser/browsing_data/browsing_data_cache_storage_helper_unittest.cc",
+      "../browser/browsing_data/browsing_data_channel_id_helper_unittest.cc",
+      "../browser/browsing_data/browsing_data_cookie_helper_unittest.cc",
+      "../browser/browsing_data/browsing_data_database_helper_unittest.cc",
+      "../browser/browsing_data/browsing_data_file_system_helper_unittest.cc",
+      "../browser/browsing_data/browsing_data_helper_unittest.cc",
+      "../browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc",
+      "../browser/browsing_data/browsing_data_local_storage_helper_unittest.cc",
+      "../browser/browsing_data/browsing_data_media_license_helper_unittest.cc",
+      "../browser/browsing_data/browsing_data_quota_helper_unittest.cc",
+      "../browser/browsing_data/browsing_data_service_worker_helper_unittest.cc",
+      "../browser/browsing_data/browsing_data_shared_worker_helper_unittest.cc",
+      "../browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc",
+      "../browser/browsing_data/cookies_tree_model_unittest.cc",
+      "../browser/browsing_data/counters/bookmark_counter_unittest.cc",
+      "../browser/browsing_data/counters/browsing_data_counter_utils_unittest.cc",
+      "../browser/browsing_data/counters/site_data_counting_helper_unittest.cc",
+      "../browser/browsing_data/counters/site_settings_counter_unittest.cc",
+      "../browser/browsing_data/site_data_size_collector_unittest.cc",
+      "../browser/budget_service/budget_database_unittest.cc",
+      "../browser/budget_service/budget_manager_unittest.cc",
+      "../browser/chrome_content_browser_client_unittest.cc",
+      "../browser/chrome_process_singleton_win_unittest.cc",
+      "../browser/client_hints/client_hints_unittest.cc",
+      "../browser/command_updater_impl_unittest.cc",
+      "../browser/component_updater/chrome_component_updater_configurator_unittest.cc",
+      "../browser/component_updater/component_installer_errors_unittest.cc",
+      "../browser/component_updater/optimization_hints_component_installer_unittest.cc",
+      "../browser/component_updater/origin_trials_component_installer_unittest.cc",
+      "../browser/component_updater/sth_set_component_installer_unittest.cc",
+      "../browser/component_updater/subresource_filter_component_installer_unittest.cc",
+      "../browser/component_updater/supervised_user_whitelist_installer_unittest.cc",
+      "../browser/component_updater/sw_reporter_installer_win_unittest.cc",
+      "../browser/conflicts/enumerate_input_method_editors_win_unittest.cc",
+      "../browser/conflicts/enumerate_shell_extensions_win_unittest.cc",
+      "../browser/conflicts/module_database_win_unittest.cc",
+      "../browser/conflicts/module_event_sink_impl_win_unittest.cc",
+      "../browser/conflicts/module_info_util_win_unittest.cc",
+      "../browser/conflicts/module_info_win_unittest.cc",
+      "../browser/conflicts/module_inspector_win_unittest.cc",
+      "../browser/content_settings/content_settings_default_provider_unittest.cc",
+      "../browser/content_settings/content_settings_mock_observer.cc",
+      "../browser/content_settings/content_settings_mock_observer.h",
+      "../browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc",
+      "../browser/content_settings/content_settings_policy_provider_unittest.cc",
+      "../browser/content_settings/content_settings_pref_provider_unittest.cc",
+      "../browser/content_settings/content_settings_usages_state_unittest.cc",
+      "../browser/content_settings/cookie_settings_factory_unittest.cc",
+      "../browser/content_settings/host_content_settings_map_unittest.cc",
+      "../browser/content_settings/mock_settings_observer.cc",
+      "../browser/content_settings/mock_settings_observer.h",
+      "../browser/content_settings/sound_content_setting_observer_unittest.cc",
+      "../browser/content_settings/tab_specific_content_settings_unittest.cc",
+      "../browser/custom_handlers/protocol_handler_registry_unittest.cc",
+      "../browser/data_usage/tab_id_annotator_unittest.cc",
+      "../browser/data_usage/tab_id_provider_unittest.cc",
+      "../browser/data_use_measurement/chrome_data_use_ascriber_unittest.cc",
+      "../browser/data_use_measurement/page_load_capping/page_load_capping_infobar_delegate_unittest.cc",
+      "../browser/download/chrome_download_manager_delegate_unittest.cc",
+      "../browser/download/download_history_unittest.cc",
+      "../browser/download/download_item_model_unittest.cc",
+      "../browser/download/download_path_reservation_tracker_unittest.cc",
+      "../browser/download/download_prefs_unittest.cc",
+      "../browser/download/download_query_unittest.cc",
+      "../browser/download/download_request_limiter_unittest.cc",
+      "../browser/download/download_resource_throttle_unittest.cc",
+      "../browser/download/download_status_updater_unittest.cc",
+      "../browser/download/download_target_determiner_unittest.cc",
+      "../browser/download/download_ui_controller_unittest.cc",
+      "../browser/engagement/important_sites_usage_counter_unittest.cc",
+      "../browser/engagement/important_sites_util_unittest.cc",
+      "../browser/engagement/site_engagement_helper_unittest.cc",
+      "../browser/engagement/site_engagement_score_unittest.cc",
+      "../browser/engagement/site_engagement_service_unittest.cc",
+      "../browser/engagement/top_sites/site_engagement_top_sites_provider_unittest.cc",
+      "../browser/external_protocol/external_protocol_handler_unittest.cc",
+      "../browser/file_select_helper_unittest.cc",
+      "../browser/font_pref_change_notifier_unittest.cc",
+      "../browser/geolocation/geolocation_permission_context_unittest.cc",
+      "../browser/global_keyboard_shortcuts_mac_unittest.mm",
+      "../browser/google/google_update_settings_unittest.cc",
+      "../browser/history/android/android_cache_database_unittest.cc",
+      "../browser/history/android/android_history_provider_service_unittest.cc",
+      "../browser/history/android/android_provider_backend_unittest.cc",
+      "../browser/history/android/android_urls_database_unittest.cc",
+      "../browser/history/android/bookmark_model_sql_handler_unittest.cc",
+      "../browser/history/android/sqlite_cursor_unittest.cc",
+      "../browser/history/android/urls_sql_handler_unittest.cc",
+      "../browser/history/android/visit_sql_handler_unittest.cc",
+      "../browser/infobars/mock_infobar_service.cc",
+      "../browser/infobars/mock_infobar_service.h",
+      "../browser/install_verification/win/loaded_module_verification_unittest.cc",
+      "../browser/install_verification/win/module_ids_unittest.cc",
+      "../browser/install_verification/win/module_info_unittest.cc",
+      "../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/installable/installable_manager_unittest.cc",
+      "../browser/installable/installable_task_queue_unittest.cc",
+      "../browser/internal_auth_unittest.cc",
+      "../browser/language/language_model_factory_unittest.cc",
+      "../browser/language/url_language_histogram_factory_unittest.cc",
+      "../browser/loader/chrome_navigation_data_unittest.cc",
+      "../browser/loader/chrome_resource_dispatcher_host_delegate_unittest.cc",
+      "../browser/logging_chrome_unittest.cc",
+      "../browser/mac/exception_processor_unittest.mm",
+      "../browser/mac/keystone_glue_unittest.mm",
+      "../browser/media/android/router/media_router_android_unittest.cc",
+      "../browser/media/cast_remoting_connector_unittest.cc",
+      "../browser/media/media_engagement_contents_observer_unittest.cc",
+      "../browser/media/media_engagement_preloaded_list_unittest.cc",
+      "../browser/media/media_engagement_score_unittest.cc",
+      "../browser/media/media_engagement_service_unittest.cc",
+      "../browser/media/media_engagement_session_unittest.cc",
+      "../browser/media/media_storage_id_salt_unittest.cc",
+      "../browser/media/midi_permission_context_unittest.cc",
+      "../browser/media/midi_sysex_permission_context_unittest.cc",
+      "../browser/media/router/issue_manager_unittest.cc",
+      "../browser/media/router/media_router_base_unittest.cc",
+      "../browser/media/router/media_router_dialog_controller_unittest.cc",
+      "../browser/media/router/media_router_factory_unittest.cc",
+      "../browser/media/router/media_router_metrics_unittest.cc",
+      "../browser/media/router/media_sinks_observer_unittest.cc",
+      "../browser/media/router/presentation/browser_presentation_connection_proxy_unittest.cc",
+      "../browser/media/router/presentation/local_presentation_manager_factory_unittest.cc",
+      "../browser/media/router/presentation/local_presentation_manager_unittest.cc",
+      "../browser/media/router/presentation/presentation_media_sinks_observer_unittest.cc",
+      "../browser/media/router/presentation/presentation_service_delegate_impl_unittest.cc",
+      "../browser/media/webrtc/media_stream_device_permission_context_unittest.cc",
+      "../browser/metrics/antivirus_metrics_provider_win_unittest.cc",
+      "../browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc",
+      "../browser/metrics/chrome_metrics_service_accessor_unittest.cc",
+      "../browser/metrics/chrome_metrics_service_client_unittest.cc",
+      "../browser/metrics/oom/out_of_memory_reporter_unittest.cc",
+      "../browser/metrics/perf/perf_provider_chromeos_unittest.cc",
+      "../browser/metrics/process_memory_metrics_emitter_unittest.cc",
+      "../browser/metrics/subprocess_metrics_provider_unittest.cc",
+      "../browser/metrics/thread_watcher_android_unittest.cc",
+      "../browser/metrics/thread_watcher_unittest.cc",
+      "../browser/mod_pagespeed/mod_pagespeed_metrics_unittest.cc",
+      "../browser/net/chrome_accept_language_settings_unittest.cc",
+      "../browser/net/chrome_network_delegate_unittest.cc",
+      "../browser/net/dns_probe_runner_unittest.cc",
+      "../browser/net/dns_probe_service_unittest.cc",
+      "../browser/net/file_downloader_unittest.cc",
+      "../browser/net/net_error_tab_helper_unittest.cc",
+      "../browser/net/predictor_unittest.cc",
+      "../browser/net/probe_message_unittest.cc",
+      "../browser/net/quota_policy_channel_id_store_unittest.cc",
+      "../browser/net/reporting_permissions_checker_unittest.cc",
+      "../browser/net/safe_search_util_unittest.cc",
+      "../browser/net/spdyproxy/data_reduction_proxy_chrome_settings_unittest.cc",
+      "../browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc",
+      "../browser/net/url_info_unittest.cc",
+      "../browser/notifications/desktop_notification_profile_util_unittest.cc",
+      "../browser/notifications/metrics/notification_metrics_logger_unittest.cc",
+      "../browser/notifications/notification_channels_provider_android_unittest.cc",
+      "../browser/notifications/notification_permission_context_unittest.cc",
+      "../browser/notifications/notification_platform_bridge_mac_unittest.mm",
+      "../browser/notifications/platform_notification_service_unittest.cc",
+      "../browser/notifications/stub_alert_dispatcher_mac.h",
+      "../browser/notifications/stub_alert_dispatcher_mac.mm",
+      "../browser/notifications/stub_notification_center_mac.h",
+      "../browser/notifications/stub_notification_center_mac.mm",
+      "../browser/ntp_snippets/bookmark_last_visit_updater_unittest.cc",
+      "../browser/ntp_snippets/download_suggestions_provider_unittest.cc",
+      "../browser/page_load_metrics/metrics_web_contents_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/aborts_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/ads_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/amp_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/data_reduction_proxy_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/google_captcha_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/local_network_requests_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/lofi_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/media_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/noscript_preview_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/offline_page_previews_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/page_capping_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc",
+      "../browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h",
+      "../browser/page_load_metrics/observers/page_load_metrics_observer_tester.cc",
+      "../browser/page_load_metrics/observers/page_load_metrics_observer_tester.h",
+      "../browser/page_load_metrics/observers/previews_ukm_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/protocol_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/service_worker_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/ukm_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/observers/use_counter_page_load_metrics_observer_unittest.cc",
+      "../browser/page_load_metrics/page_load_metrics_util_unittest.cc",
+      "../browser/page_load_metrics/user_input_tracker_unittest.cc",
+      "../browser/password_manager/chrome_password_manager_client_unittest.cc",
+      "../browser/password_manager/password_manager_internals_service_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/payments/payment_handler_permission_context_unittest.cc",
+      "../browser/permissions/chooser_context_base_unittest.cc",
+      "../browser/permissions/permission_context_base_feature_policy_unittest.cc",
+      "../browser/permissions/permission_context_base_unittest.cc",
+      "../browser/permissions/permission_decision_auto_blocker_unittest.cc",
+      "../browser/permissions/permission_manager_unittest.cc",
+      "../browser/permissions/permission_request_manager_unittest.cc",
+      "../browser/permissions/permission_util_unittest.cc",
+      "../browser/plugins/pdf_iframe_navigation_throttle_unittest.cc",
+      "../browser/policy/browser_dm_token_storage_win_unittest.cc",
+      "../browser/policy/cloud/cloud_policy_invalidator_unittest.cc",
+      "../browser/policy/cloud/cloud_policy_test_utils.cc",
+      "../browser/policy/cloud/cloud_policy_test_utils.h",
+      "../browser/policy/cloud/remote_commands_invalidator_unittest.cc",
+      "../browser/policy/cloud/user_policy_signin_service_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/profile_policy_connector_unittest.cc",
+      "../browser/predictors/autocomplete_action_predictor_table_unittest.cc",
+      "../browser/predictors/autocomplete_action_predictor_unittest.cc",
+      "../browser/predictors/loading_data_collector_unittest.cc",
+      "../browser/predictors/loading_predictor_config_unittest.cc",
+      "../browser/predictors/loading_predictor_unittest.cc",
+      "../browser/predictors/loading_stats_collector_unittest.cc",
+      "../browser/predictors/preconnect_manager_unittest.cc",
+      "../browser/predictors/resource_prefetch_predictor_tables_unittest.cc",
+      "../browser/predictors/resource_prefetch_predictor_unittest.cc",
+      "../browser/prefs/chrome_command_line_pref_store_proxy_unittest.cc",
+      "../browser/prefs/chrome_command_line_pref_store_ssl_manager_unittest.cc",
+      "../browser/prefs/chrome_command_line_pref_store_unittest.cc",
+      "../browser/prefs/chrome_pref_service_unittest.cc",
+      "../browser/prefs/incognito_mode_prefs_unittest.cc",
+      "../browser/prefs/profile_pref_store_manager_unittest.cc",
+      "../browser/prefs/proxy_policy_unittest.cc",
+      "../browser/prefs/session_startup_pref_unittest.cc",
+      "../browser/prerender/prerender_history_unittest.cc",
+      "../browser/prerender/prerender_resource_throttle_unittest.cc",
+      "../browser/prerender/prerender_unittest.cc",
+      "../browser/prerender/prerender_util_unittest.cc",
+      "../browser/previews/previews_infobar_delegate_unittest.cc",
+      "../browser/previews/previews_infobar_tab_helper_unittest.cc",
+      "../browser/previews/previews_service_unittest.cc",
+      "../browser/process_singleton_win_unittest.cc",
+      "../browser/profiles/gaia_info_update_service_unittest.cc",
+      "../browser/profiles/guest_mode_policy_handler_unittest.cc",
+      "../browser/profiles/incognito_mode_policy_handler_unittest.cc",
+      "../browser/profiles/profile_attributes_storage_unittest.cc",
+      "../browser/profiles/profile_avatar_icon_util_unittest.cc",
+      "../browser/profiles/profile_downloader_unittest.cc",
+      "../browser/profiles/profile_info_cache_unittest.cc",
+      "../browser/profiles/profile_info_cache_unittest.h",
+      "../browser/profiles/profile_manager_unittest.cc",
+      "../browser/profiles/profile_shortcut_manager_unittest_win.cc",
+      "../browser/profiling_host/background_profiling_triggers_unittest.cc",
+      "../browser/profiling_host/chrome_client_connection_manager_unittest.cc",
+      "../browser/push_messaging/push_messaging_app_identifier_unittest.cc",
+      "../browser/push_messaging/push_messaging_notification_manager_unittest.cc",
+      "../browser/push_messaging/push_messaging_service_unittest.cc",
+      "../browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm",
+      "../browser/resources_util_unittest.cc",
+      "../browser/search/contextual_search_policy_handler_android_unittest.cc",
+      "../browser/search/thumbnail_source_unittest.cc",
+
+      # TODO(hashimoto): those tests should be componentized and moved to
+      # //components:components_unittests, http://crbug.com/527882.
+      "../browser/search_engines/template_url_fetcher_unittest.cc",
+      "../browser/search_engines/template_url_parser_unittest.cc",
+      "../browser/search_engines/template_url_service_sync_unittest.cc",
+      "../browser/search_engines/template_url_service_unittest.cc",
+      "../browser/service_process/service_process_control_mac_unittest.mm",
+      "../browser/sessions/chrome_serialized_navigation_driver_unittest.cc",
+      "../browser/sessions/restore_on_startup_policy_handler_unittest.cc",
+      "../browser/sessions/session_common_utils_unittest.cc",
+      "../browser/shell_integration_win_unittest.cc",
+      "../browser/signin/account_consistency_mode_manager_unittest.cc",
+      "../browser/signin/chrome_signin_client_unittest.cc",
+      "../browser/signin/chrome_signin_helper_unittest.cc",
+      "../browser/signin/chrome_signin_status_metrics_provider_delegate_unittest.cc",
+      "../browser/signin/local_auth_unittest.cc",
+      "../browser/signin/signin_status_metrics_provider_chromeos_unittest.cc",
+      "../browser/signin/signin_tracker_unittest.cc",
+      "../browser/signin/test_signin_client_builder.cc",
+      "../browser/signin/test_signin_client_builder.h",
+      "../browser/ssl/certificate_error_report_unittest.cc",
+      "../browser/ssl/certificate_error_reporter_unittest.cc",
+      "../browser/ssl/chrome_expect_ct_reporter_unittest.cc",
+      "../browser/ssl/insecure_sensitive_input_driver_unittest.cc",
+      "../browser/ssl/security_state_tab_helper_unittest.cc",
+      "../browser/ssl/ssl_error_assistant_unittest.cc",
+      "../browser/ssl/ssl_error_handler_unittest.cc",
+      "../browser/ssl/ssl_error_navigation_throttle_unittest.cc",
+      "../browser/ssl/ssl_error_tab_helper_unittest.cc",
+      "../browser/ssl/typed_navigation_timing_throttle_unittest.cc",
+      "../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/durable_storage_permission_context_unittest.cc",
+      "../browser/subresource_filter/subresource_filter_abusive_unittest.cc",
+      "../browser/subresource_filter/subresource_filter_configuration_unittest.cc",
+      "../browser/subresource_filter/subresource_filter_content_settings_manager_unittest.cc",
+      "../browser/subresource_filter/subresource_filter_test_harness.cc",
+      "../browser/subresource_filter/subresource_filter_test_harness.h",
+      "../browser/subresource_filter/subresource_filter_unittest.cc",
+      "../browser/sync/chrome_sync_client_unittest.cc",
+      "../browser/sync/profile_sync_service_factory_unittest.cc",
+      "../browser/sync/sessions/sync_sessions_web_contents_router_unittest.cc",
+      "../browser/sync/sync_startup_tracker_unittest.cc",
+      "../browser/thumbnails/thumbnail_service_unittest.cc",
+      "../browser/thumbnails/thumbnail_utils_unittest.cc",
+      "../browser/tracing/background_tracing_field_trial_unittest.cc",
+      "../browser/translate/chrome_translate_client_unittest.cc",
+      "../browser/translate/translate_service_unittest.cc",
+      "../browser/ui/android/tab_model/tab_model_list_unittest.cc",
+      "../browser/ui/android/tab_model/tab_model_unittest.cc",
+      "../browser/ui/autofill/autofill_dialog_models_unittest.cc",
+      "../browser/ui/autofill/autofill_popup_layout_model_unittest.cc",
+      "../browser/ui/autofill/popup_view_common_unittest.cc",
+      "../browser/ui/blocked_content/popup_opener_tab_helper_unittest.cc",
+      "../browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc",
+      "../browser/ui/blocked_content/scoped_visibility_tracker_unittest.cc",
+      "../browser/ui/bookmarks/bookmark_editor_unittest.cc",
+      "../browser/ui/bookmarks/bookmark_ui_utils_desktop_unittest.cc",
+      "../browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc",
+      "../browser/ui/chrome_select_file_policy_unittest.cc",
+      "../browser/ui/find_bar/find_backend_unittest.cc",
+      "../browser/ui/login/login_handler_unittest.cc",
+      "../browser/ui/page_info/page_info_unittest.cc",
+      "../browser/ui/passwords/manage_passwords_state_unittest.cc",
+      "../browser/ui/passwords/manage_passwords_view_utils_unittest.cc",
+      "../browser/ui/passwords/password_access_authenticator_unittest.cc",
+      "../browser/ui/passwords/password_manager_porter_unittest.cc",
+      "../browser/ui/passwords/password_manager_presenter_unittest.cc",
+      "../browser/ui/search_engines/keyword_editor_controller_unittest.cc",
+      "../browser/ui/sync/profile_signin_confirmation_helper_unittest.cc",
+      "../browser/ui/sync/sync_promo_ui_unittest.cc",
+      "../browser/ui/sync/tab_contents_synced_tab_delegate_unittest.cc",
+      "../browser/ui/tests/ui_gfx_image_unittest.cc",
+      "../browser/ui/tests/ui_gfx_image_unittest.mm",
+      "../browser/ui/webui/fileicon_source_unittest.cc",
+      "../browser/ui/webui/interventions_internals/interventions_internals_page_handler_unittest.cc",
+      "../browser/ui/webui/local_state/local_state_ui_unittest.cc",
+      "../browser/ui/webui/log_web_ui_url_unittest.cc",
+      "../browser/update_client/chrome_update_query_params_delegate_unittest.cc",
+      "../browser/vr/metrics/session_metrics_helper_unittest.cc",
+      "../browser/vr/vr_tab_helper_unittest.cc",
+      "../browser/webshare/share_target_pref_helper_unittest.cc",
+      "../browser/win/chrome_elf_init_unittest.cc",
+      "../browser/win/enumerate_modules_model_unittest.cc",
+      "../browser/win/jumplist_file_util_unittest.cc",
+      "../browser/win/jumplist_update_util_unittest.cc",
+      "../browser/win/taskbar_icon_finder_unittest.cc",
+      "../common/chrome_constants_win_unittest.cc",
+      "../common/chrome_content_client_unittest.cc",
+      "../common/chrome_paths_unittest.cc",
+      "../common/component_flash_hint_file_linux_unittest.cc",
+      "../common/conflicts/module_watcher_win_unittest.cc",
+      "../common/crash_keys_unittest.cc",
+      "../common/ini_parser_unittest.cc",
+      "../common/mac/cfbundle_blocker_unittest.mm",
+      "../common/mac/mock_launchd.cc",
+      "../common/mac/mock_launchd.h",
+      "../common/media_router/issue_unittest.cc",
+      "../common/media_router/media_route_unittest.cc",
+      "../common/media_router/media_sink_unittest.cc",
+      "../common/media_router/media_source_helper_unittest.cc",
+      "../common/media_router/media_source_unittest.cc",
+      "../common/origin_trials/chrome_origin_trial_policy_unittest.cc",
+      "../common/page_load_metrics/test/weak_mock_timer.cc",
+      "../common/page_load_metrics/test/weak_mock_timer.h",
+      "../common/pref_names_util_unittest.cc",
+      "../common/secure_origin_whitelist_unittest.cc",
+      "../common/thread_profiler_unittest.cc",
+      "../renderer/app_categorizer_unittest.cc",
+      "../renderer/chrome_content_renderer_client_unittest.cc",
+      "../renderer/content_settings_observer_unittest.cc",
+      "../renderer/instant_restricted_id_cache_unittest.cc",
+      "../renderer/media/chrome_key_systems_provider_unittest.cc",
+      "../renderer/net/net_error_helper_core_unittest.cc",
+      "../renderer/page_load_metrics/fake_page_timing_sender.cc",
+      "../renderer/page_load_metrics/fake_page_timing_sender.h",
+      "../renderer/page_load_metrics/metrics_render_frame_observer_unittest.cc",
+      "../renderer/page_load_metrics/page_timing_metrics_sender_unittest.cc",
+      "../renderer/plugins/plugin_uma_unittest.cc",
+      "../renderer/prerender/prerender_dispatcher_unittest.cc",
+      "../renderer/web_apps_unittest.cc",
+      "../test/base/chrome_render_view_test.cc",
+      "../test/base/chrome_render_view_test.h",
+      "../test/base/menu_model_test.cc",
+      "../test/base/menu_model_test.h",
+      "../test/base/v8_unit_test.cc",
+      "../test/base/v8_unit_test.h",
+      "../test/logging/win/mof_data_parser_unittest.cc",
+
+      # Duplicate these tests here because PathService has more items in
+      # unit_tests than in base_unittests.
+      "../../base/path_service_unittest.cc",
+      "../../testing/gtest_mac_unittest.mm",
+      "../../third_party/zlib/google/compression_utils_unittest.cc",
+      "../../third_party/zlib/google/zip_reader_unittest.cc",
+      "../../third_party/zlib/google/zip_unittest.cc",
     ]
-  }
 
-  configs += [ "//build/config:precompiled_headers" ]
+    if (is_win) {
+      assert(toolkit_views)
+      sources += [
+        "../browser/notifications/mock_notification_image_retainer.cc",
+        "../browser/notifications/mock_notification_image_retainer.h",
+        "../browser/ui/views/try_chrome_dialog_win/button_layout_unittest.cc",
+      ]
+    }
 
-  data_deps = [
-    "//testing/buildbot/filters:unit_tests_filters",
-    "//chrome/test/data/media/engagement/preload:generate_preload_list",
-    "//chrome/test/data/media/engagement/preload:test_data",
-  ]
+    configs += [ "//build/config:precompiled_headers" ]
 
-  data = [
-    "data/",
-    "//base/test/data/",
-    "//chrome/third_party/mock4js/",
-    "//components/test/data/",
-    "//extensions/test/data/",
-    "//google_apis/test/data/",
-    "//net/tools/testserver/",
-    "//third_party/accessibility-audit/axs_testing.js",
-    "//third_party/chaijs/chai.js",
-    "//third_party/pyftpdlib/",
-    "//third_party/pywebsocket/",
-    "//third_party/tlslite/",
-    "//third_party/zlib/google/test/data/",
-    "//tools/metrics/histograms/enums.xml",
-    "$root_out_dir/pyproto/google/",
-  ]
-  if (is_android || is_linux || is_win) {
-    data += [
-      "$root_out_dir/chrome_100_percent.pak",
-      "$root_out_dir/locales/en-US.pak",
-      "$root_out_dir/resources.pak",
+    data_deps = [
+      "//testing/buildbot/filters:unit_tests_filters",
+      "//chrome/test/data/media/engagement/preload:generate_preload_list",
+      "//chrome/test/data/media/engagement/preload:test_data",
     ]
-  }
-  if (is_linux || is_win) {
-    data += [ "$root_out_dir/chrome_200_percent.pak" ]
-  }
-  if (is_win) {
-    data_deps += [ "//chrome" ]
-    data += [ "$root_out_dir/chrome.exe" ]
-  }
 
-  defines = []
-
-  deps = [
-    ":test_support",
-    ":test_support_unit",
-    "//base/test:test_support",
-    "//chrome:browser_dependencies",
-    "//chrome:child_dependencies",
-    "//chrome:resources",
-    "//chrome:strings",
-    "//chrome/browser/media/router:test_support",
-    "//chrome/common:test_support",
-    "//components/autofill/content/renderer:test_support",
-    "//components/browser_sync:test_support",
-    "//components/component_updater:test_support",
-    "//components/content_settings/core/test:test_support",
-    "//components/data_reduction_proxy/core/browser:test_support",
-    "//components/data_use_measurement/core",
-    "//components/mirroring:mirroring_tests",
-    "//components/nacl/common:buildflags",
-    "//components/ntp_snippets:test_support",
-    "//components/optimization_guide",
-    "//components/os_crypt:test_support",
-    "//components/resources",
-    "//components/safe_browsing:features",
-    "//components/safe_browsing/db",
-    "//components/safe_browsing/db:test_database_manager",
-    "//components/spellcheck:buildflags",
-    "//components/strings",
-    "//components/subresource_filter/core/browser:test_support",
-    "//components/sync:test_support_driver",
-    "//components/sync:test_support_model",
-    "//components/sync_sessions:test_support",
-    "//components/ukm/content",
-    "//components/version_info:generate_version_info",
-    "//components/webdata_services:test_support",
-    "//content/app/resources",
-    "//content/public/app:both",
-    "//content/test:test_support",
-    "//courgette:courgette_lib",
-    "//crypto:platform",
-    "//crypto:test_support",
-    "//device/base:mocks",
-    "//device/bluetooth:mocks",
-    "//device/usb:test_support",
-    "//extensions/buildflags",
-    "//google_apis",
-    "//gpu:test_support",
-    "//media:test_support",
-    "//mojo/public/cpp/bindings",
-    "//net",
-    "//net:test_support",
-    "//ppapi/buildflags",
-    "//services/data_decoder/public/cpp:test_support",
-    "//services/network/public/cpp",
-    "//skia",
-    "//testing/gmock",
-    "//testing/gtest",
-    "//third_party/cacheinvalidation",
-    "//third_party/icu",
-    "//third_party/leveldatabase",
-    "//third_party/libaddressinput",
-    "//third_party/libphonenumber",
-    "//third_party/libxml",
-    "//third_party/metrics_proto",
-    "//third_party/webrtc/modules/desktop_capture",
-    "//third_party/webrtc_overrides",
-    "//ui/base:test_support",
-    "//ui/display:test_support",
-    "//ui/gfx:test_support",
-    "//ui/gl",
-    "//ui/resources",
-    "//v8",
-  ]
+    data = [
+      "data/",
+      "//base/test/data/",
+      "//chrome/third_party/mock4js/",
+      "//components/test/data/",
+      "//extensions/test/data/",
+      "//google_apis/test/data/",
+      "//net/tools/testserver/",
+      "//third_party/accessibility-audit/axs_testing.js",
+      "//third_party/chaijs/chai.js",
+      "//third_party/pyftpdlib/",
+      "//third_party/pywebsocket/",
+      "//third_party/tlslite/",
+      "//third_party/zlib/google/test/data/",
+      "//tools/metrics/histograms/enums.xml",
+      "$root_out_dir/pyproto/google/",
+    ]
+    if (is_android || is_linux || is_win) {
+      data += [
+        "$root_out_dir/chrome_100_percent.pak",
+        "$root_out_dir/locales/en-US.pak",
+        "$root_out_dir/resources.pak",
+      ]
+    }
+    if (is_linux || is_win) {
+      data += [ "$root_out_dir/chrome_200_percent.pak" ]
+    }
+    if (is_win) {
+      data_deps += [ "//chrome" ]
+      data += [ "$root_out_dir/chrome.exe" ]
+    }
 
-  if (is_mac) {
-    data_deps += [ "//chrome:chrome_framework" ]
-  }
+    defines = []
 
-  if (enable_dice_support) {
-    sources += [
-      "../browser/signin/dice_response_handler_unittest.cc",
-      "../browser/signin/dice_tab_helper_unittest.cc",
-      "../browser/signin/process_dice_header_delegate_impl_unittest.cc",
-      "../browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc",
+    deps = [
+      ":test_support",
+      ":test_support_unit",
+      "//base/test:test_support",
+      "//chrome:browser_dependencies",
+      "//chrome:child_dependencies",
+      "//chrome:resources",
+      "//chrome:strings",
+      "//chrome/browser/media/router:test_support",
+      "//chrome/common:test_support",
+      "//components/autofill/content/renderer:test_support",
+      "//components/browser_sync:test_support",
+      "//components/component_updater:test_support",
+      "//components/content_settings/core/test:test_support",
+      "//components/data_reduction_proxy/core/browser:test_support",
+      "//components/data_use_measurement/core",
+      "//components/mirroring:mirroring_tests",
+      "//components/nacl/common:buildflags",
+      "//components/ntp_snippets:test_support",
+      "//components/optimization_guide",
+      "//components/os_crypt:test_support",
+      "//components/resources",
+      "//components/safe_browsing:features",
+      "//components/safe_browsing/db",
+      "//components/safe_browsing/db:test_database_manager",
+      "//components/spellcheck:buildflags",
+      "//components/strings",
+      "//components/subresource_filter/core/browser:test_support",
+      "//components/sync:test_support_driver",
+      "//components/sync:test_support_model",
+      "//components/sync_sessions:test_support",
+      "//components/ukm/content",
+      "//components/version_info:generate_version_info",
+      "//components/webdata_services:test_support",
+      "//content/app/resources",
+      "//content/public/app:both",
+      "//content/test:test_support",
+      "//courgette:courgette_lib",
+      "//crypto:platform",
+      "//crypto:test_support",
+      "//device/base:mocks",
+      "//device/bluetooth:mocks",
+      "//device/usb:test_support",
+      "//extensions/buildflags",
+      "//google_apis",
+      "//gpu:test_support",
+      "//media:test_support",
+      "//mojo/public/cpp/bindings",
+      "//net",
+      "//net:test_support",
+      "//ppapi/buildflags",
+      "//services/data_decoder/public/cpp:test_support",
+      "//services/network/public/cpp",
+      "//skia",
+      "//testing/gmock",
+      "//testing/gtest",
+      "//third_party/cacheinvalidation",
+      "//third_party/icu",
+      "//third_party/leveldatabase",
+      "//third_party/libaddressinput",
+      "//third_party/libphonenumber",
+      "//third_party/libxml",
+      "//third_party/metrics_proto",
+      "//third_party/webrtc/modules/desktop_capture",
+      "//third_party/webrtc_overrides",
+      "//ui/base:test_support",
+      "//ui/display:test_support",
+      "//ui/gfx:test_support",
+      "//ui/gl",
+      "//ui/resources",
+      "//v8",
     ]
-  }
 
-  if (enable_offline_pages) {
-    sources += [
-      "../browser/offline_pages/background_loader_offliner_unittest.cc",
-      "../browser/offline_pages/offline_page_mhtml_archiver_unittest.cc",
-      "../browser/offline_pages/offline_page_request_job_unittest.cc",
-      "../browser/offline_pages/offline_page_tab_helper_unittest.cc",
-      "../browser/offline_pages/offline_page_utils_unittest.cc",
-      "../browser/offline_pages/prefetch/offline_metrics_collector_impl_unittest.cc",
-      "../browser/offline_pages/prefetch/prefetch_background_task_handler_impl_unittest.cc",
-      "../browser/offline_pages/prefetch/prefetch_instance_id_proxy_unittest.cc",
-      "../browser/offline_pages/prefetch/prefetched_pages_notifier_unittest.cc",
-      "../browser/offline_pages/prefetch/thumbnail_fetcher_impl_unittest.cc",
-      "../browser/offline_pages/recent_tab_helper_unittest.cc",
-      "../browser/offline_pages/test_offline_page_model_builder.cc",
-      "../browser/offline_pages/test_offline_page_model_builder.h",
-      "../browser/offline_pages/test_request_coordinator_builder.cc",
-      "../browser/offline_pages/test_request_coordinator_builder.h",
-      "../browser/offline_pages/thumbnail_decoder_impl_unittest.cc",
-    ]
-    deps += [
-      "//components/image_fetcher/core:test_support",
-      "//components/offline_pages/content/background_loader:test_support",
-      "//components/offline_pages/core:test_support",
-      "//components/offline_pages/core/background:test_support",
-      "//components/offline_pages/core/prefetch:test_support",
-    ]
-  }
+    if (is_mac) {
+      data_deps += [ "//chrome:chrome_framework" ]
+    }
 
-  if (is_android) {
-    sources += [
-      "../browser/android/search_permissions/search_permissions_service_unittest.cc",
-      "../browser/autofill/autofill_credit_card_filling_infobar_delegate_mobile_unittest.cc",
-      "../browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc",
-      "../browser/page_load_metrics/observers/android_page_load_metrics_observer_unittest.cc",
-      "../browser/password_manager/account_chooser_dialog_android_unittest.cc",
-      "../browser/password_manager/auto_signin_first_run_dialog_android_unittest.cc",
-      "../browser/password_manager/save_password_infobar_delegate_android_unittest.cc",
-    ]
-    deps += [
-      "//base:base_java",
-      "//chrome/android:app_hooks_java",
-      "//chrome/android:chrome_java",
-      "//chrome/android:class_register_java",
-      "//components/gcm_driver/instance_id/android:instance_id_driver_java",
-      "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
-      "//content/public/android:content_java",
-    ]
-    if (use_v8_context_snapshot) {
-      deps += [ "//tools/v8_context_snapshot:v8_context_snapshot_assets" ]
+    if (enable_dice_support) {
+      sources += [
+        "../browser/signin/dice_response_handler_unittest.cc",
+        "../browser/signin/dice_tab_helper_unittest.cc",
+        "../browser/signin/process_dice_header_delegate_impl_unittest.cc",
+        "../browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc",
+      ]
+    }
+
+    if (enable_offline_pages) {
+      sources += [
+        "../browser/offline_pages/background_loader_offliner_unittest.cc",
+        "../browser/offline_pages/offline_page_mhtml_archiver_unittest.cc",
+        "../browser/offline_pages/offline_page_request_job_unittest.cc",
+        "../browser/offline_pages/offline_page_tab_helper_unittest.cc",
+        "../browser/offline_pages/offline_page_utils_unittest.cc",
+        "../browser/offline_pages/prefetch/offline_metrics_collector_impl_unittest.cc",
+        "../browser/offline_pages/prefetch/prefetch_background_task_handler_impl_unittest.cc",
+        "../browser/offline_pages/prefetch/prefetch_instance_id_proxy_unittest.cc",
+        "../browser/offline_pages/prefetch/prefetched_pages_notifier_unittest.cc",
+        "../browser/offline_pages/prefetch/thumbnail_fetcher_impl_unittest.cc",
+        "../browser/offline_pages/recent_tab_helper_unittest.cc",
+        "../browser/offline_pages/test_offline_page_model_builder.cc",
+        "../browser/offline_pages/test_offline_page_model_builder.h",
+        "../browser/offline_pages/test_request_coordinator_builder.cc",
+        "../browser/offline_pages/test_request_coordinator_builder.h",
+        "../browser/offline_pages/thumbnail_decoder_impl_unittest.cc",
+      ]
+      deps += [
+        "//components/image_fetcher/core:test_support",
+        "//components/offline_pages/content/background_loader:test_support",
+        "//components/offline_pages/core:test_support",
+        "//components/offline_pages/core/background:test_support",
+        "//components/offline_pages/core/prefetch:test_support",
+      ]
+    }
+
+    if (is_android) {
+      sources += [
+        "../browser/android/search_permissions/search_permissions_service_unittest.cc",
+        "../browser/autofill/autofill_credit_card_filling_infobar_delegate_mobile_unittest.cc",
+        "../browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc",
+        "../browser/page_load_metrics/observers/android_page_load_metrics_observer_unittest.cc",
+        "../browser/password_manager/account_chooser_dialog_android_unittest.cc",
+        "../browser/password_manager/auto_signin_first_run_dialog_android_unittest.cc",
+        "../browser/password_manager/save_password_infobar_delegate_android_unittest.cc",
+      ]
+      deps += [
+        "//base:base_java",
+        "//chrome/android:app_hooks_java",
+        "//chrome/android:chrome_java",
+        "//chrome/android:class_register_java",
+        "//components/gcm_driver/instance_id/android:instance_id_driver_java",
+        "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
+        "//content/public/android:content_java",
+      ]
+      if (use_v8_context_snapshot) {
+        deps += [ "//tools/v8_context_snapshot:v8_context_snapshot_assets" ]
+      } else {
+        deps += [ "//v8:v8_external_startup_data_assets" ]
+      }
+
+      enable_multidex = true
     } else {
-      deps += [ "//v8:v8_external_startup_data_assets" ]
+      # !is_android
+      sources += [
+        # Bookmark export/import are handled via the BookmarkColumns
+        # ContentProvider.
+        "../browser/bookmarks/bookmark_html_writer_unittest.cc",
+        "../browser/browser_commands_unittest.cc",
+        "../browser/diagnostics/diagnostics_controller_unittest.cc",
+        "../browser/diagnostics/diagnostics_model_unittest.cc",
+        "../browser/download/download_commands_unittest.cc",
+        "../browser/download/download_shelf_unittest.cc",
+        "../browser/first_run/first_run_unittest.cc",
+        "../browser/font_family_cache_unittest.cc",
+
+        # GCMDriverAndroid is not yet implemented.
+        "../browser/gcm/gcm_profile_service_unittest.cc",
+        "../browser/importer/firefox_profile_lock_unittest.cc",
+        "../browser/importer/profile_writer_unittest.cc",
+
+        # In-browser discovery is not used by Android for now.
+        "../browser/media/router/discovery/discovery_network_list_unittest.cc",
+        "../browser/media/router/discovery/discovery_network_monitor_metric_observer_unittest.cc",
+        "../browser/media/router/discovery/discovery_network_monitor_unittest.cc",
+        "../browser/media/webrtc/tab_desktop_media_list_unittest.cc",
+        "../browser/media/webrtc/webrtc_event_log_manager_unittest.cc",
+        "../browser/media/webrtc/webrtc_event_log_uploader_impl_unittest.cc",
+        "../browser/media_galleries/fileapi/native_media_file_util_unittest.cc",
+        "../browser/media_galleries/gallery_watch_manager_unittest.cc",
+        "../browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm",
+        "../browser/media_galleries/media_file_system_registry_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_preferences_unittest.cc",
+        "../browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc",
+        "../browser/media_galleries/win/mtp_device_object_enumerator_unittest.cc",
+        "../browser/memory/swap_thrashing_monitor_delegate_win_unittest.cc",
+        "../browser/metrics/tab_stats_data_store_unittest.cc",
+        "../browser/metrics/tab_stats_tracker_unittest.cc",
+        "../browser/page_load_metrics/observers/session_restore_page_load_metrics_observer_unittest.cc",
+        "../browser/resource_coordinator/background_tab_navigation_throttle_unittest.cc",
+        "../browser/resource_coordinator/discard_metrics_lifecycle_unit_observer_unittest.cc",
+        "../browser/resource_coordinator/lifecycle_unit_base_unittest.cc",
+        "../browser/resource_coordinator/lifecycle_unit_unittest.cc",
+        "../browser/resource_coordinator/local_site_characteristics_data_impl_unittest.cc",
+        "../browser/resource_coordinator/tab_activity_watcher_unittest.cc",
+        "../browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc",
+        "../browser/resource_coordinator/tab_lifecycle_unit_unittest.cc",
+        "../browser/resource_coordinator/tab_load_tracker_unittest.cc",
+        "../browser/resource_coordinator/tab_manager_delegate_chromeos_unittest.cc",
+        "../browser/resource_coordinator/tab_manager_features_unittest.cc",
+        "../browser/resource_coordinator/tab_manager_stats_collector_unittest.cc",
+        "../browser/resource_coordinator/tab_manager_unittest.cc",
+        "../browser/resource_coordinator/tab_manager_web_contents_data_unittest.cc",
+        "../browser/resource_coordinator/tab_metrics_logger_unittest.cc",
+
+        # Android does not use the Message Center notification system.
+        "../browser/notifications/message_center_notifications_unittest.cc",
+        "../browser/platform_util_unittest.cc",
+        "../browser/policy/policy_path_parser_unittest.cc",
+        "../browser/process_singleton_posix_unittest.cc",
+        "../browser/profile_resetter/profile_resetter_unittest.cc",
+        "../browser/profile_resetter/triggered_profile_resetter_win_unittest.cc",
+        "../browser/renderer_context_menu/render_view_context_menu_unittest.cc",
+        "../browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win_unittest.cc",
+        "../browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win_unittest.cc",
+        "../browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc",
+        "../browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc",
+        "../browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.h",
+        "../browser/safe_browsing/chrome_cleaner/srt_field_trial_win_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/one_google_bar/one_google_bar_fetcher_impl_unittest.cc",
+        "../browser/search/one_google_bar/one_google_bar_service_unittest.cc",
+        "../browser/search/search_engine_base_url_tracker_unittest.cc",
+        "../browser/search/search_unittest.cc",
+        "../browser/sessions/persistent_tab_restore_service_unittest.cc",
+        "../browser/signin/mutable_profile_oauth2_token_service_delegate_unittest.cc",
+        "../browser/signin/signin_promo_unittest.cc",
+        "../browser/speech/extension_api/extension_manifests_tts_unittest.cc",
+        "../browser/speech/tts_controller_unittest.cc",
+        "../browser/sync/sessions/browser_list_router_helper_unittest.cc",
+        "../browser/sync/sessions/sync_sessions_router_tab_helper_unittest.cc",
+        "../browser/sync/sync_ui_util_unittest.cc",  # Sync setup uses native ui.
+        "../browser/task_manager/providers/browser_process_task_unittest.cc",
+        "../browser/task_manager/providers/child_process_task_unittest.cc",
+        "../browser/task_manager/providers/fallback_task_provider_unittest.cc",
+        "../browser/task_manager/sampling/shared_sampler_win_unittest.cc",
+        "../browser/task_manager/sampling/task_group_unittest.cc",
+        "../browser/task_manager/sampling/task_manager_impl_unittest.cc",
+        "../browser/task_manager/sampling/task_manager_io_thread_helper_unittest.cc",
+        "../browser/task_manager/task_manager_observer_unittest.cc",
+        "../browser/task_manager/test_task_manager.cc",
+        "../browser/task_manager/test_task_manager.h",
+        "../browser/themes/browser_theme_pack_unittest.cc",
+        "../browser/themes/theme_properties_unittest.cc",
+        "../browser/themes/theme_service_unittest.cc",
+        "../browser/themes/theme_syncable_service_unittest.cc",
+        "../browser/translate/translate_manager_render_view_host_unittest.cc",
+        "../browser/ui/webui/theme_source_unittest.cc",
+
+        # The autofill popup is implemented in mostly native code on Android.
+        "../browser/ui/autofill/autofill_popup_controller_unittest.cc",
+        "../browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc",
+        "../browser/ui/bookmarks/bookmark_unittest.cc",
+        "../browser/ui/browser_close_unittest.cc",
+        "../browser/ui/browser_command_controller_unittest.cc",
+        "../browser/ui/browser_instant_controller_unittest.cc",
+        "../browser/ui/browser_unittest.cc",
+        "../browser/ui/browser_window_state_unittest.cc",
+        "../browser/ui/chrome_bubble_manager_unittest.cc",
+        "../browser/ui/content_settings/content_setting_bubble_model_unittest.cc",
+        "../browser/ui/content_settings/content_setting_image_model_unittest.cc",
+        "../browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc",
+        "../browser/ui/extensions/extension_action_view_controller_unittest.cc",
+        "../browser/ui/extensions/extension_message_bubble_bridge_unittest.cc",
+        "../browser/ui/extensions/hosted_app_browser_controller_unittest.cc",
+        "../browser/ui/global_error/global_error_service_unittest.cc",
+        "../browser/ui/omnibox/chrome_omnibox_navigation_observer_unittest.cc",
+        "../browser/ui/omnibox/clipboard_utils_unittest.cc",
+        "../browser/ui/omnibox/favicon_cache_unittest.cc",
+        "../browser/ui/omnibox/omnibox_controller_unittest.cc",
+        "../browser/ui/page_info/permission_menu_model_unittest.cc",
+        "../browser/ui/passwords/manage_passwords_bubble_model_unittest.cc",
+        "../browser/ui/passwords/password_dialog_controller_impl_unittest.cc",
+        "../browser/ui/search/ntp_user_data_logger_unittest.cc",
+        "../browser/ui/search/search_ipc_router_policy_unittest.cc",
+        "../browser/ui/search/search_ipc_router_unittest.cc",
+        "../browser/ui/search/search_tab_helper_unittest.cc",
+        "../browser/ui/tab_contents/tab_contents_iterator_unittest.cc",
+        "../browser/ui/tabs/pinned_tab_codec_unittest.cc",
+        "../browser/ui/tabs/pinned_tab_service_unittest.cc",
+        "../browser/ui/tabs/tab_menu_model_unittest.cc",
+        "../browser/ui/tabs/tab_strip_model_stats_recorder_unittest.cc",
+        "../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/tabs/window_activity_watcher_unittest.cc",
+        "../browser/ui/toolbar/app_menu_model_unittest.cc",
+        "../browser/ui/toolbar/back_forward_menu_model_unittest.cc",
+        "../browser/ui/toolbar/component_toolbar_actions_factory_unittest.cc",
+        "../browser/ui/toolbar/mock_component_toolbar_actions_factory.cc",
+        "../browser/ui/toolbar/mock_component_toolbar_actions_factory.h",
+        "../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",
+        "../browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc",
+        "../browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h",
+        "../browser/ui/toolbar/toolbar_actions_bar_unittest.cc",
+        "../browser/ui/toolbar/toolbar_actions_bar_unittest.h",
+        "../browser/ui/toolbar/toolbar_actions_model_unittest.cc",
+        "../browser/ui/toolbar/toolbar_model_unittest.cc",
+        "../browser/ui/webui/browsing_history_handler_unittest.cc",
+        "../browser/ui/webui/help/version_updater_chromeos_unittest.cc",
+        "../browser/ui/webui/md_downloads/downloads_list_tracker_unittest.cc",
+        "../browser/ui/webui/md_downloads/md_downloads_dom_handler_unittest.cc",
+        "../browser/ui/webui/settings/downloads_handler_unittest.cc",
+        "../browser/ui/webui/settings/metrics_reporting_handler_unittest.cc",
+        "../browser/ui/webui/settings/on_startup_handler_unittest.cc",
+        "../browser/ui/webui/settings/people_handler_unittest.cc",
+        "../browser/ui/webui/settings/profile_info_handler_unittest.cc",
+        "../browser/ui/webui/settings/reset_settings_handler_unittest.cc",
+        "../browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc",
+        "../browser/ui/webui/settings/site_settings_handler_unittest.cc",
+        "../browser/ui/webui/settings_utils_unittest.cc",
+        "../browser/ui/webui/signin/login_ui_service_unittest.cc",
+        "../browser/ui/webui/site_settings_helper_unittest.cc",
+        "../browser/ui/webui/sync_internals_message_handler_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_common_unittest.h",
+        "../browser/ui/window_sizer/window_sizer_unittest.cc",
+        "../browser/ui/zoom/zoom_controller_unittest.cc",
+        "../browser/usb/usb_blocklist_unittest.cc",
+        "../browser/usb/usb_chooser_context_unittest.cc",
+        "../browser/usb/usb_chooser_controller_unittest.cc",
+        "../browser/usb/web_usb_detector_unittest.cc",
+
+        # The importer code is not used on Android.
+        "../common/importer/firefox_importer_utils_unittest.cc",
+
+        # No service process (which also requires multiprocess lock).
+        "../common/importer/mock_importer_bridge.cc",
+        "../common/importer/mock_importer_bridge.h",
+        "../common/multi_process_lock_unittest.cc",
+        "../renderer/searchbox/search_bouncer_unittest.cc",
+        "../renderer/searchbox/searchbox_unittest.cc",
+        "../test/base/browser_with_test_window_test.cc",
+        "../test/base/browser_with_test_window_test.h",
+        "../utility/importer/bookmark_html_reader_unittest.cc",
+        "../utility/importer/bookmarks_file_importer_unittest.cc",
+        "../utility/importer/edge_database_reader_unittest_win.cc",
+        "../utility/importer/firefox_importer_unittest.cc",
+        "../utility/importer/firefox_importer_unittest_utils.h",
+        "../utility/importer/firefox_importer_unittest_utils_mac.cc",
+        "../utility/importer/safari_importer_unittest.mm",
+      ]
+      deps += [
+        "//chrome/browser/resource_coordinator:tab_metrics_event_proto",
+        "//components/favicon/core/test:test_support",
+        "//components/signin/core/browser:signin_buildflags",
+        "//services/metrics/public/cpp:ukm_builders",
+        "//third_party/libaddressinput",
+      ]
+      if (is_mac) {
+        deps += [ ":firefox_importer_interface" ]
+      }
     }
 
-    enable_multidex = true
-  } else {
-    # !is_android
-    sources += [
-      # Bookmark export/import are handled via the BookmarkColumns
-      # ContentProvider.
-      "../browser/bookmarks/bookmark_html_writer_unittest.cc",
-      "../browser/browser_commands_unittest.cc",
-      "../browser/diagnostics/diagnostics_controller_unittest.cc",
-      "../browser/diagnostics/diagnostics_model_unittest.cc",
-      "../browser/download/download_commands_unittest.cc",
-      "../browser/download/download_shelf_unittest.cc",
-      "../browser/first_run/first_run_unittest.cc",
-      "../browser/font_family_cache_unittest.cc",
-
-      # GCMDriverAndroid is not yet implemented.
-      "../browser/gcm/gcm_profile_service_unittest.cc",
-      "../browser/importer/firefox_profile_lock_unittest.cc",
-      "../browser/importer/profile_writer_unittest.cc",
-
-      # In-browser discovery is not used by Android for now.
-      "../browser/media/router/discovery/discovery_network_list_unittest.cc",
-      "../browser/media/router/discovery/discovery_network_monitor_metric_observer_unittest.cc",
-      "../browser/media/router/discovery/discovery_network_monitor_unittest.cc",
-      "../browser/media/webrtc/tab_desktop_media_list_unittest.cc",
-      "../browser/media/webrtc/webrtc_event_log_manager_unittest.cc",
-      "../browser/media/webrtc/webrtc_event_log_uploader_impl_unittest.cc",
-      "../browser/media_galleries/fileapi/native_media_file_util_unittest.cc",
-      "../browser/media_galleries/gallery_watch_manager_unittest.cc",
-      "../browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm",
-      "../browser/media_galleries/media_file_system_registry_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_preferences_unittest.cc",
-      "../browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc",
-      "../browser/media_galleries/win/mtp_device_object_enumerator_unittest.cc",
-      "../browser/memory/swap_thrashing_monitor_delegate_win_unittest.cc",
-      "../browser/metrics/tab_stats_data_store_unittest.cc",
-      "../browser/metrics/tab_stats_tracker_unittest.cc",
-      "../browser/page_load_metrics/observers/session_restore_page_load_metrics_observer_unittest.cc",
-      "../browser/resource_coordinator/background_tab_navigation_throttle_unittest.cc",
-      "../browser/resource_coordinator/discard_metrics_lifecycle_unit_observer_unittest.cc",
-      "../browser/resource_coordinator/lifecycle_unit_base_unittest.cc",
-      "../browser/resource_coordinator/lifecycle_unit_unittest.cc",
-      "../browser/resource_coordinator/local_site_characteristics_data_impl_unittest.cc",
-      "../browser/resource_coordinator/tab_activity_watcher_unittest.cc",
-      "../browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc",
-      "../browser/resource_coordinator/tab_lifecycle_unit_unittest.cc",
-      "../browser/resource_coordinator/tab_load_tracker_unittest.cc",
-      "../browser/resource_coordinator/tab_manager_delegate_chromeos_unittest.cc",
-      "../browser/resource_coordinator/tab_manager_features_unittest.cc",
-      "../browser/resource_coordinator/tab_manager_stats_collector_unittest.cc",
-      "../browser/resource_coordinator/tab_manager_unittest.cc",
-      "../browser/resource_coordinator/tab_manager_web_contents_data_unittest.cc",
-      "../browser/resource_coordinator/tab_metrics_logger_unittest.cc",
-
-      # Android does not use the Message Center notification system.
-      "../browser/notifications/message_center_notifications_unittest.cc",
-      "../browser/platform_util_unittest.cc",
-      "../browser/policy/policy_path_parser_unittest.cc",
-      "../browser/process_singleton_posix_unittest.cc",
-      "../browser/profile_resetter/profile_resetter_unittest.cc",
-      "../browser/profile_resetter/triggered_profile_resetter_win_unittest.cc",
-      "../browser/renderer_context_menu/render_view_context_menu_unittest.cc",
-      "../browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win_unittest.cc",
-      "../browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win_unittest.cc",
-      "../browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc",
-      "../browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc",
-      "../browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.h",
-      "../browser/safe_browsing/chrome_cleaner/srt_field_trial_win_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/one_google_bar/one_google_bar_fetcher_impl_unittest.cc",
-      "../browser/search/one_google_bar/one_google_bar_service_unittest.cc",
-      "../browser/search/search_engine_base_url_tracker_unittest.cc",
-      "../browser/search/search_unittest.cc",
-      "../browser/sessions/persistent_tab_restore_service_unittest.cc",
-      "../browser/signin/mutable_profile_oauth2_token_service_delegate_unittest.cc",
-      "../browser/signin/signin_promo_unittest.cc",
-      "../browser/speech/extension_api/extension_manifests_tts_unittest.cc",
-      "../browser/speech/tts_controller_unittest.cc",
-      "../browser/sync/sessions/browser_list_router_helper_unittest.cc",
-      "../browser/sync/sessions/sync_sessions_router_tab_helper_unittest.cc",
-      "../browser/sync/sync_ui_util_unittest.cc",  # Sync setup uses native ui.
-      "../browser/task_manager/providers/browser_process_task_unittest.cc",
-      "../browser/task_manager/providers/child_process_task_unittest.cc",
-      "../browser/task_manager/providers/fallback_task_provider_unittest.cc",
-      "../browser/task_manager/sampling/shared_sampler_win_unittest.cc",
-      "../browser/task_manager/sampling/task_group_unittest.cc",
-      "../browser/task_manager/sampling/task_manager_impl_unittest.cc",
-      "../browser/task_manager/sampling/task_manager_io_thread_helper_unittest.cc",
-      "../browser/task_manager/task_manager_observer_unittest.cc",
-      "../browser/task_manager/test_task_manager.cc",
-      "../browser/task_manager/test_task_manager.h",
-      "../browser/themes/browser_theme_pack_unittest.cc",
-      "../browser/themes/theme_properties_unittest.cc",
-      "../browser/themes/theme_service_unittest.cc",
-      "../browser/themes/theme_syncable_service_unittest.cc",
-      "../browser/translate/translate_manager_render_view_host_unittest.cc",
-      "../browser/ui/webui/theme_source_unittest.cc",
-
-      # The autofill popup is implemented in mostly native code on Android.
-      "../browser/ui/autofill/autofill_popup_controller_unittest.cc",
-      "../browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc",
-      "../browser/ui/bookmarks/bookmark_unittest.cc",
-      "../browser/ui/browser_close_unittest.cc",
-      "../browser/ui/browser_command_controller_unittest.cc",
-      "../browser/ui/browser_instant_controller_unittest.cc",
-      "../browser/ui/browser_unittest.cc",
-      "../browser/ui/browser_window_state_unittest.cc",
-      "../browser/ui/chrome_bubble_manager_unittest.cc",
-      "../browser/ui/content_settings/content_setting_bubble_model_unittest.cc",
-      "../browser/ui/content_settings/content_setting_image_model_unittest.cc",
-      "../browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc",
-      "../browser/ui/extensions/extension_action_view_controller_unittest.cc",
-      "../browser/ui/extensions/extension_message_bubble_bridge_unittest.cc",
-      "../browser/ui/extensions/hosted_app_browser_controller_unittest.cc",
-      "../browser/ui/global_error/global_error_service_unittest.cc",
-      "../browser/ui/omnibox/chrome_omnibox_navigation_observer_unittest.cc",
-      "../browser/ui/omnibox/clipboard_utils_unittest.cc",
-      "../browser/ui/omnibox/favicon_cache_unittest.cc",
-      "../browser/ui/omnibox/omnibox_controller_unittest.cc",
-      "../browser/ui/page_info/permission_menu_model_unittest.cc",
-      "../browser/ui/passwords/manage_passwords_bubble_model_unittest.cc",
-      "../browser/ui/passwords/password_dialog_controller_impl_unittest.cc",
-      "../browser/ui/search/ntp_user_data_logger_unittest.cc",
-      "../browser/ui/search/search_ipc_router_policy_unittest.cc",
-      "../browser/ui/search/search_ipc_router_unittest.cc",
-      "../browser/ui/search/search_tab_helper_unittest.cc",
-      "../browser/ui/tab_contents/tab_contents_iterator_unittest.cc",
-      "../browser/ui/tabs/pinned_tab_codec_unittest.cc",
-      "../browser/ui/tabs/pinned_tab_service_unittest.cc",
-      "../browser/ui/tabs/tab_menu_model_unittest.cc",
-      "../browser/ui/tabs/tab_strip_model_stats_recorder_unittest.cc",
-      "../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/tabs/window_activity_watcher_unittest.cc",
-      "../browser/ui/toolbar/app_menu_model_unittest.cc",
-      "../browser/ui/toolbar/back_forward_menu_model_unittest.cc",
-      "../browser/ui/toolbar/component_toolbar_actions_factory_unittest.cc",
-      "../browser/ui/toolbar/mock_component_toolbar_actions_factory.cc",
-      "../browser/ui/toolbar/mock_component_toolbar_actions_factory.h",
-      "../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",
-      "../browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc",
-      "../browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h",
-      "../browser/ui/toolbar/toolbar_actions_bar_unittest.cc",
-      "../browser/ui/toolbar/toolbar_actions_bar_unittest.h",
-      "../browser/ui/toolbar/toolbar_actions_model_unittest.cc",
-      "../browser/ui/toolbar/toolbar_model_unittest.cc",
-      "../browser/ui/webui/browsing_history_handler_unittest.cc",
-      "../browser/ui/webui/help/version_updater_chromeos_unittest.cc",
-      "../browser/ui/webui/md_downloads/downloads_list_tracker_unittest.cc",
-      "../browser/ui/webui/md_downloads/md_downloads_dom_handler_unittest.cc",
-      "../browser/ui/webui/settings/downloads_handler_unittest.cc",
-      "../browser/ui/webui/settings/metrics_reporting_handler_unittest.cc",
-      "../browser/ui/webui/settings/on_startup_handler_unittest.cc",
-      "../browser/ui/webui/settings/people_handler_unittest.cc",
-      "../browser/ui/webui/settings/profile_info_handler_unittest.cc",
-      "../browser/ui/webui/settings/reset_settings_handler_unittest.cc",
-      "../browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc",
-      "../browser/ui/webui/settings/site_settings_handler_unittest.cc",
-      "../browser/ui/webui/settings_utils_unittest.cc",
-      "../browser/ui/webui/signin/login_ui_service_unittest.cc",
-      "../browser/ui/webui/site_settings_helper_unittest.cc",
-      "../browser/ui/webui/sync_internals_message_handler_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_common_unittest.h",
-      "../browser/ui/window_sizer/window_sizer_unittest.cc",
-      "../browser/ui/zoom/zoom_controller_unittest.cc",
-      "../browser/usb/usb_blocklist_unittest.cc",
-      "../browser/usb/usb_chooser_context_unittest.cc",
-      "../browser/usb/usb_chooser_controller_unittest.cc",
-      "../browser/usb/web_usb_detector_unittest.cc",
-
-      # The importer code is not used on Android.
-      "../common/importer/firefox_importer_utils_unittest.cc",
-
-      # No service process (which also requires multiprocess lock).
-      "../common/importer/mock_importer_bridge.cc",
-      "../common/importer/mock_importer_bridge.h",
-      "../common/multi_process_lock_unittest.cc",
-      "../renderer/searchbox/search_bouncer_unittest.cc",
-      "../renderer/searchbox/searchbox_unittest.cc",
-      "../test/base/browser_with_test_window_test.cc",
-      "../test/base/browser_with_test_window_test.h",
-      "../utility/importer/bookmark_html_reader_unittest.cc",
-      "../utility/importer/bookmarks_file_importer_unittest.cc",
-      "../utility/importer/edge_database_reader_unittest_win.cc",
-      "../utility/importer/firefox_importer_unittest.cc",
-      "../utility/importer/firefox_importer_unittest_utils.h",
-      "../utility/importer/firefox_importer_unittest_utils_mac.cc",
-      "../utility/importer/safari_importer_unittest.mm",
-    ]
-    deps += [
-      "//chrome/browser/resource_coordinator:tab_metrics_event_proto",
-      "//components/favicon/core/test:test_support",
-      "//components/signin/core/browser:signin_buildflags",
-      "//services/metrics/public/cpp:ukm_builders",
-      "//third_party/libaddressinput",
-    ]
-    if (is_mac) {
-      deps += [ ":firefox_importer_interface" ]
+    if (!is_android) {
+      sources += [
+        "../browser/devtools/devtools_file_system_indexer_unittest.cc",
+        "../browser/devtools/devtools_file_watcher_unittest.cc",
+        "../browser/devtools/devtools_ui_bindings_unittest.cc",
+        "../browser/devtools/serialize_host_descriptions_unittest.cc",
+        "../browser/download/download_dir_policy_handler_unittest.cc",
+        "../browser/media/router/discovery/dial/device_description_fetcher_unittest.cc",
+        "../browser/media/router/discovery/dial/device_description_service_unittest.cc",
+        "../browser/media/router/discovery/dial/dial_app_discovery_service_unittest.cc",
+        "../browser/media/router/discovery/dial/dial_device_data_unittest.cc",
+        "../browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc",
+        "../browser/media/router/discovery/dial/dial_media_sink_service_unittest.cc",
+        "../browser/media/router/discovery/dial/dial_registry_unittest.cc",
+        "../browser/media/router/discovery/dial/dial_service_unittest.cc",
+        "../browser/media/router/discovery/dial/dial_url_fetcher_unittest.cc",
+        "../browser/media/router/discovery/dial/safe_dial_app_info_parser_unittest.cc",
+        "../browser/media/router/discovery/dial/safe_dial_device_description_parser_unittest.cc",
+        "../browser/media/router/discovery/mdns/cast_media_sink_service_impl_unittest.cc",
+        "../browser/media/router/discovery/mdns/cast_media_sink_service_unittest.cc",
+        "../browser/media/router/discovery/mdns/dns_sd_registry_unittest.cc",
+        "../browser/media/router/discovery/media_sink_discovery_metrics_unittest.cc",
+        "../browser/media/router/event_page_request_manager_unittest.cc",
+        "../browser/media/router/media_router_feature_unittest.cc",
+        "../browser/media/router/mojo/media_route_controller_unittest.cc",
+        "../browser/media/router/mojo/media_router_desktop_unittest.cc",
+        "../browser/media/router/mojo/media_router_mojo_impl_unittest.cc",
+        "../browser/media/router/mojo/media_router_mojo_metrics_unittest.cc",
+        "../browser/media/router/mojo/media_sink_service_status_unittest.cc",
+        "../browser/media/router/providers/cast/cast_app_availability_tracker_unittest.cc",
+        "../browser/media/router/providers/cast/cast_app_discovery_service_unittest.cc",
+        "../browser/media/router/providers/cast/cast_media_route_provider_metrics_unittest.cc",
+        "../browser/media/router/providers/cast/dual_media_sink_service_unittest.cc",
+        "../browser/media/router/providers/dial/dial_media_route_provider_unittest.cc",
+        "../browser/media/router/providers/extension/extension_media_route_provider_proxy_unittest.cc",
+        "../browser/media/router/providers/wired_display/wired_display_media_route_provider_unittest.cc",
+        "../browser/policy/local_sync_policy_handler_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/ui/autofill/save_card_bubble_controller_impl_unittest.cc",
+        "../browser/ui/bluetooth/bluetooth_chooser_controller_unittest.cc",
+        "../browser/ui/media_router/cast_modes_with_media_sources_unittest.cc",
+        "../browser/ui/media_router/media_cast_mode_unittest.cc",
+        "../browser/ui/media_router/media_router_file_dialog_unittest.cc",
+        "../browser/ui/media_router/query_result_manager_unittest.cc",
+        "../browser/ui/passwords/manage_passwords_ui_controller_unittest.cc",
+        "../browser/ui/toolbar/media_router_action_controller_unittest.cc",
+        "../browser/ui/toolbar/media_router_action_unittest.cc",
+        "../browser/ui/toolbar/media_router_contextual_menu_unittest.cc",
+        "../browser/ui/toolbar/mock_media_router_action_controller.cc",
+        "../browser/ui/toolbar/mock_media_router_action_controller.h",
+        "../browser/ui/webui/media_router/media_router_dialog_controller_webui_impl_unittest.cc",
+        "../browser/ui/webui/media_router/media_router_ui_service_factory_unittest.cc",
+        "../browser/ui/webui/media_router/media_router_ui_unittest.cc",
+        "../browser/ui/webui/media_router/media_router_web_ui_test.cc",
+        "../browser/ui/webui/media_router/media_router_web_ui_test.h",
+        "../browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc",
+        "../common/media_router/discovery/media_sink_internal_unittest.cc",
+        "../common/media_router/discovery/media_sink_service_base_unittest.cc",
+        "../common/media_router/mojo/media_router_struct_traits_unittest.cc",
+        "../common/media_router/providers/cast/cast_media_source_unittest.cc",
+      ]
+      deps += [
+        "//components/bubble:test_support",
+        "//services/network:test_support",
+      ]
+
+      if (include_js_tests) {
+        deps += [ "//chrome/test/data/webui:unit_tests_js" ]
+        data += [
+          "$root_out_dir/test_data/chrome/browser/resources/print_preview/",
+          "$root_out_dir/test_data/chrome/renderer/resources/extensions/",
+          "$root_out_dir/test_data/ui/webui/",
+        ]
+      }
     }
-  }
 
-  if (!is_android) {
-    sources += [
-      "../browser/devtools/devtools_file_system_indexer_unittest.cc",
-      "../browser/devtools/devtools_file_watcher_unittest.cc",
-      "../browser/devtools/devtools_ui_bindings_unittest.cc",
-      "../browser/devtools/serialize_host_descriptions_unittest.cc",
-      "../browser/download/download_dir_policy_handler_unittest.cc",
-      "../browser/media/router/discovery/dial/device_description_fetcher_unittest.cc",
-      "../browser/media/router/discovery/dial/device_description_service_unittest.cc",
-      "../browser/media/router/discovery/dial/dial_app_discovery_service_unittest.cc",
-      "../browser/media/router/discovery/dial/dial_device_data_unittest.cc",
-      "../browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc",
-      "../browser/media/router/discovery/dial/dial_media_sink_service_unittest.cc",
-      "../browser/media/router/discovery/dial/dial_registry_unittest.cc",
-      "../browser/media/router/discovery/dial/dial_service_unittest.cc",
-      "../browser/media/router/discovery/dial/dial_url_fetcher_unittest.cc",
-      "../browser/media/router/discovery/dial/safe_dial_app_info_parser_unittest.cc",
-      "../browser/media/router/discovery/dial/safe_dial_device_description_parser_unittest.cc",
-      "../browser/media/router/discovery/mdns/cast_media_sink_service_impl_unittest.cc",
-      "../browser/media/router/discovery/mdns/cast_media_sink_service_unittest.cc",
-      "../browser/media/router/discovery/mdns/dns_sd_registry_unittest.cc",
-      "../browser/media/router/discovery/media_sink_discovery_metrics_unittest.cc",
-      "../browser/media/router/event_page_request_manager_unittest.cc",
-      "../browser/media/router/media_router_feature_unittest.cc",
-      "../browser/media/router/mojo/media_route_controller_unittest.cc",
-      "../browser/media/router/mojo/media_router_desktop_unittest.cc",
-      "../browser/media/router/mojo/media_router_mojo_impl_unittest.cc",
-      "../browser/media/router/mojo/media_router_mojo_metrics_unittest.cc",
-      "../browser/media/router/mojo/media_sink_service_status_unittest.cc",
-      "../browser/media/router/providers/cast/cast_app_availability_tracker_unittest.cc",
-      "../browser/media/router/providers/cast/cast_app_discovery_service_unittest.cc",
-      "../browser/media/router/providers/cast/cast_media_route_provider_metrics_unittest.cc",
-      "../browser/media/router/providers/cast/dual_media_sink_service_unittest.cc",
-      "../browser/media/router/providers/dial/dial_media_route_provider_unittest.cc",
-      "../browser/media/router/providers/extension/extension_media_route_provider_proxy_unittest.cc",
-      "../browser/media/router/providers/wired_display/wired_display_media_route_provider_unittest.cc",
-      "../browser/policy/local_sync_policy_handler_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/ui/autofill/save_card_bubble_controller_impl_unittest.cc",
-      "../browser/ui/bluetooth/bluetooth_chooser_controller_unittest.cc",
-      "../browser/ui/media_router/cast_modes_with_media_sources_unittest.cc",
-      "../browser/ui/media_router/media_cast_mode_unittest.cc",
-      "../browser/ui/media_router/media_router_file_dialog_unittest.cc",
-      "../browser/ui/media_router/query_result_manager_unittest.cc",
-      "../browser/ui/passwords/manage_passwords_ui_controller_unittest.cc",
-      "../browser/ui/toolbar/media_router_action_controller_unittest.cc",
-      "../browser/ui/toolbar/media_router_action_unittest.cc",
-      "../browser/ui/toolbar/media_router_contextual_menu_unittest.cc",
-      "../browser/ui/toolbar/mock_media_router_action_controller.cc",
-      "../browser/ui/toolbar/mock_media_router_action_controller.h",
-      "../browser/ui/webui/media_router/media_router_dialog_controller_webui_impl_unittest.cc",
-      "../browser/ui/webui/media_router/media_router_ui_service_factory_unittest.cc",
-      "../browser/ui/webui/media_router/media_router_ui_unittest.cc",
-      "../browser/ui/webui/media_router/media_router_web_ui_test.cc",
-      "../browser/ui/webui/media_router/media_router_web_ui_test.h",
-      "../browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc",
-      "../common/media_router/discovery/media_sink_internal_unittest.cc",
-      "../common/media_router/discovery/media_sink_service_base_unittest.cc",
-      "../common/media_router/mojo/media_router_struct_traits_unittest.cc",
-      "../common/media_router/providers/cast/cast_media_source_unittest.cc",
-    ]
-    deps += [
-      "//components/bubble:test_support",
-      "//services/network:test_support",
-    ]
+    if (enable_native_notifications) {
+      if (is_desktop_linux) {
+        sources += [ "../browser/notifications/notification_platform_bridge_linux_unittest.cc" ]
+      }
 
-    if (include_js_tests) {
-      deps += [ "//chrome/test/data/webui:unit_tests_js" ]
-      data += [
-        "$root_out_dir/test_data/chrome/browser/resources/print_preview/",
-        "$root_out_dir/test_data/chrome/renderer/resources/extensions/",
-        "$root_out_dir/test_data/ui/webui/",
+      if (is_win) {
+        sources += [
+          "../browser/notifications/notification_launch_id_unittest.cc",
+          "../browser/notifications/notification_platform_bridge_win_unittest.cc",
+        ]
+      }
+    }
+
+    if (enable_desktop_in_product_help) {
+      sources += [
+        "../browser/feature_engagement/bookmark/bookmark_tracker_unittest.cc",
+        "../browser/feature_engagement/feature_tracker_unittest.cc",
+        "../browser/feature_engagement/incognito_window/incognito_window_tracker_unittest.cc",
+        "../browser/feature_engagement/new_tab/new_tab_tracker_unittest.cc",
+        "../browser/feature_engagement/session_duration_updater_unittest.cc",
       ]
+      deps += [ "//components/feature_engagement/test:test_support" ]
     }
-  }
 
-  if (enable_native_notifications) {
-    if (is_desktop_linux) {
-      sources += [ "../browser/notifications/notification_platform_bridge_linux_unittest.cc" ]
+    if (is_linux || is_win) {
+      sources += [ "../browser/webshare/share_service_impl_unittest.cc" ]
     }
 
-    if (is_win) {
+    if (is_chromeos) {
+      sources -= [
+        "../browser/signin/chrome_signin_status_metrics_provider_delegate_unittest.cc",
+        "../browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc",
+
+        # Chrome OS uses window_sizer_ash_unittest.cc
+        "../browser/ui/window_sizer/window_sizer_unittest.cc",
+      ]
       sources += [
-        "../browser/notifications/notification_launch_id_unittest.cc",
-        "../browser/notifications/notification_platform_bridge_win_unittest.cc",
+        "../browser/chromeos/crostini/crostini_registry_service_unittest.cc",
+        "../browser/chromeos/policy/policy_cert_verifier_unittest.cc",
+        "../browser/component_updater/cros_component_installer_unittest.cc",
+        "../browser/mash_service_registry_unittest.cc",
+        "../browser/media/webrtc/desktop_media_list_ash_unittest.cc",
+        "../browser/notifications/chrome_ash_message_center_client_unittest.cc",
+        "../browser/renderer_context_menu/mock_render_view_context_menu.cc",
+        "../browser/renderer_context_menu/mock_render_view_context_menu.h",
+        "../browser/signin/signin_error_notifier_ash_unittest.cc",
+        "../browser/sync/sync_error_notifier_ash_unittest.cc",
+        "../browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc",
+        "../browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc",
+        "../browser/ui/ash/auto_connect_notifier_unittest.cc",
+        "../browser/ui/ash/chrome_keyboard_ui_unittest.cc",
+        "../browser/ui/ash/ime_controller_client_unittest.cc",
+        "../browser/ui/ash/ksv/keyboard_shortcut_viewer_metadata_unittest.cc",
+        "../browser/ui/ash/launcher/arc_app_shelf_id_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_util_chromeos_unittest.cc",
+        "../browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc",
+        "../browser/ui/ash/network/data_promo_notification_unittest.cc",
+        "../browser/ui/ash/network/network_state_notifier_unittest.cc",
+        "../browser/ui/ash/network/tether_notification_presenter_unittest.cc",
+        "../browser/ui/ash/session_controller_client_unittest.cc",
+        "../browser/ui/ash/tablet_mode_client_unittest.cc",
+        "../browser/ui/ash/wallpaper_controller_client_unittest.cc",
+        "../browser/ui/window_sizer/window_sizer_ash_unittest.cc",
+      ]
+      deps += [
+        "//ash:test_support_with_content",
+        "//ash/resources",
+        "//ash/strings",
       ]
     }
-  }
 
-  if (enable_desktop_in_product_help) {
-    sources += [
-      "../browser/feature_engagement/bookmark/bookmark_tracker_unittest.cc",
-      "../browser/feature_engagement/feature_tracker_unittest.cc",
-      "../browser/feature_engagement/incognito_window/incognito_window_tracker_unittest.cc",
-      "../browser/feature_engagement/new_tab/new_tab_tracker_unittest.cc",
-      "../browser/feature_engagement/session_duration_updater_unittest.cc",
-    ]
-    deps += [ "//components/feature_engagement/test:test_support" ]
-  }
+    if (use_x11 || use_ozone) {
+      deps += [ "//services/ui/public/cpp/input_devices:test_support" ]
+    }
 
-  if (is_linux || is_win) {
-    sources += [ "../browser/webshare/share_service_impl_unittest.cc" ]
-  }
+    if (enable_background_contents) {
+      sources +=
+          [ "../browser/background/background_contents_service_unittest.cc" ]
+    }
+    if (enable_background_mode) {
+      sources += [
+        "../browser/background/background_application_list_model_unittest.cc",
+        "../browser/background/background_mode_manager_unittest.cc",
+        "../browser/background/background_mode_optimizer_unittest.cc",
+      ]
+    }
 
-  if (is_chromeos) {
-    sources -= [
-      "../browser/signin/chrome_signin_status_metrics_provider_delegate_unittest.cc",
-      "../browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc",
+    if (enable_spellcheck) {
+      sources += [
+        "../browser/spellchecker/spell_check_host_chrome_impl_mac_unittest.cc",
+        "../browser/spellchecker/spellcheck_custom_dictionary_unittest.cc",
+        "../browser/spellchecker/spellcheck_service_unittest.cc",
+        "../browser/spellchecker/spelling_service_client_unittest.cc",
+        "../tools/convert_dict/convert_dict_unittest.cc",
+      ]
 
-      # Chrome OS uses window_sizer_ash_unittest.cc
-      "../browser/ui/window_sizer/window_sizer_unittest.cc",
-    ]
-    sources += [
-      "../browser/chromeos/crostini/crostini_registry_service_unittest.cc",
-      "../browser/chromeos/policy/policy_cert_verifier_unittest.cc",
-      "../browser/component_updater/cros_component_installer_unittest.cc",
-      "../browser/mash_service_registry_unittest.cc",
-      "../browser/media/webrtc/desktop_media_list_ash_unittest.cc",
-      "../browser/notifications/chrome_ash_message_center_client_unittest.cc",
-      "../browser/renderer_context_menu/mock_render_view_context_menu.cc",
-      "../browser/renderer_context_menu/mock_render_view_context_menu.h",
-      "../browser/signin/signin_error_notifier_ash_unittest.cc",
-      "../browser/sync/sync_error_notifier_ash_unittest.cc",
-      "../browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc",
-      "../browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc",
-      "../browser/ui/ash/auto_connect_notifier_unittest.cc",
-      "../browser/ui/ash/chrome_keyboard_ui_unittest.cc",
-      "../browser/ui/ash/ime_controller_client_unittest.cc",
-      "../browser/ui/ash/ksv/keyboard_shortcut_viewer_metadata_unittest.cc",
-      "../browser/ui/ash/launcher/arc_app_shelf_id_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_util_chromeos_unittest.cc",
-      "../browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc",
-      "../browser/ui/ash/network/data_promo_notification_unittest.cc",
-      "../browser/ui/ash/network/network_state_notifier_unittest.cc",
-      "../browser/ui/ash/network/tether_notification_presenter_unittest.cc",
-      "../browser/ui/ash/session_controller_client_unittest.cc",
-      "../browser/ui/ash/tablet_mode_client_unittest.cc",
-      "../browser/ui/ash/wallpaper_controller_client_unittest.cc",
-      "../browser/ui/window_sizer/window_sizer_ash_unittest.cc",
-    ]
-    deps += [
-      "//ash:test_support_with_content",
-      "//ash/resources",
-      "//ash/strings",
-    ]
-  }
+      if (!use_browser_spellchecker) {
+        sources += [
+          "../browser/spellchecker/spell_check_host_chrome_impl_unittest.cc",
+        ]
+      }
+    }
 
-  if (use_x11 || use_ozone) {
-    deps += [ "//services/ui/public/cpp/input_devices:test_support" ]
-  }
+    if (enable_one_click_signin) {
+      sources += [
+        "../browser/ui/sync/one_click_signin_sync_observer_unittest.cc",
+        "../browser/ui/sync/one_click_signin_sync_starter_unittest.cc",
+      ]
+    }
 
-  if (enable_background_contents) {
-    sources +=
-        [ "../browser/background/background_contents_service_unittest.cc" ]
-  }
-  if (enable_background_mode) {
-    sources += [
-      "../browser/background/background_application_list_model_unittest.cc",
-      "../browser/background/background_mode_manager_unittest.cc",
-      "../browser/background/background_mode_optimizer_unittest.cc",
-    ]
-  }
+    if (enable_extensions) {
+      sources += [
+        "../../apps/saved_files_service_unittest.cc",
+        "../../components/drive/drive_api_util_unittest.cc",
+        "../../components/drive/drive_app_registry_unittest.cc",
+        "../../components/drive/drive_uploader_unittest.cc",
+        "../../components/drive/event_logger_unittest.cc",
+        "../../components/drive/service/drive_api_service_unittest.cc",
+        "../../components/drive/service/fake_drive_service_unittest.cc",
+        "../../tools/json_schema_compiler/test/features_generation_unittest.cc",
+        "../browser/apps/app_shim/app_shim_host_mac_unittest.cc",
+        "../browser/apps/app_shim/extension_app_shim_handler_mac_unittest.cc",
+        "../browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc",
+        "../browser/browsing_data/counters/hosted_apps_counter_unittest.cc",
+        "../browser/extensions/active_tab_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_policy_unittest.cc",
+        "../browser/extensions/activity_log/activity_log_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/api/activity_log_private/activity_log_private_api_unittest.cc",
+        "../browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api_unittest.cc",
+        "../browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc",
+        "../browser/extensions/api/bookmarks/bookmarks_api_unittest.cc",
+        "../browser/extensions/api/chrome_extensions_api_client_unittest.cc",
+        "../browser/extensions/api/content_settings/content_settings_store_unittest.cc",
+        "../browser/extensions/api/content_settings/content_settings_unittest.cc",
+        "../browser/extensions/api/cookies/cookies_unittest.cc",
+        "../browser/extensions/api/cryptotoken_private/cryptotoken_private_api_unittest.cc",
+        "../browser/extensions/api/declarative/rules_registry_service_unittest.cc",
+        "../browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc",
+        "../browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc",
+        "../browser/extensions/api/declarative_content/content_action_unittest.cc",
+        "../browser/extensions/api/declarative_content/content_condition_unittest.cc",
+        "../browser/extensions/api/declarative_content/declarative_content_condition_tracker_test.cc",
+        "../browser/extensions/api/declarative_content/declarative_content_condition_tracker_test.h",
+        "../browser/extensions/api/declarative_content/declarative_content_css_condition_tracker_unittest.cc",
+        "../browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker_unittest.cc",
+        "../browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker_unittest.cc",
+        "../browser/extensions/api/declarative_net_request/dnr_test_base.cc",
+        "../browser/extensions/api/declarative_net_request/dnr_test_base.h",
+        "../browser/extensions/api/declarative_net_request/rule_indexing_unittest.cc",
+        "../browser/extensions/api/declarative_net_request/ruleset_manager_unittest.cc",
+        "../browser/extensions/api/declarative_net_request/ruleset_matcher_unittest.cc",
+        "../browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc",
+        "../browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc",
+        "../browser/extensions/api/developer_private/developer_private_api_unittest.cc",
+        "../browser/extensions/api/developer_private/extension_info_generator_unittest.cc",
+        "../browser/extensions/api/device_permissions_manager_unittest.cc",
+        "../browser/extensions/api/downloads/downloads_api_unittest.cc",
+        "../browser/extensions/api/extension_action/browser_action_unittest.cc",
+        "../browser/extensions/api/extension_action/extension_action_prefs_unittest.cc",
+        "../browser/extensions/api/file_system/file_system_api_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/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/test_utils.h",
+        "../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/language_settings_private/language_settings_private_api_unittest.cc",
+        "../browser/extensions/api/language_settings_private/language_settings_private_delegate_unittest.cc",
+        "../browser/extensions/api/management/management_api_unittest.cc",
+        "../browser/extensions/api/notifications/extension_notification_handler_unittest.cc",
+        "../browser/extensions/api/omnibox/omnibox_unittest.cc",
+        "../browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc",
+        "../browser/extensions/api/passwords_private/passwords_private_utils_unittest.cc",
+        "../browser/extensions/api/permissions/permissions_api_helpers_unittest.cc",
+        "../browser/extensions/api/permissions/permissions_api_unittest.cc",
+        "../browser/extensions/api/preference/preference_api_prefs_unittest.cc",
+        "../browser/extensions/api/proxy/proxy_api_helpers_unittest.cc",
+        "../browser/extensions/api/runtime/chrome_runtime_api_delegate_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",
+        "../browser/extensions/api/socket/combined_socket_unittest.cc",
+        "../browser/extensions/api/socket/socket_api_unittest.cc",
+        "../browser/extensions/api/socket/tcp_socket_unittest.cc",
+        "../browser/extensions/api/socket/tls_socket_unittest.cc",
+        "../browser/extensions/api/socket/udp_socket_unittest.cc",
+        "../browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc",
+        "../browser/extensions/api/storage/policy_value_store_unittest.cc",
+        "../browser/extensions/api/storage/settings_sync_unittest.cc",
+        "../browser/extensions/api/streams_private/streams_private_manifest_unittest.cc",
+        "../browser/extensions/api/tabs/tabs_api_unittest.cc",
+        "../browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc",
+        "../browser/extensions/api/web_request/web_request_api_unittest.cc",
+        "../browser/extensions/api/web_request/web_request_event_details_unittest.cc",
+        "../browser/extensions/api/web_request/web_request_permissions_unittest.cc",
+        "../browser/extensions/app_data_migrator_unittest.cc",
+        "../browser/extensions/blacklist_check_unittest.cc",
+        "../browser/extensions/blacklist_state_fetcher_unittest.cc",
+        "../browser/extensions/bookmark_app_helper_unittest.cc",
+        "../browser/extensions/chrome_app_icon_unittest.cc",
+        "../browser/extensions/chrome_app_sorting_unittest.cc",
+        "../browser/extensions/chrome_component_extension_resource_manager_unittest.cc",
+        "../browser/extensions/chrome_content_browser_client_extensions_part_unittest.cc",
+        "../browser/extensions/chrome_extension_function_unittest.cc",
+        "../browser/extensions/chrome_info_map_unittest.cc",
+        "../browser/extensions/component_loader_unittest.cc",
+        "../browser/extensions/convert_user_script_unittest.cc",
+        "../browser/extensions/convert_web_app_unittest.cc",
+        "../browser/extensions/default_apps_unittest.cc",
+        "../browser/extensions/error_console/error_console_unittest.cc",
+        "../browser/extensions/event_router_forwarder_unittest.cc",
+        "../browser/extensions/extension_action_icon_factory_unittest.cc",
+        "../browser/extensions/extension_action_manager_unittest.cc",
+        "../browser/extensions/extension_action_runner_unittest.cc",
+        "../browser/extensions/extension_action_unittest.cc",
+        "../browser/extensions/extension_api_unittest.cc",
+        "../browser/extensions/extension_api_unittest.h",
+        "../browser/extensions/extension_context_menu_model_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_garbage_collector_chromeos_unittest.cc",
+        "../browser/extensions/extension_garbage_collector_unittest.cc",
+        "../browser/extensions/extension_gcm_app_handler_unittest.cc",
+        "../browser/extensions/extension_icon_manager_unittest.cc",
+        "../browser/extensions/extension_install_prompt_unittest.cc",
+        "../browser/extensions/extension_management_test_util.cc",
+        "../browser/extensions/extension_management_test_util.h",
+        "../browser/extensions/extension_management_unittest.cc",
+        "../browser/extensions/extension_message_bubble_controller_unittest.cc",
+        "../browser/extensions/extension_migrator_unittest.cc",
+        "../browser/extensions/extension_navigation_throttle_unittest.cc",
+        "../browser/extensions/extension_prefs_unittest.cc",
+        "../browser/extensions/extension_prefs_unittest.h",
+        "../browser/extensions/extension_protocols_unittest.cc",
+        "../browser/extensions/extension_reenabler_unittest.cc",
+        "../browser/extensions/extension_service_sync_unittest.cc",
+        "../browser/extensions/extension_service_test_base.cc",
+        "../browser/extensions/extension_service_test_base.h",
+        "../browser/extensions/extension_service_test_with_install.cc",
+        "../browser/extensions/extension_service_test_with_install.h",
+        "../browser/extensions/extension_service_unittest.cc",
+        "../browser/extensions/extension_special_storage_policy_unittest.cc",
+        "../browser/extensions/extension_sync_data_unittest.cc",
+        "../browser/extensions/extension_tab_util_unittest.cc",
+        "../browser/extensions/extension_test_message_listener_unittest.cc",
+        "../browser/extensions/extension_user_script_loader_unittest.cc",
+        "../browser/extensions/extension_web_ui_unittest.cc",
+        "../browser/extensions/external_policy_loader_unittest.cc",
+        "../browser/extensions/external_pref_loader_unittest.cc",
+        "../browser/extensions/external_provider_impl_chromeos_unittest.cc",
+        "../browser/extensions/external_provider_impl_unittest.cc",
+        "../browser/extensions/favicon_downloader_unittest.cc",
+        "../browser/extensions/install_tracker_unittest.cc",
+        "../browser/extensions/install_verifier_unittest.cc",
+        "../browser/extensions/menu_manager_unittest.cc",
+        "../browser/extensions/ntp_overridden_bubble_delegate_unittest.cc",
+        "../browser/extensions/pack_extension_unittest.cc",
+        "../browser/extensions/permission_message_combinations_unittest.cc",
+        "../browser/extensions/permission_messages_unittest.cc",
+        "../browser/extensions/permissions_based_management_policy_provider_unittest.cc",
+        "../browser/extensions/permissions_updater_unittest.cc",
+        "../browser/extensions/policy_extension_reinstaller_unittest.cc",
+        "../browser/extensions/policy_handlers_unittest.cc",
+        "../browser/extensions/scripting_permissions_modifier_unittest.cc",
+        "../browser/extensions/shared_module_service_unittest.cc",
+        "../browser/extensions/standard_management_policy_provider_unittest.cc",
+        "../browser/extensions/system_display/display_info_provider_chromeos_unittest.cc",
+        "../browser/extensions/tab_helper_unittest.cc",
+        "../browser/extensions/update_install_gate_unittest.cc",
+        "../browser/extensions/updater/extension_cache_fake.cc",
+        "../browser/extensions/updater/extension_cache_fake.h",
+        "../browser/extensions/updater/extension_updater_unittest.cc",
+        "../browser/extensions/user_script_listener_unittest.cc",
+        "../browser/extensions/warning_badge_service_unittest.cc",
+        "../browser/extensions/webstore_inline_installer_unittest.cc",
+        "../browser/extensions/webstore_installer_unittest.cc",
+        "../browser/extensions/zipfile_installer_unittest.cc",
+        "../browser/media/cast_transport_host_filter_unittest.cc",
+        "../browser/media_galleries/chromeos/mtp_device_object_enumerator_unittest.cc",
+        "../browser/metrics/extensions_metrics_provider_unittest.cc",
+        "../browser/notifications/notification_system_observer_unittest.cc",
+        "../browser/renderer_context_menu/context_menu_content_type_unittest.cc",
+        "../browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config_unittest.cc",
+        "../browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_unittest.cc",
+        "../browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.cc",
+        "../browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.h",
+        "../browser/safe_search_api/safe_search_url_checker_unittest.cc",
+        "../browser/sync/glue/extensions_activity_monitor_unittest.cc",
+        "../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/leveldb_wrapper_unittest.cc",
+        "../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_on_disk_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/fake_remote_change_processor.cc",
+        "../browser/sync_file_system/fake_remote_change_processor.h",
+        "../browser/sync_file_system/file_change_unittest.cc",
+        "../browser/sync_file_system/local/canned_syncable_file_system.cc",
+        "../browser/sync_file_system/local/canned_syncable_file_system.h",
+        "../browser/sync_file_system/local/local_file_change_tracker_unittest.cc",
+        "../browser/sync_file_system/local/local_file_sync_context_unittest.cc",
+        "../browser/sync_file_system/local/local_file_sync_service_unittest.cc",
+        "../browser/sync_file_system/local/local_file_sync_status_unittest.cc",
+        "../browser/sync_file_system/local/mock_sync_status_observer.cc",
+        "../browser/sync_file_system/local/mock_sync_status_observer.h",
+        "../browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc",
+        "../browser/sync_file_system/local/syncable_file_system_unittest.cc",
+        "../browser/sync_file_system/logger_unittest.cc",
+        "../browser/sync_file_system/mock_local_change_processor.cc",
+        "../browser/sync_file_system/mock_local_change_processor.h",
+        "../browser/sync_file_system/mock_remote_change_processor.cc",
+        "../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_process_runner_unittest.cc",
+        "../browser/sync_file_system/syncable_file_system_util_unittest.cc",
+        "../browser/web_applications/web_app_mac_unittest.mm",
+        "../browser/web_applications/web_app_unittest.cc",
+        "../common/extensions/api/commands/commands_manifest_unittest.cc",
+        "../common/extensions/api/common_extension_api_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/storage/storage_schema_manifest_handler_unittest.cc",
+        "../common/extensions/chrome_extensions_client_unittest.cc",
+        "../common/extensions/chrome_manifest_url_handlers_unittest.cc",
+        "../common/extensions/command_unittest.cc",
+        "../common/extensions/extension_unittest.cc",
+        "../common/extensions/feature_switch_unittest.cc",
+        "../common/extensions/manifest_handlers/app_theme_color_manifest_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/settings_overrides_handler_unittest.cc",
+        "../common/extensions/manifest_handlers/ui_overrides_handler_unittest.cc",
+        "../common/extensions/manifest_tests/chrome_manifest_test.cc",
+        "../common/extensions/manifest_tests/chrome_manifest_test.h",
+        "../common/extensions/manifest_tests/extension_manifests_about_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_action_key_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",
+        "../common/extensions/manifest_tests/extension_manifests_default_extent_path_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_dummy_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_icons_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_isolatedapp_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_kiosk_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_launch_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_manifest_version_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_offline_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_old_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_options_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_override_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_portsinpermissions_unittest.cc",
+        "../common/extensions/manifest_tests/extension_manifests_requirements_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/permissions/chrome_permission_message_provider_unittest.cc",
+        "../common/extensions/permissions/chrome_permission_message_rules_unittest.cc",
+        "../common/extensions/permissions/media_galleries_permission_unittest.cc",
+        "../common/extensions/permissions/permission_set_unittest.cc",
+        "../common/extensions/permissions/permissions_data_unittest.cc",
+        "../common/extensions/permissions/settings_override_permission_unittest.cc",
+        "../common/extensions/sync_type_unittest.cc",
+        "../renderer/extensions/chrome_native_extension_bindings_system_unittest.cc",
+        "../renderer/extensions/custom_types_unittest.cc",
+        "../renderer/extensions/extension_hooks_delegate_unittest.cc",
+        "../renderer/extensions/extension_localization_peer_unittest.cc",
+        "../renderer/extensions/extension_process_policy_unittest.cc",
+        "../renderer/extensions/i18n_hooks_delegate_unittest.cc",
+        "../renderer/extensions/renderer_permissions_policy_delegate_unittest.cc",
+        "../renderer/extensions/tabs_hooks_delegate_unittest.cc",
+        "../renderer/media/cast_ipc_dispatcher_unittest.cc",
+        "../utility/image_writer/image_writer_unittest.cc",
+      ]
+      deps += [
+        "//chrome/common/extensions/api",
+        "//extensions:extensions_resources",
+        "//extensions/browser:test_support",
+        "//extensions/common",
+        "//extensions/renderer:unit_test_support",
+        "//extensions/strings",
+        "//google_apis",
+        "//media/cast:test_support",
+
+        # This will add all of the unit tests for the schema compiler to this
+        # target.
+        "//tools/json_schema_compiler/test:unit_tests",
+      ]
+      if (enable_service_discovery) {
+        sources += [ "../browser/extensions/api/mdns/mdns_api_unittest.cc" ]
+      }
+      if (is_win) {
+        sources +=
+            [ "../browser/extensions/external_registry_loader_win_unittest.cc" ]
+      }
+      if (is_chromeos) {
+        sources += [
+          "../browser/chromeos/login/easy_unlock/easy_unlock_app_manager_unittest.cc",
+          "../browser/chromeos/login/easy_unlock/easy_unlock_auth_attempt_unittest.cc",
+          "../browser/chromeos/login/easy_unlock/easy_unlock_notification_controller_chromeos_unittest.cc",
+          "../browser/chromeos/login/easy_unlock/easy_unlock_screenlock_state_handler_unittest.cc",
+          "../browser/chromeos/login/easy_unlock/easy_unlock_service_unittest_chromeos.cc",
+          "../browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc",
+          "../browser/extensions/api/file_system/consent_provider_unittest.cc",
+        ]
+      } else {
+        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",
+        ]
+      }
+    }
+    if (use_aura) {
+      deps += [
+        "//ui/aura:test_support",
+        "//ui/views:test_support",
+        "//ui/wm",
+      ]
+    }
+    if (!is_chromeos && is_linux) {
+      sources += [
+        "../browser/password_manager/native_backend_kwallet_x_unittest.cc",
+        "../browser/shell_integration_linux_unittest.cc",
+        "../browser/ui/input_method/input_method_engine_unittest.cc",
+      ]
+    }
 
-  if (enable_spellcheck) {
-    sources += [
-      "../browser/spellchecker/spell_check_host_chrome_impl_mac_unittest.cc",
-      "../browser/spellchecker/spellcheck_custom_dictionary_unittest.cc",
-      "../browser/spellchecker/spellcheck_service_unittest.cc",
-      "../browser/spellchecker/spelling_service_client_unittest.cc",
-      "../tools/convert_dict/convert_dict_unittest.cc",
-    ]
+    if (is_android || is_chromeos) {
+      sources += [ "../browser/media/protected_media_identifier_permission_context_unittest.cc" ]
+    } else {
+      sources += [
+        "../browser/lifetime/switch_utils_unittest.cc",
+        "../browser/net/disk_cache_dir_policy_handler_unittest.cc",
+        "../browser/profiles/profile_list_desktop_unittest.cc",
+        "../browser/profiles/profile_statistics_unittest.cc",
+        "../browser/ui/startup/startup_browser_creator_impl_unittest.cc",
+        "../browser/ui/startup/startup_tab_provider_unittest.cc",
+      ]
+    }
+    if (use_gio) {
+      configs += [ "//build/linux:gio_config" ]
+    }
+    if (!is_chromeos && !use_ozone && is_linux) {
+      deps += [ "//chrome/browser/ui/libgtkui" ]
+    }
 
-    if (!use_browser_spellchecker) {
-      sources +=
-          [ "../browser/spellchecker/spell_check_host_chrome_impl_unittest.cc" ]
+    if (enable_mdns) {
+      sources += [
+        "../browser/local_discovery/local_domain_resolver_unittest.cc",
+        "../browser/local_discovery/service_discovery_client_unittest.cc",
+        "../browser/printing/cloud_print/privet_device_lister_unittest.cc",
+        "../browser/printing/cloud_print/privet_local_printer_lister_unittest.cc",
+      ]
+    }
+    if (enable_service_discovery) {
+      sources += [
+        "../browser/devtools/device/cast_device_provider_unittest.cc",
+        "../browser/local_discovery/service_discovery_client_mac_unittest.mm",
+        "../browser/printing/cloud_print/cloud_print_printer_list_unittest.cc",
+        "../browser/printing/cloud_print/gcd_api_flow_unittest.cc",
+        "../browser/printing/cloud_print/privet_confirm_api_flow_unittest.cc",
+        "../browser/printing/cloud_print/privet_http_unittest.cc",
+        "../browser/printing/cloud_print/privet_notifications_unittest.cc",
+        "../browser/printing/cloud_print/privet_url_fetcher_unittest.cc",
+      ]
+    }
+
+    if (safe_browsing_mode > 0) {
+      sources += [
+        "../browser/safe_browsing/certificate_reporting_service_unittest.cc",
+        "../browser/safe_browsing/safe_browsing_blocking_page_unittest.cc",
+        "../browser/safe_browsing/threat_details_unittest.cc",
+        "../browser/safe_browsing/ui_manager_unittest.cc",
+        "../common/safe_browsing/file_type_policies_test_util.cc",
+        "../common/safe_browsing/file_type_policies_test_util.h",
+        "../common/safe_browsing/file_type_policies_unittest.cc",
+      ]
+    }
+    if (safe_browsing_mode == 1) {
+      # TODO(sgurun): enable tests for safe_browsing==2.
+      sources += [
+        "../browser/safe_browsing/browser_feature_extractor_unittest.cc",
+        "../browser/safe_browsing/chrome_password_protection_service_unittest.cc",
+        "../browser/safe_browsing/chunk_range_unittest.cc",
+        "../browser/safe_browsing/client_side_detection_host_unittest.cc",
+        "../browser/safe_browsing/client_side_detection_service_unittest.cc",
+        "../browser/safe_browsing/client_side_model_loader_unittest.cc",
+        "../browser/safe_browsing/download_protection/check_client_download_request_unittest.cc",
+        "../browser/safe_browsing/download_protection/disk_image_type_sniffer_mac_unittest.cc",
+        "../browser/safe_browsing/download_protection/download_feedback_service_unittest.cc",
+        "../browser/safe_browsing/download_protection/download_feedback_unittest.cc",
+        "../browser/safe_browsing/download_protection/download_protection_service_unittest.cc",
+        "../browser/safe_browsing/download_protection/path_sanitizer_unittest.cc",
+        "../browser/safe_browsing/download_protection/two_phase_uploader_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/binary_integrity_incident_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/environment_data_collection_win_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/incident_report_uploader_impl_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/mock_incident_receiver.cc",
+        "../browser/safe_browsing/incident_reporting/mock_incident_receiver.h",
+        "../browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.cc",
+        "../browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.h",
+        "../browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/platform_state_store_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/platform_state_store_win_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/resource_request_detector_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/state_store_unittest.cc",
+        "../browser/safe_browsing/incident_reporting/tracked_preference_incident_unittest.cc",
+        "../browser/safe_browsing/local_database_manager_unittest.cc",
+        "../browser/safe_browsing/local_two_phase_testserver.cc",
+        "../browser/safe_browsing/local_two_phase_testserver.h",
+        "../browser/safe_browsing/notification_image_reporter_unittest.cc",
+        "../browser/safe_browsing/protocol_manager_unittest.cc",
+        "../browser/safe_browsing/protocol_parser_unittest.cc",
+        "../browser/safe_browsing/safe_browsing_database_unittest.cc",
+        "../browser/safe_browsing/safe_browsing_navigation_observer_unittest.cc",
+        "../browser/safe_browsing/safe_browsing_store_file_unittest.cc",
+        "../browser/safe_browsing/safe_browsing_store_unittest.cc",
+        "../browser/safe_browsing/signature_evaluator_mac_unittest.cc",
+        "../common/safe_browsing/binary_feature_extractor_mac_unittest.cc",
+        "../common/safe_browsing/binary_feature_extractor_unittest.cc",
+        "../common/safe_browsing/binary_feature_extractor_win_unittest.cc",
+        "../common/safe_browsing/download_protection_util_unittest.cc",
+        "../common/safe_browsing/ipc_protobuf_message_test_messages.h",
+        "../common/safe_browsing/ipc_protobuf_message_unittest.cc",
+        "../common/safe_browsing/mach_o_image_reader_mac_unittest.cc",
+        "../common/safe_browsing/pe_image_reader_win_unittest.cc",
+        "../renderer/safe_browsing/features_unittest.cc",
+        "../renderer/safe_browsing/murmurhash3_util_unittest.cc",
+        "../renderer/safe_browsing/phishing_term_feature_extractor_unittest.cc",
+        "../renderer/safe_browsing/phishing_url_feature_extractor_unittest.cc",
+        "../renderer/safe_browsing/scorer_unittest.cc",
+        "../utility/safe_browsing/mac/dmg_test_utils.cc",
+        "../utility/safe_browsing/mac/dmg_test_utils.h",
+        "../utility/safe_browsing/mac/hfs_unittest.cc",
+        "../utility/safe_browsing/mac/read_stream_unittest.cc",
+        "../utility/safe_browsing/mac/udif_unittest.cc",
+      ]
+      deps += [
+        ":test_proto",
+        "//chrome/services/file_util/public/cpp:unit_tests",
+        "//components/safe_browsing:base_ping_manager_unittest",
+        "//components/safe_browsing/browser:unittests",
+        "//components/safe_browsing/db:v4_test_util",
+        "//components/safe_browsing/renderer:websocket_sb_handshake_throttle_unittest",
+      ]
+
+      if (is_mac) {
+        deps += [ ":mac_safe_browsing_test_data" ]
+        data += [ "$root_out_dir/test_data/chrome/safe_browsing_dmg/" ]
+      }
+    }
+
+    if (enable_plugins) {
+      sources += [
+        "../browser/component_updater/component_installers_unittest.cc",
+        "../browser/metrics/chrome_stability_metrics_provider_unittest.cc",
+        "../browser/metrics/plugin_metrics_provider_unittest.cc",
+        "../browser/plugins/chrome_plugin_service_filter_unittest.cc",
+        "../browser/plugins/flash_download_interception_unittest.cc",
+        "../browser/plugins/flash_temporary_permission_tracker_unittest.cc",
+        "../browser/plugins/plugin_finder_unittest.cc",
+        "../browser/plugins/plugin_info_host_impl_unittest.cc",
+        "../browser/plugins/plugin_installer_unittest.cc",
+        "../browser/plugins/plugin_metadata_unittest.cc",
+        "../browser/plugins/plugin_prefs_unittest.cc",
+        "../common/pepper_permission_util_unittest.cc",
+      ]
+    }
+
+    if (enable_print_preview) {
+      sources += [
+        "../browser/printing/print_job_unittest.cc",
+        "../browser/printing/print_preview_dialog_controller_unittest.cc",
+        "../browser/printing/print_preview_test.cc",
+        "../browser/printing/print_preview_test.h",
+        "../browser/printing/print_test_utils.cc",
+        "../browser/printing/print_test_utils.h",
+        "../browser/printing/print_view_manager_unittest.cc",
+        "../browser/printing/test_print_job.cc",
+        "../browser/printing/test_print_job.h",
+        "../browser/printing/test_printer_query.cc",
+        "../browser/printing/test_printer_query.h",
+        "../browser/ui/webui/print_preview/extension_printer_handler_unittest.cc",
+        "../browser/ui/webui/print_preview/pdf_printer_handler_unittest.cc",
+        "../browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc",
+        "../browser/ui/webui/print_preview/print_preview_handler_unittest.cc",
+        "../browser/ui/webui/print_preview/print_preview_ui_unittest.cc",
+        "../browser/ui/webui/print_preview/print_preview_utils_unittest.cc",
+      ]
+
+      deps += [
+        "//ipc",
+        "//printing",
+        "//printing:test_support",
+      ]
+
+      if (!is_chromeos) {
+        sources += [
+          "../browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc",
+          "../common/cloud_print/cloud_print_helpers_unittest.cc",
+          "../common/service_process_util_mac_unittest.mm",
+          "../common/service_process_util_unittest.cc",
+          "../service/cloud_print/cloud_print_service_helpers_unittest.cc",
+          "../service/cloud_print/cloud_print_token_store_unittest.cc",
+          "../service/cloud_print/cloud_print_url_fetcher_unittest.cc",
+          "../service/cloud_print/connector_settings_unittest.cc",
+          "../service/cloud_print/printer_job_handler_unittest.cc",
+          "../service/cloud_print/printer_job_queue_handler_unittest.cc",
+          "../service/service_ipc_server_unittest.cc",
+          "../service/service_process_prefs_unittest.cc",
+        ]
+      }
     }
-  }
-
-  if (enable_one_click_signin) {
-    sources += [
-      "../browser/ui/sync/one_click_signin_sync_observer_unittest.cc",
-      "../browser/ui/sync/one_click_signin_sync_starter_unittest.cc",
-    ]
-  }
 
-  if (enable_extensions) {
-    sources += [
-      "../../apps/saved_files_service_unittest.cc",
-      "../../components/drive/drive_api_util_unittest.cc",
-      "../../components/drive/drive_app_registry_unittest.cc",
-      "../../components/drive/drive_uploader_unittest.cc",
-      "../../components/drive/event_logger_unittest.cc",
-      "../../components/drive/service/drive_api_service_unittest.cc",
-      "../../components/drive/service/fake_drive_service_unittest.cc",
-      "../../tools/json_schema_compiler/test/features_generation_unittest.cc",
-      "../browser/apps/app_shim/app_shim_host_mac_unittest.cc",
-      "../browser/apps/app_shim/extension_app_shim_handler_mac_unittest.cc",
-      "../browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc",
-      "../browser/browsing_data/counters/hosted_apps_counter_unittest.cc",
-      "../browser/extensions/active_tab_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_policy_unittest.cc",
-      "../browser/extensions/activity_log/activity_log_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/api/activity_log_private/activity_log_private_api_unittest.cc",
-      "../browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api_unittest.cc",
-      "../browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc",
-      "../browser/extensions/api/bookmarks/bookmarks_api_unittest.cc",
-      "../browser/extensions/api/chrome_extensions_api_client_unittest.cc",
-      "../browser/extensions/api/content_settings/content_settings_store_unittest.cc",
-      "../browser/extensions/api/content_settings/content_settings_unittest.cc",
-      "../browser/extensions/api/cookies/cookies_unittest.cc",
-      "../browser/extensions/api/cryptotoken_private/cryptotoken_private_api_unittest.cc",
-      "../browser/extensions/api/declarative/rules_registry_service_unittest.cc",
-      "../browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc",
-      "../browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc",
-      "../browser/extensions/api/declarative_content/content_action_unittest.cc",
-      "../browser/extensions/api/declarative_content/content_condition_unittest.cc",
-      "../browser/extensions/api/declarative_content/declarative_content_condition_tracker_test.cc",
-      "../browser/extensions/api/declarative_content/declarative_content_condition_tracker_test.h",
-      "../browser/extensions/api/declarative_content/declarative_content_css_condition_tracker_unittest.cc",
-      "../browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker_unittest.cc",
-      "../browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker_unittest.cc",
-      "../browser/extensions/api/declarative_net_request/dnr_test_base.cc",
-      "../browser/extensions/api/declarative_net_request/dnr_test_base.h",
-      "../browser/extensions/api/declarative_net_request/rule_indexing_unittest.cc",
-      "../browser/extensions/api/declarative_net_request/ruleset_manager_unittest.cc",
-      "../browser/extensions/api/declarative_net_request/ruleset_matcher_unittest.cc",
-      "../browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc",
-      "../browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc",
-      "../browser/extensions/api/developer_private/developer_private_api_unittest.cc",
-      "../browser/extensions/api/developer_private/extension_info_generator_unittest.cc",
-      "../browser/extensions/api/device_permissions_manager_unittest.cc",
-      "../browser/extensions/api/downloads/downloads_api_unittest.cc",
-      "../browser/extensions/api/extension_action/browser_action_unittest.cc",
-      "../browser/extensions/api/extension_action/extension_action_prefs_unittest.cc",
-      "../browser/extensions/api/file_system/file_system_api_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/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/test_utils.h",
-      "../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/language_settings_private/language_settings_private_api_unittest.cc",
-      "../browser/extensions/api/language_settings_private/language_settings_private_delegate_unittest.cc",
-      "../browser/extensions/api/management/management_api_unittest.cc",
-      "../browser/extensions/api/notifications/extension_notification_handler_unittest.cc",
-      "../browser/extensions/api/omnibox/omnibox_unittest.cc",
-      "../browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc",
-      "../browser/extensions/api/passwords_private/passwords_private_utils_unittest.cc",
-      "../browser/extensions/api/permissions/permissions_api_helpers_unittest.cc",
-      "../browser/extensions/api/permissions/permissions_api_unittest.cc",
-      "../browser/extensions/api/preference/preference_api_prefs_unittest.cc",
-      "../browser/extensions/api/proxy/proxy_api_helpers_unittest.cc",
-      "../browser/extensions/api/runtime/chrome_runtime_api_delegate_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",
-      "../browser/extensions/api/socket/combined_socket_unittest.cc",
-      "../browser/extensions/api/socket/socket_api_unittest.cc",
-      "../browser/extensions/api/socket/tcp_socket_unittest.cc",
-      "../browser/extensions/api/socket/tls_socket_unittest.cc",
-      "../browser/extensions/api/socket/udp_socket_unittest.cc",
-      "../browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc",
-      "../browser/extensions/api/storage/policy_value_store_unittest.cc",
-      "../browser/extensions/api/storage/settings_sync_unittest.cc",
-      "../browser/extensions/api/streams_private/streams_private_manifest_unittest.cc",
-      "../browser/extensions/api/tabs/tabs_api_unittest.cc",
-      "../browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc",
-      "../browser/extensions/api/web_request/web_request_api_unittest.cc",
-      "../browser/extensions/api/web_request/web_request_event_details_unittest.cc",
-      "../browser/extensions/api/web_request/web_request_permissions_unittest.cc",
-      "../browser/extensions/app_data_migrator_unittest.cc",
-      "../browser/extensions/blacklist_check_unittest.cc",
-      "../browser/extensions/blacklist_state_fetcher_unittest.cc",
-      "../browser/extensions/bookmark_app_helper_unittest.cc",
-      "../browser/extensions/chrome_app_icon_unittest.cc",
-      "../browser/extensions/chrome_app_sorting_unittest.cc",
-      "../browser/extensions/chrome_component_extension_resource_manager_unittest.cc",
-      "../browser/extensions/chrome_content_browser_client_extensions_part_unittest.cc",
-      "../browser/extensions/chrome_extension_function_unittest.cc",
-      "../browser/extensions/chrome_info_map_unittest.cc",
-      "../browser/extensions/component_loader_unittest.cc",
-      "../browser/extensions/convert_user_script_unittest.cc",
-      "../browser/extensions/convert_web_app_unittest.cc",
-      "../browser/extensions/default_apps_unittest.cc",
-      "../browser/extensions/error_console/error_console_unittest.cc",
-      "../browser/extensions/event_router_forwarder_unittest.cc",
-      "../browser/extensions/extension_action_icon_factory_unittest.cc",
-      "../browser/extensions/extension_action_manager_unittest.cc",
-      "../browser/extensions/extension_action_runner_unittest.cc",
-      "../browser/extensions/extension_action_unittest.cc",
-      "../browser/extensions/extension_api_unittest.cc",
-      "../browser/extensions/extension_api_unittest.h",
-      "../browser/extensions/extension_context_menu_model_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_garbage_collector_chromeos_unittest.cc",
-      "../browser/extensions/extension_garbage_collector_unittest.cc",
-      "../browser/extensions/extension_gcm_app_handler_unittest.cc",
-      "../browser/extensions/extension_icon_manager_unittest.cc",
-      "../browser/extensions/extension_install_prompt_unittest.cc",
-      "../browser/extensions/extension_management_test_util.cc",
-      "../browser/extensions/extension_management_test_util.h",
-      "../browser/extensions/extension_management_unittest.cc",
-      "../browser/extensions/extension_message_bubble_controller_unittest.cc",
-      "../browser/extensions/extension_migrator_unittest.cc",
-      "../browser/extensions/extension_navigation_throttle_unittest.cc",
-      "../browser/extensions/extension_prefs_unittest.cc",
-      "../browser/extensions/extension_prefs_unittest.h",
-      "../browser/extensions/extension_protocols_unittest.cc",
-      "../browser/extensions/extension_reenabler_unittest.cc",
-      "../browser/extensions/extension_service_sync_unittest.cc",
-      "../browser/extensions/extension_service_test_base.cc",
-      "../browser/extensions/extension_service_test_base.h",
-      "../browser/extensions/extension_service_test_with_install.cc",
-      "../browser/extensions/extension_service_test_with_install.h",
-      "../browser/extensions/extension_service_unittest.cc",
-      "../browser/extensions/extension_special_storage_policy_unittest.cc",
-      "../browser/extensions/extension_sync_data_unittest.cc",
-      "../browser/extensions/extension_tab_util_unittest.cc",
-      "../browser/extensions/extension_test_message_listener_unittest.cc",
-      "../browser/extensions/extension_user_script_loader_unittest.cc",
-      "../browser/extensions/extension_web_ui_unittest.cc",
-      "../browser/extensions/external_policy_loader_unittest.cc",
-      "../browser/extensions/external_pref_loader_unittest.cc",
-      "../browser/extensions/external_provider_impl_chromeos_unittest.cc",
-      "../browser/extensions/external_provider_impl_unittest.cc",
-      "../browser/extensions/favicon_downloader_unittest.cc",
-      "../browser/extensions/install_tracker_unittest.cc",
-      "../browser/extensions/install_verifier_unittest.cc",
-      "../browser/extensions/menu_manager_unittest.cc",
-      "../browser/extensions/ntp_overridden_bubble_delegate_unittest.cc",
-      "../browser/extensions/pack_extension_unittest.cc",
-      "../browser/extensions/permission_message_combinations_unittest.cc",
-      "../browser/extensions/permission_messages_unittest.cc",
-      "../browser/extensions/permissions_based_management_policy_provider_unittest.cc",
-      "../browser/extensions/permissions_updater_unittest.cc",
-      "../browser/extensions/policy_extension_reinstaller_unittest.cc",
-      "../browser/extensions/policy_handlers_unittest.cc",
-      "../browser/extensions/scripting_permissions_modifier_unittest.cc",
-      "../browser/extensions/shared_module_service_unittest.cc",
-      "../browser/extensions/standard_management_policy_provider_unittest.cc",
-      "../browser/extensions/system_display/display_info_provider_chromeos_unittest.cc",
-      "../browser/extensions/tab_helper_unittest.cc",
-      "../browser/extensions/update_install_gate_unittest.cc",
-      "../browser/extensions/updater/extension_cache_fake.cc",
-      "../browser/extensions/updater/extension_cache_fake.h",
-      "../browser/extensions/updater/extension_updater_unittest.cc",
-      "../browser/extensions/user_script_listener_unittest.cc",
-      "../browser/extensions/warning_badge_service_unittest.cc",
-      "../browser/extensions/webstore_inline_installer_unittest.cc",
-      "../browser/extensions/webstore_installer_unittest.cc",
-      "../browser/extensions/zipfile_installer_unittest.cc",
-      "../browser/media/cast_transport_host_filter_unittest.cc",
-      "../browser/media_galleries/chromeos/mtp_device_object_enumerator_unittest.cc",
-      "../browser/metrics/extensions_metrics_provider_unittest.cc",
-      "../browser/notifications/notification_system_observer_unittest.cc",
-      "../browser/renderer_context_menu/context_menu_content_type_unittest.cc",
-      "../browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config_unittest.cc",
-      "../browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_unittest.cc",
-      "../browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.cc",
-      "../browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.h",
-      "../browser/safe_search_api/safe_search_url_checker_unittest.cc",
-      "../browser/sync/glue/extensions_activity_monitor_unittest.cc",
-      "../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/leveldb_wrapper_unittest.cc",
-      "../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_on_disk_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/fake_remote_change_processor.cc",
-      "../browser/sync_file_system/fake_remote_change_processor.h",
-      "../browser/sync_file_system/file_change_unittest.cc",
-      "../browser/sync_file_system/local/canned_syncable_file_system.cc",
-      "../browser/sync_file_system/local/canned_syncable_file_system.h",
-      "../browser/sync_file_system/local/local_file_change_tracker_unittest.cc",
-      "../browser/sync_file_system/local/local_file_sync_context_unittest.cc",
-      "../browser/sync_file_system/local/local_file_sync_service_unittest.cc",
-      "../browser/sync_file_system/local/local_file_sync_status_unittest.cc",
-      "../browser/sync_file_system/local/mock_sync_status_observer.cc",
-      "../browser/sync_file_system/local/mock_sync_status_observer.h",
-      "../browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc",
-      "../browser/sync_file_system/local/syncable_file_system_unittest.cc",
-      "../browser/sync_file_system/logger_unittest.cc",
-      "../browser/sync_file_system/mock_local_change_processor.cc",
-      "../browser/sync_file_system/mock_local_change_processor.h",
-      "../browser/sync_file_system/mock_remote_change_processor.cc",
-      "../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_process_runner_unittest.cc",
-      "../browser/sync_file_system/syncable_file_system_util_unittest.cc",
-      "../browser/web_applications/web_app_mac_unittest.mm",
-      "../browser/web_applications/web_app_unittest.cc",
-      "../common/extensions/api/commands/commands_manifest_unittest.cc",
-      "../common/extensions/api/common_extension_api_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/storage/storage_schema_manifest_handler_unittest.cc",
-      "../common/extensions/chrome_extensions_client_unittest.cc",
-      "../common/extensions/chrome_manifest_url_handlers_unittest.cc",
-      "../common/extensions/command_unittest.cc",
-      "../common/extensions/extension_unittest.cc",
-      "../common/extensions/feature_switch_unittest.cc",
-      "../common/extensions/manifest_handlers/app_theme_color_manifest_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/settings_overrides_handler_unittest.cc",
-      "../common/extensions/manifest_handlers/ui_overrides_handler_unittest.cc",
-      "../common/extensions/manifest_tests/chrome_manifest_test.cc",
-      "../common/extensions/manifest_tests/chrome_manifest_test.h",
-      "../common/extensions/manifest_tests/extension_manifests_about_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_action_key_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",
-      "../common/extensions/manifest_tests/extension_manifests_default_extent_path_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_dummy_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_icons_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_isolatedapp_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_kiosk_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_launch_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_manifest_version_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_offline_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_old_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_options_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_override_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_portsinpermissions_unittest.cc",
-      "../common/extensions/manifest_tests/extension_manifests_requirements_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/permissions/chrome_permission_message_provider_unittest.cc",
-      "../common/extensions/permissions/chrome_permission_message_rules_unittest.cc",
-      "../common/extensions/permissions/media_galleries_permission_unittest.cc",
-      "../common/extensions/permissions/permission_set_unittest.cc",
-      "../common/extensions/permissions/permissions_data_unittest.cc",
-      "../common/extensions/permissions/settings_override_permission_unittest.cc",
-      "../common/extensions/sync_type_unittest.cc",
-      "../renderer/extensions/chrome_native_extension_bindings_system_unittest.cc",
-      "../renderer/extensions/custom_types_unittest.cc",
-      "../renderer/extensions/extension_hooks_delegate_unittest.cc",
-      "../renderer/extensions/extension_localization_peer_unittest.cc",
-      "../renderer/extensions/extension_process_policy_unittest.cc",
-      "../renderer/extensions/i18n_hooks_delegate_unittest.cc",
-      "../renderer/extensions/renderer_permissions_policy_delegate_unittest.cc",
-      "../renderer/extensions/tabs_hooks_delegate_unittest.cc",
-      "../renderer/media/cast_ipc_dispatcher_unittest.cc",
-      "../utility/image_writer/image_writer_unittest.cc",
-    ]
-    deps += [
-      "//chrome/common/extensions/api",
-      "//extensions:extensions_resources",
-      "//extensions/browser:test_support",
-      "//extensions/common",
-      "//extensions/renderer:unit_test_support",
-      "//extensions/strings",
-      "//google_apis",
-      "//media/cast:test_support",
+    if (enable_captive_portal_detection) {
+      sources += [
+        "../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",
+      ]
+    }
+    if (enable_session_service) {
+      sources += [
+        "../browser/sessions/session_restore_observer_unittest.cc",
+        "../browser/sessions/session_restore_stats_collector_unittest.cc",
+        "../browser/sessions/session_service_unittest.cc",
+        "../browser/sessions/tab_loader_unittest.cc",
+      ]
 
-      # This will add all of the unit tests for the schema compiler to this
-      # target.
-      "//tools/json_schema_compiler/test:unit_tests",
-    ]
-    if (enable_service_discovery) {
-      sources += [ "../browser/extensions/api/mdns/mdns_api_unittest.cc" ]
+      if (is_mac && !mac_views_browser) {
+        sources += [
+          "../browser/ui/startup/session_crashed_infobar_delegate_unittest.cc",
+        ]
+      }
     }
-    if (is_win) {
-      sources +=
-          [ "../browser/extensions/external_registry_loader_win_unittest.cc" ]
+    if (enable_webrtc) {
+      sources += [
+        "../browser/media/webrtc/webrtc_log_uploader_unittest.cc",
+        "../browser/media/webrtc/webrtc_rtp_dump_handler_unittest.cc",
+        "../browser/media/webrtc/webrtc_rtp_dump_writer_unittest.cc",
+        "../renderer/media/chrome_webrtc_log_message_delegate_unittest.cc",
+      ]
     }
     if (is_chromeos) {
+      deps += [
+        "//chrome/browser/chromeos:unit_tests",
+        "//chromeos/ime:gencode",
+      ]
+      sources -=
+          [ "../browser/policy/cloud/user_policy_signin_service_unittest.cc" ]
       sources += [
-        "../browser/chromeos/login/easy_unlock/easy_unlock_app_manager_unittest.cc",
-        "../browser/chromeos/login/easy_unlock/easy_unlock_auth_attempt_unittest.cc",
-        "../browser/chromeos/login/easy_unlock/easy_unlock_notification_controller_chromeos_unittest.cc",
-        "../browser/chromeos/login/easy_unlock/easy_unlock_screenlock_state_handler_unittest.cc",
-        "../browser/chromeos/login/easy_unlock/easy_unlock_service_unittest_chromeos.cc",
-        "../browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc",
-        "../browser/extensions/api/file_system/consent_provider_unittest.cc",
+        "base/ash_test_environment_chrome.cc",
+        "base/ash_test_environment_chrome.h",
       ]
+    }
+    if (use_x11) {
+      deps += [ "//ui/events/devices" ]
     } else {
-      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",
+      sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
+    }
+    if (use_gnome_keyring && current_cpu == "x64") {
+      # Only add this test for 64 bit builds because otherwise we need the 32
+      # bit library on 64 bit systems when running this test.
+      sources +=
+          [ "../browser/password_manager/native_backend_gnome_x_unittest.cc" ]
+      configs += [
+        "//components/os_crypt:gnome_keyring",
+        "//components/os_crypt:gnome_keyring_direct",
       ]
     }
-  }
-  if (use_aura) {
-    deps += [
-      "//ui/aura:test_support",
-      "//ui/views:test_support",
-      "//ui/wm",
-    ]
-  }
-  if (!is_chromeos && is_linux) {
-    sources += [
-      "../browser/password_manager/native_backend_kwallet_x_unittest.cc",
-      "../browser/shell_integration_linux_unittest.cc",
-      "../browser/ui/input_method/input_method_engine_unittest.cc",
-    ]
-  }
-
-  if (is_android || is_chromeos) {
-    sources += [ "../browser/media/protected_media_identifier_permission_context_unittest.cc" ]
-  } else {
-    sources += [
-      "../browser/lifetime/switch_utils_unittest.cc",
-      "../browser/net/disk_cache_dir_policy_handler_unittest.cc",
-      "../browser/profiles/profile_list_desktop_unittest.cc",
-      "../browser/profiles/profile_statistics_unittest.cc",
-      "../browser/ui/startup/startup_browser_creator_impl_unittest.cc",
-      "../browser/ui/startup/startup_tab_provider_unittest.cc",
-    ]
-  }
-  if (use_gio) {
-    configs += [ "//build/linux:gio_config" ]
-  }
-  if (!is_chromeos && !use_ozone && is_linux) {
-    deps += [ "//chrome/browser/ui/libgtkui" ]
-  }
-
-  if (enable_mdns) {
-    sources += [
-      "../browser/local_discovery/local_domain_resolver_unittest.cc",
-      "../browser/local_discovery/service_discovery_client_unittest.cc",
-      "../browser/printing/cloud_print/privet_device_lister_unittest.cc",
-      "../browser/printing/cloud_print/privet_local_printer_lister_unittest.cc",
-    ]
-  }
-  if (enable_service_discovery) {
-    sources += [
-      "../browser/devtools/device/cast_device_provider_unittest.cc",
-      "../browser/local_discovery/service_discovery_client_mac_unittest.mm",
-      "../browser/printing/cloud_print/cloud_print_printer_list_unittest.cc",
-      "../browser/printing/cloud_print/gcd_api_flow_unittest.cc",
-      "../browser/printing/cloud_print/privet_confirm_api_flow_unittest.cc",
-      "../browser/printing/cloud_print/privet_http_unittest.cc",
-      "../browser/printing/cloud_print/privet_notifications_unittest.cc",
-      "../browser/printing/cloud_print/privet_url_fetcher_unittest.cc",
-    ]
-  }
-
-  if (safe_browsing_mode > 0) {
-    sources += [
-      "../browser/safe_browsing/certificate_reporting_service_unittest.cc",
-      "../browser/safe_browsing/safe_browsing_blocking_page_unittest.cc",
-      "../browser/safe_browsing/threat_details_unittest.cc",
-      "../browser/safe_browsing/ui_manager_unittest.cc",
-      "../common/safe_browsing/file_type_policies_test_util.cc",
-      "../common/safe_browsing/file_type_policies_test_util.h",
-      "../common/safe_browsing/file_type_policies_unittest.cc",
-    ]
-  }
-  if (safe_browsing_mode == 1) {
-    # TODO(sgurun): enable tests for safe_browsing==2.
-    sources += [
-      "../browser/safe_browsing/browser_feature_extractor_unittest.cc",
-      "../browser/safe_browsing/chrome_password_protection_service_unittest.cc",
-      "../browser/safe_browsing/chunk_range_unittest.cc",
-      "../browser/safe_browsing/client_side_detection_host_unittest.cc",
-      "../browser/safe_browsing/client_side_detection_service_unittest.cc",
-      "../browser/safe_browsing/client_side_model_loader_unittest.cc",
-      "../browser/safe_browsing/download_protection/check_client_download_request_unittest.cc",
-      "../browser/safe_browsing/download_protection/disk_image_type_sniffer_mac_unittest.cc",
-      "../browser/safe_browsing/download_protection/download_feedback_service_unittest.cc",
-      "../browser/safe_browsing/download_protection/download_feedback_unittest.cc",
-      "../browser/safe_browsing/download_protection/download_protection_service_unittest.cc",
-      "../browser/safe_browsing/download_protection/path_sanitizer_unittest.cc",
-      "../browser/safe_browsing/download_protection/two_phase_uploader_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/binary_integrity_incident_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/environment_data_collection_win_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/incident_report_uploader_impl_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/mock_incident_receiver.cc",
-      "../browser/safe_browsing/incident_reporting/mock_incident_receiver.h",
-      "../browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.cc",
-      "../browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.h",
-      "../browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/platform_state_store_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/platform_state_store_win_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/resource_request_detector_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/state_store_unittest.cc",
-      "../browser/safe_browsing/incident_reporting/tracked_preference_incident_unittest.cc",
-      "../browser/safe_browsing/local_database_manager_unittest.cc",
-      "../browser/safe_browsing/local_two_phase_testserver.cc",
-      "../browser/safe_browsing/local_two_phase_testserver.h",
-      "../browser/safe_browsing/notification_image_reporter_unittest.cc",
-      "../browser/safe_browsing/protocol_manager_unittest.cc",
-      "../browser/safe_browsing/protocol_parser_unittest.cc",
-      "../browser/safe_browsing/safe_browsing_database_unittest.cc",
-      "../browser/safe_browsing/safe_browsing_navigation_observer_unittest.cc",
-      "../browser/safe_browsing/safe_browsing_store_file_unittest.cc",
-      "../browser/safe_browsing/safe_browsing_store_unittest.cc",
-      "../browser/safe_browsing/signature_evaluator_mac_unittest.cc",
-      "../common/safe_browsing/binary_feature_extractor_mac_unittest.cc",
-      "../common/safe_browsing/binary_feature_extractor_unittest.cc",
-      "../common/safe_browsing/binary_feature_extractor_win_unittest.cc",
-      "../common/safe_browsing/download_protection_util_unittest.cc",
-      "../common/safe_browsing/ipc_protobuf_message_test_messages.h",
-      "../common/safe_browsing/ipc_protobuf_message_unittest.cc",
-      "../common/safe_browsing/mach_o_image_reader_mac_unittest.cc",
-      "../common/safe_browsing/pe_image_reader_win_unittest.cc",
-      "../renderer/safe_browsing/features_unittest.cc",
-      "../renderer/safe_browsing/murmurhash3_util_unittest.cc",
-      "../renderer/safe_browsing/phishing_term_feature_extractor_unittest.cc",
-      "../renderer/safe_browsing/phishing_url_feature_extractor_unittest.cc",
-      "../renderer/safe_browsing/scorer_unittest.cc",
-      "../utility/safe_browsing/mac/dmg_test_utils.cc",
-      "../utility/safe_browsing/mac/dmg_test_utils.h",
-      "../utility/safe_browsing/mac/hfs_unittest.cc",
-      "../utility/safe_browsing/mac/read_stream_unittest.cc",
-      "../utility/safe_browsing/mac/udif_unittest.cc",
-    ]
-    deps += [
-      ":test_proto",
-      "//chrome/services/file_util/public/cpp:unit_tests",
-      "//components/safe_browsing:base_ping_manager_unittest",
-      "//components/safe_browsing/browser:unittests",
-      "//components/safe_browsing/db:v4_test_util",
-      "//components/safe_browsing/renderer:websocket_sb_handshake_throttle_unittest",
-    ]
-
-    if (is_mac) {
-      deps += [ ":mac_safe_browsing_test_data" ]
-      data += [ "$root_out_dir/test_data/chrome/safe_browsing_dmg/" ]
+    if (is_linux && !is_chromeos && !use_ozone) {
+      sources +=
+          [ "../browser/password_manager/native_backend_libsecret_unittest.cc" ]
+      deps += [ "//third_party/libsecret" ]
     }
-  }
+    if (is_linux && use_aura) {
+      deps += [ "//ui/aura:test_support" ]
+      if (use_dbus) {
+        deps += [ "//dbus:test_support" ]
+      }
+    }
+    if (is_linux && is_chrome_branded && current_cpu == "x86") {
+      ldflags = [ "-Wl,--strip-debug" ]
+    }
+    if (is_mac) {
+      sources -= [
+        # This tests the function GetSpellCheckLanguages which is not used on
+        # Mac.
+        "../browser/spellchecker/spellcheck_service_unittest.cc",
+        "../browser/ui/tests/ui_gfx_image_unittest.cc",
 
-  if (enable_plugins) {
-    sources += [
-      "../browser/component_updater/component_installers_unittest.cc",
-      "../browser/metrics/chrome_stability_metrics_provider_unittest.cc",
-      "../browser/metrics/plugin_metrics_provider_unittest.cc",
-      "../browser/plugins/chrome_plugin_service_filter_unittest.cc",
-      "../browser/plugins/flash_download_interception_unittest.cc",
-      "../browser/plugins/flash_temporary_permission_tracker_unittest.cc",
-      "../browser/plugins/plugin_finder_unittest.cc",
-      "../browser/plugins/plugin_info_host_impl_unittest.cc",
-      "../browser/plugins/plugin_installer_unittest.cc",
-      "../browser/plugins/plugin_metadata_unittest.cc",
-      "../browser/plugins/plugin_prefs_unittest.cc",
-      "../common/pepper_permission_util_unittest.cc",
-    ]
-  }
+        # This tests Chrome's spellchecker which Mac doesn't use.
+        "../tools/convert_dict/convert_dict_unittest.cc",
+      ]
 
-  if (enable_print_preview) {
-    sources += [
-      "../browser/printing/print_job_unittest.cc",
-      "../browser/printing/print_preview_dialog_controller_unittest.cc",
-      "../browser/printing/print_preview_test.cc",
-      "../browser/printing/print_preview_test.h",
-      "../browser/printing/print_test_utils.cc",
-      "../browser/printing/print_test_utils.h",
-      "../browser/printing/print_view_manager_unittest.cc",
-      "../browser/printing/test_print_job.cc",
-      "../browser/printing/test_print_job.h",
-      "../browser/printing/test_printer_query.cc",
-      "../browser/printing/test_printer_query.h",
-      "../browser/ui/webui/print_preview/extension_printer_handler_unittest.cc",
-      "../browser/ui/webui/print_preview/pdf_printer_handler_unittest.cc",
-      "../browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc",
-      "../browser/ui/webui/print_preview/print_preview_handler_unittest.cc",
-      "../browser/ui/webui/print_preview/print_preview_ui_unittest.cc",
-      "../browser/ui/webui/print_preview/print_preview_utils_unittest.cc",
-    ]
+      # The test fetches resources which means Mac need the app bundle to exist
+      # on disk so it can pull from it.
+      deps += [
+        "//third_party/google_toolbox_for_mac",
+        "//third_party/ocmock",
+      ]
 
-    deps += [
-      "//ipc",
-      "//printing",
-      "//printing:test_support",
-    ]
+      sources +=
+          [ "../browser/ui/cocoa/applescript/apple_event_util_unittest.mm" ]
+
+      # TODO(ellyjones): remove this needless if (true). These files are
+      # test sources for the cocoa code; this block should be moved back inline at
+      # the place this variable is used below.
+      if (true) {
+        cocoa_test_sources = [
+          "../browser/ui/cocoa/accelerators_cocoa_unittest.mm",
+          "../browser/ui/cocoa/animatable_image_unittest.mm",
+          "../browser/ui/cocoa/animatable_view_unittest.mm",
+          "../browser/ui/cocoa/app_menu/app_menu_button_cell_unittest.mm",
+          "../browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm",
+          "../browser/ui/cocoa/app_menu/menu_tracked_root_view_unittest.mm",
+          "../browser/ui/cocoa/autofill/autofill_bubble_controller_unittest.mm",
+          "../browser/ui/cocoa/autofill/autofill_tooltip_controller_unittest.mm",
+          "../browser/ui/cocoa/autofill/credit_card_autofill_touch_bar_controller_unittest.mm",
+          "../browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm",
+          "../browser/ui/cocoa/background_gradient_view_unittest.mm",
+          "../browser/ui/cocoa/base_bubble_controller_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h",
+          "../browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell_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",
+          "../browser/ui/cocoa/browser_window_layout_unittest.mm",
+          "../browser/ui/cocoa/browser_window_touch_bar_unittest.mm",
+          "../browser/ui/cocoa/browser_window_utils_unittest.mm",
+          "../browser/ui/cocoa/bubble_anchor_helper_views_unittest.mm",
+          "../browser/ui/cocoa/bubble_view_unittest.mm",
+          "../browser/ui/cocoa/chrome_browser_window_unittest.mm",
+          "../browser/ui/cocoa/clickhold_button_cell_unittest.mm",
+          "../browser/ui/cocoa/color_panel_cocoa_unittest.mm",
+          "../browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm",
+          "../browser/ui/cocoa/constrained_window/constrained_window_alert_unittest.mm",
+          "../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/download/download_item_button_unittest.mm",
+          "../browser/ui/cocoa/download/download_item_cell_unittest.mm",
+          "../browser/ui/cocoa/download/download_item_controller_unittest.mm",
+          "../browser/ui/cocoa/download/download_shelf_controller_unittest.mm",
+          "../browser/ui/cocoa/download/download_shelf_mac_unittest.mm",
+          "../browser/ui/cocoa/download/download_shelf_view_cocoa_unittest.mm",
+          "../browser/ui/cocoa/download/download_util_mac_unittest.mm",
+          "../browser/ui/cocoa/download/md_download_item_view_unittest.mm",
+          "../browser/ui/cocoa/draggable_button_unittest.mm",
+          "../browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm",
+          "../browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm",
+          "../browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h",
+          "../browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm",
+          "../browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm",
+          "../browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm",
+          "../browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm",
+          "../browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm",
+          "../browser/ui/cocoa/find_bar/find_bar_bridge_unittest.mm",
+          "../browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm",
+          "../browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm",
+          "../browser/ui/cocoa/find_bar/find_bar_text_field_unittest.mm",
+          "../browser/ui/cocoa/find_bar/find_bar_view_unittest.mm",
+          "../browser/ui/cocoa/find_pasteboard_unittest.mm",
+          "../browser/ui/cocoa/first_run_dialog_controller_unittest.mm",
+          "../browser/ui/cocoa/floating_bar_backing_view_unittest.mm",
+          "../browser/ui/cocoa/framed_browser_window_unittest.mm",
+          "../browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller_unittest.mm",
+          "../browser/ui/cocoa/fullscreen_window_unittest.mm",
+          "../browser/ui/cocoa/gradient_button_cell_unittest.mm",
+          "../browser/ui/cocoa/harmony_button_unittest.mm",
+          "../browser/ui/cocoa/history_menu_bridge_unittest.mm",
+          "../browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm",
+          "../browser/ui/cocoa/history_overlay_controller_unittest.mm",
+          "../browser/ui/cocoa/hover_close_button_unittest.mm",
+          "../browser/ui/cocoa/hung_renderer_controller_unittest.mm",
+          "../browser/ui/cocoa/image_button_cell_unittest.mm",
+          "../browser/ui/cocoa/info_bubble_view_unittest.mm",
+          "../browser/ui/cocoa/info_bubble_window_unittest.mm",
+          "../browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm",
+          "../browser/ui/cocoa/infobars/infobar_background_view_unittest.mm",
+          "../browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm",
+          "../browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc",
+          "../browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h",
+          "../browser/ui/cocoa/infobars/translate_infobar_unittest.mm",
+          "../browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm",
+          "../browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm",
+          "../browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm",
+          "../browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.h",
+          "../browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.mm",
+          "../browser/ui/cocoa/location_bar/image_decoration_unittest.mm",
+          "../browser/ui/cocoa/location_bar/keyword_hint_decoration_unittest.mm",
+          "../browser/ui/cocoa/location_bar/location_bar_view_mac_unittest.mm",
+          "../browser/ui/cocoa/location_bar/manage_passwords_decoration_unittest.mm",
+          "../browser/ui/cocoa/location_bar/page_info_bubble_decoration_unittest.mm",
+          "../browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm",
+          "../browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm",
+          "../browser/ui/cocoa/md_hover_button_unittest.mm",
+          "../browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm",
+          "../browser/ui/cocoa/menu_button_unittest.mm",
+          "../browser/ui/cocoa/notifications/notification_builder_mac_unittest.mm",
+          "../browser/ui/cocoa/notifications/notification_response_builder_mac_unittest.mm",
+          "../browser/ui/cocoa/nsmenuitem_additions_unittest.mm",
+          "../browser/ui/cocoa/nsview_additions_unittest.mm",
+          "../browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm",
+          "../browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm",
+          "../browser/ui/cocoa/omnibox/omnibox_popup_separator_view_unittest.mm",
+          "../browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm",
+          "../browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm",
+          "../browser/ui/cocoa/page_info/page_info_bubble_controller_unittest.mm",
+          "../browser/ui/cocoa/page_info/permission_selector_button_unittest.mm",
+          "../browser/ui/cocoa/passwords/account_chooser_view_controller_unittest.mm",
+          "../browser/ui/cocoa/passwords/autosignin_prompt_view_controller_unittest.mm",
+          "../browser/ui/cocoa/passwords/base_passwords_controller_test.h",
+          "../browser/ui/cocoa/passwords/base_passwords_controller_test.mm",
+          "../browser/ui/cocoa/passwords/confirmation_password_saved_view_controller_unittest.mm",
+          "../browser/ui/cocoa/passwords/manage_passwords_view_controller_unittest.mm",
+          "../browser/ui/cocoa/passwords/passwords_bubble_cocoa_unittest.mm",
+          "../browser/ui/cocoa/passwords/passwords_bubble_controller_unittest.mm",
+          "../browser/ui/cocoa/passwords/passwords_list_view_controller_unittest.mm",
+          "../browser/ui/cocoa/passwords/save_pending_password_view_controller_unittest.mm",
+          "../browser/ui/cocoa/passwords/signin_promo_view_controller_unittest.mm",
+          "../browser/ui/cocoa/passwords/update_pending_password_view_controller_unittest.mm",
+          "../browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm",
+          "../browser/ui/cocoa/profiles/avatar_button_unittest.mm",
+          "../browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm",
+          "../browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm",
+          "../browser/ui/cocoa/profiles/user_manager_mac_unittest.mm",
+          "../browser/ui/cocoa/scoped_menu_bar_lock_unittest.mm",
+          "../browser/ui/cocoa/screen_capture_notification_ui_cocoa_unittest.mm",
+          "../browser/ui/cocoa/spinner_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",
+          "../browser/ui/cocoa/styled_text_field_unittest.mm",
+          "../browser/ui/cocoa/tab_contents/sad_tab_mac_unittest.mm",
+          "../browser/ui/cocoa/tabbed_browser_window_unittest.mm",
+          "../browser/ui/cocoa/tabs/alert_indicator_button_cocoa_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/test/cocoa_profile_test.h",
+          "../browser/ui/cocoa/test/cocoa_profile_test.mm",
+          "../browser/ui/cocoa/test/run_loop_testing_unittest.mm",
+          "../browser/ui/cocoa/test/styled_text_field_test_helper.h",
+          "../browser/ui/cocoa/test/styled_text_field_test_helper.mm",
+          "../browser/ui/cocoa/toolbar/app_toolbar_button_cell_unittest.mm",
+          "../browser/ui/cocoa/toolbar/app_toolbar_button_unittest.mm",
+          "../browser/ui/cocoa/toolbar/reload_button_unittest_cocoa.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/translate/translate_bubble_controller_unittest.mm",
+          "../browser/ui/cocoa/url_drop_target_unittest.mm",
+          "../browser/ui/cocoa/vertical_gradient_view_unittest.mm",
+          "../browser/ui/cocoa/view_resizer_pong.h",
+          "../browser/ui/cocoa/view_resizer_pong.mm",
+          "../browser/ui/cocoa/window_size_autosaver_unittest.mm",
+        ]
+      }
 
-    if (!is_chromeos) {
-      sources += [
-        "../browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc",
-        "../common/cloud_print/cloud_print_helpers_unittest.cc",
-        "../common/service_process_util_mac_unittest.mm",
-        "../common/service_process_util_unittest.cc",
-        "../service/cloud_print/cloud_print_service_helpers_unittest.cc",
-        "../service/cloud_print/cloud_print_token_store_unittest.cc",
-        "../service/cloud_print/cloud_print_url_fetcher_unittest.cc",
-        "../service/cloud_print/connector_settings_unittest.cc",
-        "../service/cloud_print/printer_job_handler_unittest.cc",
-        "../service/cloud_print/printer_job_queue_handler_unittest.cc",
-        "../service/service_ipc_server_unittest.cc",
-        "../service/service_process_prefs_unittest.cc",
-      ]
-    }
-  }
+      sources += cocoa_test_sources
 
-  if (enable_captive_portal_detection) {
-    sources += [
-      "../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",
-    ]
-  }
-  if (enable_session_service) {
-    sources += [
-      "../browser/sessions/session_restore_observer_unittest.cc",
-      "../browser/sessions/session_restore_stats_collector_unittest.cc",
-      "../browser/sessions/session_service_unittest.cc",
-      "../browser/sessions/tab_loader_unittest.cc",
-    ]
+      if (mac_views_browser) {
+        sources -= [
+          "../browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm",
+          "../browser/ui/cocoa/bookmarks/bookmark_editor_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/extensions/chooser_dialog_cocoa_controller_unittest.mm",
+          "../browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm",
+          "../browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm",
+          "../browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm",
+          "../browser/ui/cocoa/page_info/page_info_bubble_controller_unittest.mm",
+        ]
+      }
 
-    if (is_mac && !mac_views_browser) {
-      sources += [
-        "../browser/ui/startup/session_crashed_infobar_delegate_unittest.cc",
+      # TODO(mark): We really want this for all non-static library targets,
+      # but when we tried to pull it up to the common.gypi level, it broke
+      # other things like the ui and startup tests. *shrug*
+      ldflags = [ "-Wl,-ObjC" ]
+    }
+    if (!is_mac) {
+      deps += [
+        "//chrome:packed_resources",
+        "//chrome/tools/convert_dict:lib",
+        "//third_party/hunspell",
       ]
     }
-  }
-  if (enable_webrtc) {
-    sources += [
-      "../browser/media/webrtc/webrtc_log_uploader_unittest.cc",
-      "../browser/media/webrtc/webrtc_rtp_dump_handler_unittest.cc",
-      "../browser/media/webrtc/webrtc_rtp_dump_writer_unittest.cc",
-      "../renderer/media/chrome_webrtc_log_message_delegate_unittest.cc",
-    ]
-  }
-  if (is_chromeos) {
-    deps += [
-      "//chrome/browser/chromeos:unit_tests",
-      "//chromeos/ime:gencode",
-    ]
-    sources -=
-        [ "../browser/policy/cloud/user_policy_signin_service_unittest.cc" ]
-    sources += [
-      "base/ash_test_environment_chrome.cc",
-      "base/ash_test_environment_chrome.h",
-    ]
-  }
-  if (use_x11) {
-    deps += [ "//ui/events/devices" ]
-  } else {
-    sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
-  }
-  if (use_gnome_keyring && current_cpu == "x64") {
-    # Only add this test for 64 bit builds because otherwise we need the 32
-    # bit library on 64 bit systems when running this test.
-    sources +=
-        [ "../browser/password_manager/native_backend_gnome_x_unittest.cc" ]
-    configs += [
-      "//components/os_crypt:gnome_keyring",
-      "//components/os_crypt:gnome_keyring_direct",
-    ]
-  }
-  if (is_linux && !is_chromeos && !use_ozone) {
-    sources +=
-        [ "../browser/password_manager/native_backend_libsecret_unittest.cc" ]
-    deps += [ "//third_party/libsecret" ]
-  }
-  if (is_linux && use_aura) {
-    deps += [ "//ui/aura:test_support" ]
-    if (use_dbus) {
-      deps += [ "//dbus:test_support" ]
+    if (is_win || is_mac || is_chromeos) {
+      sources += [ "../browser/extensions/api/networking_private/networking_private_crypto_unittest.cc" ]
     }
-  }
-  if (is_linux && is_chrome_branded && current_cpu == "x86") {
-    ldflags = [ "-Wl,--strip-debug" ]
-  }
-  if (is_mac) {
-    sources -= [
-      # This tests the function GetSpellCheckLanguages which is not used on
-      # Mac.
-      "../browser/spellchecker/spellcheck_service_unittest.cc",
-      "../browser/ui/tests/ui_gfx_image_unittest.cc",
-
-      # This tests Chrome's spellchecker which Mac doesn't use.
-      "../tools/convert_dict/convert_dict_unittest.cc",
-    ]
+    if (enable_rlz_support) {
+      sources += [ "../browser/rlz/chrome_rlz_tracker_delegate_unittest.cc" ]
+      deps += [
+        "//chrome/browser:rlz",
+        "//components/rlz",
+        "//rlz:test_support",
+      ]
+    }
+    if (is_win) {
+      if (!is_component_build) {
+        # The PDB gets too large for incremental linking.
+        configs -= [ "//build/config/win:default_incremental_linking" ]
+        configs +=
+            [ "//build/config/win:default_large_module_incremental_linking" ]
+      }
 
-    # The test fetches resources which means Mac need the app bundle to exist
-    # on disk so it can pull from it.
-    deps += [
-      "//third_party/google_toolbox_for_mac",
-      "//third_party/ocmock",
-    ]
+      sources += [
+        "../browser/notifications/notification_image_retainer_unittest.cc",
+        "../browser/notifications/notification_template_builder_unittest.cc",
+        "../browser/ui/desktop_ios_promotion/desktop_ios_promotion_bubble_controller_unittest.cc",
+        "../browser/ui/desktop_ios_promotion/desktop_ios_promotion_util_unittest.cc",
+        "../browser/ui/desktop_ios_promotion/sms_service_unittest.cc",
+        "../browser/ui/input_method/input_method_engine_unittest.cc",
+        "../test/data/resource.rc",
+      ]
+      deps += [
+        "//chrome:other_version",
+        "//chrome/app:chrome_dll_resources",
+        "//chrome/install_static:install_static_util",
+        "//chrome/installer/util:strings",
+        "//chrome_elf:blacklist_test_dll_1",
+        "//third_party/iaccessible2",
+        "//third_party/isimpledom",
+        "//third_party/wtl",
+        "//ui/resources",
+      ]
+      data_deps += [
+        "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_1",
+        "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_2",
+        ":conflicts_dll",
+      ]
 
-    sources +=
-        [ "../browser/ui/cocoa/applescript/apple_event_util_unittest.mm" ]
-
-    # TODO(ellyjones): remove this needless if (true). These files are
-    # test sources for the cocoa code; this block should be moved back inline at
-    # the place this variable is used below.
-    if (true) {
-      cocoa_test_sources = [
-        "../browser/ui/cocoa/accelerators_cocoa_unittest.mm",
-        "../browser/ui/cocoa/animatable_image_unittest.mm",
-        "../browser/ui/cocoa/animatable_view_unittest.mm",
-        "../browser/ui/cocoa/app_menu/app_menu_button_cell_unittest.mm",
-        "../browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm",
-        "../browser/ui/cocoa/app_menu/menu_tracked_root_view_unittest.mm",
-        "../browser/ui/cocoa/autofill/autofill_bubble_controller_unittest.mm",
-        "../browser/ui/cocoa/autofill/autofill_tooltip_controller_unittest.mm",
-        "../browser/ui/cocoa/autofill/credit_card_autofill_touch_bar_controller_unittest.mm",
-        "../browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm",
-        "../browser/ui/cocoa/background_gradient_view_unittest.mm",
-        "../browser/ui/cocoa/base_bubble_controller_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h",
-        "../browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell_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",
-        "../browser/ui/cocoa/browser_window_layout_unittest.mm",
-        "../browser/ui/cocoa/browser_window_touch_bar_unittest.mm",
-        "../browser/ui/cocoa/browser_window_utils_unittest.mm",
-        "../browser/ui/cocoa/bubble_anchor_helper_views_unittest.mm",
-        "../browser/ui/cocoa/bubble_view_unittest.mm",
-        "../browser/ui/cocoa/chrome_browser_window_unittest.mm",
-        "../browser/ui/cocoa/clickhold_button_cell_unittest.mm",
-        "../browser/ui/cocoa/color_panel_cocoa_unittest.mm",
-        "../browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm",
-        "../browser/ui/cocoa/constrained_window/constrained_window_alert_unittest.mm",
-        "../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/download/download_item_button_unittest.mm",
-        "../browser/ui/cocoa/download/download_item_cell_unittest.mm",
-        "../browser/ui/cocoa/download/download_item_controller_unittest.mm",
-        "../browser/ui/cocoa/download/download_shelf_controller_unittest.mm",
-        "../browser/ui/cocoa/download/download_shelf_mac_unittest.mm",
-        "../browser/ui/cocoa/download/download_shelf_view_cocoa_unittest.mm",
-        "../browser/ui/cocoa/download/download_util_mac_unittest.mm",
-        "../browser/ui/cocoa/download/md_download_item_view_unittest.mm",
-        "../browser/ui/cocoa/draggable_button_unittest.mm",
-        "../browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm",
-        "../browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm",
-        "../browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h",
-        "../browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm",
-        "../browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm",
-        "../browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm",
-        "../browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm",
-        "../browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm",
-        "../browser/ui/cocoa/find_bar/find_bar_bridge_unittest.mm",
-        "../browser/ui/cocoa/find_bar/find_bar_cocoa_controller_unittest.mm",
-        "../browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm",
-        "../browser/ui/cocoa/find_bar/find_bar_text_field_unittest.mm",
-        "../browser/ui/cocoa/find_bar/find_bar_view_unittest.mm",
-        "../browser/ui/cocoa/find_pasteboard_unittest.mm",
-        "../browser/ui/cocoa/first_run_dialog_controller_unittest.mm",
-        "../browser/ui/cocoa/floating_bar_backing_view_unittest.mm",
-        "../browser/ui/cocoa/framed_browser_window_unittest.mm",
-        "../browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller_unittest.mm",
-        "../browser/ui/cocoa/fullscreen_window_unittest.mm",
-        "../browser/ui/cocoa/gradient_button_cell_unittest.mm",
-        "../browser/ui/cocoa/harmony_button_unittest.mm",
-        "../browser/ui/cocoa/history_menu_bridge_unittest.mm",
-        "../browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm",
-        "../browser/ui/cocoa/history_overlay_controller_unittest.mm",
-        "../browser/ui/cocoa/hover_close_button_unittest.mm",
-        "../browser/ui/cocoa/hung_renderer_controller_unittest.mm",
-        "../browser/ui/cocoa/image_button_cell_unittest.mm",
-        "../browser/ui/cocoa/info_bubble_view_unittest.mm",
-        "../browser/ui/cocoa/info_bubble_window_unittest.mm",
-        "../browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm",
-        "../browser/ui/cocoa/infobars/infobar_background_view_unittest.mm",
-        "../browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm",
-        "../browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc",
-        "../browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h",
-        "../browser/ui/cocoa/infobars/translate_infobar_unittest.mm",
-        "../browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm",
-        "../browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm",
-        "../browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm",
-        "../browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.h",
-        "../browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.mm",
-        "../browser/ui/cocoa/location_bar/image_decoration_unittest.mm",
-        "../browser/ui/cocoa/location_bar/keyword_hint_decoration_unittest.mm",
-        "../browser/ui/cocoa/location_bar/location_bar_view_mac_unittest.mm",
-        "../browser/ui/cocoa/location_bar/manage_passwords_decoration_unittest.mm",
-        "../browser/ui/cocoa/location_bar/page_info_bubble_decoration_unittest.mm",
-        "../browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm",
-        "../browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm",
-        "../browser/ui/cocoa/md_hover_button_unittest.mm",
-        "../browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm",
-        "../browser/ui/cocoa/menu_button_unittest.mm",
-        "../browser/ui/cocoa/notifications/notification_builder_mac_unittest.mm",
-        "../browser/ui/cocoa/notifications/notification_response_builder_mac_unittest.mm",
-        "../browser/ui/cocoa/nsmenuitem_additions_unittest.mm",
-        "../browser/ui/cocoa/nsview_additions_unittest.mm",
-        "../browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm",
-        "../browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm",
-        "../browser/ui/cocoa/omnibox/omnibox_popup_separator_view_unittest.mm",
-        "../browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm",
-        "../browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm",
-        "../browser/ui/cocoa/page_info/page_info_bubble_controller_unittest.mm",
-        "../browser/ui/cocoa/page_info/permission_selector_button_unittest.mm",
-        "../browser/ui/cocoa/passwords/account_chooser_view_controller_unittest.mm",
-        "../browser/ui/cocoa/passwords/autosignin_prompt_view_controller_unittest.mm",
-        "../browser/ui/cocoa/passwords/base_passwords_controller_test.h",
-        "../browser/ui/cocoa/passwords/base_passwords_controller_test.mm",
-        "../browser/ui/cocoa/passwords/confirmation_password_saved_view_controller_unittest.mm",
-        "../browser/ui/cocoa/passwords/manage_passwords_view_controller_unittest.mm",
-        "../browser/ui/cocoa/passwords/passwords_bubble_cocoa_unittest.mm",
-        "../browser/ui/cocoa/passwords/passwords_bubble_controller_unittest.mm",
-        "../browser/ui/cocoa/passwords/passwords_list_view_controller_unittest.mm",
-        "../browser/ui/cocoa/passwords/save_pending_password_view_controller_unittest.mm",
-        "../browser/ui/cocoa/passwords/signin_promo_view_controller_unittest.mm",
-        "../browser/ui/cocoa/passwords/update_pending_password_view_controller_unittest.mm",
-        "../browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm",
-        "../browser/ui/cocoa/profiles/avatar_button_unittest.mm",
-        "../browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm",
-        "../browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm",
-        "../browser/ui/cocoa/profiles/user_manager_mac_unittest.mm",
-        "../browser/ui/cocoa/scoped_menu_bar_lock_unittest.mm",
-        "../browser/ui/cocoa/screen_capture_notification_ui_cocoa_unittest.mm",
-        "../browser/ui/cocoa/spinner_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",
-        "../browser/ui/cocoa/styled_text_field_unittest.mm",
-        "../browser/ui/cocoa/tab_contents/sad_tab_mac_unittest.mm",
-        "../browser/ui/cocoa/tabbed_browser_window_unittest.mm",
-        "../browser/ui/cocoa/tabs/alert_indicator_button_cocoa_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/test/cocoa_profile_test.h",
-        "../browser/ui/cocoa/test/cocoa_profile_test.mm",
-        "../browser/ui/cocoa/test/run_loop_testing_unittest.mm",
-        "../browser/ui/cocoa/test/styled_text_field_test_helper.h",
-        "../browser/ui/cocoa/test/styled_text_field_test_helper.mm",
-        "../browser/ui/cocoa/toolbar/app_toolbar_button_cell_unittest.mm",
-        "../browser/ui/cocoa/toolbar/app_toolbar_button_unittest.mm",
-        "../browser/ui/cocoa/toolbar/reload_button_unittest_cocoa.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/translate/translate_bubble_controller_unittest.mm",
-        "../browser/ui/cocoa/url_drop_target_unittest.mm",
-        "../browser/ui/cocoa/vertical_gradient_view_unittest.mm",
-        "../browser/ui/cocoa/view_resizer_pong.h",
-        "../browser/ui/cocoa/view_resizer_pong.mm",
-        "../browser/ui/cocoa/window_size_autosaver_unittest.mm",
+      libs = [
+        "comsupp.lib",
+        "oleacc.lib",
+        "rpcrt4.lib",
+        "runtimeobject.lib",
+        "urlmon.lib",
+        "winmm.lib",
       ]
-    }
 
-    sources += cocoa_test_sources
+      ldflags = [
+        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
+        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
+        "/DELAYLOAD:api-ms-win-core-winrt-string-l1-1-0.dll",
+      ]
 
-    if (mac_views_browser) {
+      if (is_chrome_branded) {
+        sources += [
+          "../browser/conflicts/installed_programs_win_unittest.cc",
+          "../browser/conflicts/module_list_filter_win_unittest.cc",
+          "../browser/conflicts/problematic_programs_updater_win_unittest.cc",
+          "../browser/conflicts/registry_key_watcher_win_unittest.cc",
+          "../browser/google/google_update_win_unittest.cc",
+        ]
+      }
+    }
+    if (is_android) {
       sources -= [
-        "../browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm",
-        "../browser/ui/cocoa/bookmarks/bookmark_editor_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/extensions/chooser_dialog_cocoa_controller_unittest.mm",
-        "../browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm",
-        "../browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm",
-        "../browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm",
-        "../browser/ui/cocoa/page_info/page_info_bubble_controller_unittest.mm",
+        "../browser/ui/bookmarks/bookmark_ui_utils_desktop_unittest.cc",
+        "../browser/ui/sync/sync_promo_ui_unittest.cc",
+        "../browser/ui/sync/tab_contents_synced_tab_delegate_unittest.cc",
       ]
     }
-
-    # TODO(mark): We really want this for all non-static library targets,
-    # but when we tried to pull it up to the common.gypi level, it broke
-    # other things like the ui and startup tests. *shrug*
-    ldflags = [ "-Wl,-ObjC" ]
-  }
-  if (!is_mac) {
-    deps += [
-      "//chrome:packed_resources",
-      "//chrome/tools/convert_dict:lib",
-      "//third_party/hunspell",
-    ]
-  }
-  if (is_win || is_mac || is_chromeos) {
-    sources += [ "../browser/extensions/api/networking_private/networking_private_crypto_unittest.cc" ]
-  }
-  if (enable_rlz_support) {
-    sources += [ "../browser/rlz/chrome_rlz_tracker_delegate_unittest.cc" ]
-    deps += [
-      "//chrome/browser:rlz",
-      "//components/rlz",
-      "//rlz:test_support",
-    ]
-  }
-  if (is_win) {
-    if (!is_component_build) {
-      # The PDB gets too large for incremental linking.
-      configs -= [ "//build/config/win:default_incremental_linking" ]
-      configs +=
-          [ "//build/config/win:default_large_module_incremental_linking" ]
+    if (!is_android && !is_chromeos) {
+      sources += [
+        "../browser/media/webrtc/native_desktop_media_list_unittest.cc",
+        "../browser/metrics/desktop_session_duration/desktop_session_duration_tracker_unittest.cc",
+        "../browser/metrics/upgrade_metrics_provider_unittest.cc",
+        "../browser/signin/force_signin_verifier_unittest.cc",
+        "../browser/signin/signin_global_error_unittest.cc",
+        "../browser/signin/signin_ui_util_unittest.cc",
+        "../browser/signin/signin_util_unittest.cc",
+        "../browser/ui/webui/signin/signin_create_profile_handler_unittest.cc",
+        "../browser/ui/webui/signin/signin_error_handler_unittest.cc",
+        "../browser/ui/webui/signin/sync_confirmation_handler_unittest.cc",
+        "../browser/upgrade_detector_impl_unittest.cc",
+      ]
     }
+    if (toolkit_views) {
+      deps += [
+        "//components/web_modal:test_support",
+        "//ui/views",
+        "//ui/views:test_support",
+      ]
+      sources += [
+        "../../ui/views/controls/webview/webview_unittest.cc",
+        "../browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc",
+        "../browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc",
+        "../browser/ui/views/confirm_bubble_views_unittest.cc",
+        "../browser/ui/views/fullscreen_control/fullscreen_control_popup_unittest.cc",
+        "../browser/ui/views/global_error_bubble_view_unittest.cc",
+        "../browser/ui/views/harmony/layout_provider_unittest.cc",
+        "../browser/ui/views/hover_button_unittest.cc",
+        "../browser/ui/views/page_info/page_info_bubble_view_unittest.cc",
+        "../browser/ui/views/payments/payment_request_item_list_unittest.cc",
+        "../browser/ui/views/payments/validating_textfield_unittest.cc",
+        "../browser/ui/views/payments/view_stack_unittest.cc",
+      ]
+      if (is_chromeos) {
+        sources += [ "../browser/ui/views/ime_driver/input_method_bridge_chromeos_unittest.cc" ]
+      } else {
+        sources += [
+          "../browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc",
+          "../browser/ui/views/relaunch_notification/relaunch_required_dialog_view_unittest.cc",
+        ]
+      }
+      if (!is_chromeos && (!is_mac || mac_views_browser)) {
+        sources += [
+          "../browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc",
+          "../browser/ui/views/sync/one_click_signin_dialog_view_unittest.cc",
+        ]
+      }
+      if (enable_native_window_nav_buttons) {
+        sources += [ "../browser/ui/views/frame/desktop_linux_browser_frame_view_layout_unittest.cc" ]
+      }
+      if (!is_mac || mac_views_browser) {
+        sources += [
+          "../browser/ui/views/accelerator_table_unittest.cc",
+          "../browser/ui/views/accelerator_table_unittest_mac.mm",
+          "../browser/ui/views/autofill/autofill_popup_view_native_views_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_unittest.cc",
+          "../browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc",
+          "../browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc",
+          "../browser/ui/views/device_chooser_content_view_unittest.cc",
+          "../browser/ui/views/download/download_item_view_unittest.cc",
+          "../browser/ui/views/extensions/chooser_dialog_view_unittest.cc",
+          "../browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc",
+          "../browser/ui/views/frame/browser_non_client_frame_view_unittest.cc",
+          "../browser/ui/views/frame/browser_view_layout_unittest.cc",
+          "../browser/ui/views/frame/browser_view_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/infobars/infobar_view_unittest.cc",
+          "../browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc",
+          "../browser/ui/views/media_router/web_contents_display_observer_view_unittest.cc",
+          "../browser/ui/views/omnibox/omnibox_result_view_unittest.cc",
+          "../browser/ui/views/omnibox/omnibox_view_views_unittest.cc",
+          "../browser/ui/views/status_icons/status_tray_win_unittest.cc",
+          "../browser/ui/views/sync/bubble_sync_promo_view_unittest.cc",
+          "../browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_unittest.cc",
+          "../browser/ui/views/tabs/alert_indicator_button_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",
+          "../browser/ui/views/tabs/tab_strip_layout_unittest.cc",
+          "../browser/ui/views/tabs/tab_strip_unittest.cc",
+          "../browser/ui/views/tabs/tab_unittest.cc",
+          "../browser/ui/views/toolbar/reload_button_unittest.cc",
+          "../browser/ui/views/toolbar/toolbar_action_view_unittest.cc",
+          "../browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc",
+          "../browser/ui/views/translate/translate_bubble_view_unittest.cc",
+          "../browser/ui/views/webshare/webshare_target_picker_view_unittest.cc",
+        ]
+      }
+      if ((is_linux && !is_chromeos) || is_win) {
+        sources += [ "../browser/ui/views/message_center/popups_only_ui_delegate_unittest.cc" ]
+      }
+      if (use_aura) {
+        sources += [
+          "../browser/ui/views/apps/shaped_app_window_targeter_unittest.cc",
 
-    sources += [
-      "../browser/notifications/notification_image_retainer_unittest.cc",
-      "../browser/notifications/notification_template_builder_unittest.cc",
-      "../browser/ui/desktop_ios_promotion/desktop_ios_promotion_bubble_controller_unittest.cc",
-      "../browser/ui/desktop_ios_promotion/desktop_ios_promotion_util_unittest.cc",
-      "../browser/ui/desktop_ios_promotion/sms_service_unittest.cc",
-      "../browser/ui/input_method/input_method_engine_unittest.cc",
-      "../test/data/resource.rc",
-    ]
-    deps += [
-      "//chrome:other_version",
-      "//chrome/app:chrome_dll_resources",
-      "//chrome/install_static:install_static_util",
-      "//chrome/installer/util:strings",
-      "//chrome_elf:blacklist_test_dll_1",
-      "//third_party/iaccessible2",
-      "//third_party/isimpledom",
-      "//third_party/wtl",
-      "//ui/resources",
-    ]
-    data_deps += [
-      "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_1",
-      "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_2",
-      ":conflicts_dll",
-    ]
-
-    libs = [
-      "comsupp.lib",
-      "oleacc.lib",
-      "rpcrt4.lib",
-      "runtimeobject.lib",
-      "urlmon.lib",
-      "winmm.lib",
-    ]
-
-    ldflags = [
-      "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
-      "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-      "/DELAYLOAD:api-ms-win-core-winrt-string-l1-1-0.dll",
-    ]
-
-    if (is_chrome_branded) {
+          # Get these compiling on Mac - see http://crbug.com/657883.
+          "../browser/ui/views/crypto_module_password_dialog_view_unittest.cc",
+          "../browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc",
+        ]
+      }
+    }
+    if (!is_android && use_nss_certs) {
+      sources += [ "../common/net/x509_certificate_model_nss_unittest.cc" ]
+    }
+    if (is_desktop_linux || is_mac) {
+      sources += [ "../browser/net/trial_comparison_cert_verifier_unittest.cc" ]
+    }
+    if (enable_supervised_users) {
       sources += [
-        "../browser/conflicts/installed_programs_win_unittest.cc",
-        "../browser/conflicts/module_list_filter_win_unittest.cc",
-        "../browser/conflicts/problematic_programs_updater_win_unittest.cc",
-        "../browser/conflicts/registry_key_watcher_win_unittest.cc",
-        "../browser/google/google_update_win_unittest.cc",
+        "../browser/content_settings/content_settings_supervised_provider_unittest.cc",
+        "../browser/supervised_user/child_accounts/child_account_service_unittest.cc",
+        "../browser/supervised_user/child_accounts/family_info_fetcher_unittest.cc",
+        "../browser/supervised_user/child_accounts/permission_request_creator_apiary_unittest.cc",
+        "../browser/supervised_user/experimental/safe_search_url_reporter_unittest.cc",
+        "../browser/supervised_user/supervised_user_pref_store_unittest.cc",
+        "../browser/supervised_user/supervised_user_service_unittest.cc",
+        "../browser/supervised_user/supervised_user_settings_service_unittest.cc",
+        "../browser/supervised_user/supervised_user_url_filter_unittest.cc",
+        "../browser/supervised_user/supervised_user_whitelist_service_unittest.cc",
       ]
     }
-  }
-  if (is_android) {
-    sources -= [
-      "../browser/ui/bookmarks/bookmark_ui_utils_desktop_unittest.cc",
-      "../browser/ui/sync/sync_promo_ui_unittest.cc",
-      "../browser/ui/sync/tab_contents_synced_tab_delegate_unittest.cc",
-    ]
-  }
-  if (!is_android && !is_chromeos) {
-    sources += [
-      "../browser/media/webrtc/native_desktop_media_list_unittest.cc",
-      "../browser/metrics/desktop_session_duration/desktop_session_duration_tracker_unittest.cc",
-      "../browser/metrics/upgrade_metrics_provider_unittest.cc",
-      "../browser/signin/force_signin_verifier_unittest.cc",
-      "../browser/signin/signin_global_error_unittest.cc",
-      "../browser/signin/signin_ui_util_unittest.cc",
-      "../browser/signin/signin_util_unittest.cc",
-      "../browser/ui/webui/signin/signin_create_profile_handler_unittest.cc",
-      "../browser/ui/webui/signin/signin_error_handler_unittest.cc",
-      "../browser/ui/webui/signin/sync_confirmation_handler_unittest.cc",
-      "../browser/upgrade_detector_impl_unittest.cc",
-    ]
-  }
-  if (toolkit_views) {
-    deps += [
-      "//components/web_modal:test_support",
-      "//ui/views",
-      "//ui/views:test_support",
-    ]
-    sources += [
-      "../../ui/views/controls/webview/webview_unittest.cc",
-      "../browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc",
-      "../browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc",
-      "../browser/ui/views/confirm_bubble_views_unittest.cc",
-      "../browser/ui/views/fullscreen_control/fullscreen_control_popup_unittest.cc",
-      "../browser/ui/views/global_error_bubble_view_unittest.cc",
-      "../browser/ui/views/harmony/layout_provider_unittest.cc",
-      "../browser/ui/views/hover_button_unittest.cc",
-      "../browser/ui/views/page_info/page_info_bubble_view_unittest.cc",
-      "../browser/ui/views/payments/payment_request_item_list_unittest.cc",
-      "../browser/ui/views/payments/validating_textfield_unittest.cc",
-      "../browser/ui/views/payments/view_stack_unittest.cc",
-    ]
-    if (is_chromeos) {
-      sources += [ "../browser/ui/views/ime_driver/input_method_bridge_chromeos_unittest.cc" ]
-    } else {
+    if (enable_supervised_users && !is_android) {
+      # TODO(bauerb): This code should be removed (on desktop) once child account
+      # support has launched (https://crbug.com/505443).
       sources += [
-        "../browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc",
-        "../browser/ui/views/relaunch_notification/relaunch_required_dialog_view_unittest.cc",
+        "../browser/supervised_user/legacy/supervised_user_pref_mapping_service_unittest.cc",
+        "../browser/supervised_user/legacy/supervised_user_refresh_token_fetcher_unittest.cc",
+        "../browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc",
+        "../browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc",
+        "../browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc",
+        "../browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc",
       ]
     }
-    if (!is_chromeos && (!is_mac || mac_views_browser)) {
+    if (enable_supervised_users && !is_android && !is_chromeos) {
       sources += [
-        "../browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc",
-        "../browser/ui/views/sync/one_click_signin_dialog_view_unittest.cc",
+        "../browser/supervised_user/supervised_user_creation_policy_handler_unittest.cc",
+        "../browser/ui/webui/signin/signin_supervised_user_import_handler_unittest.cc",
       ]
     }
-    if (enable_native_window_nav_buttons) {
-      sources += [ "../browser/ui/views/frame/desktop_linux_browser_frame_view_layout_unittest.cc" ]
+    if (safe_browsing_mode == 1 && enable_extensions) {
+      sources += [ "../browser/extensions/blacklist_unittest.cc" ]
     }
-    if (!is_mac || mac_views_browser) {
+    if (enable_app_list) {
       sources += [
-        "../browser/ui/views/accelerator_table_unittest.cc",
-        "../browser/ui/views/accelerator_table_unittest_mac.mm",
-        "../browser/ui/views/autofill/autofill_popup_view_native_views_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_unittest.cc",
-        "../browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc",
-        "../browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc",
-        "../browser/ui/views/device_chooser_content_view_unittest.cc",
-        "../browser/ui/views/download/download_item_view_unittest.cc",
-        "../browser/ui/views/extensions/chooser_dialog_view_unittest.cc",
-        "../browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc",
-        "../browser/ui/views/frame/browser_non_client_frame_view_unittest.cc",
-        "../browser/ui/views/frame/browser_view_layout_unittest.cc",
-        "../browser/ui/views/frame/browser_view_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/infobars/infobar_view_unittest.cc",
-        "../browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc",
-        "../browser/ui/views/media_router/web_contents_display_observer_view_unittest.cc",
-        "../browser/ui/views/omnibox/omnibox_result_view_unittest.cc",
-        "../browser/ui/views/omnibox/omnibox_view_views_unittest.cc",
-        "../browser/ui/views/status_icons/status_tray_win_unittest.cc",
-        "../browser/ui/views/sync/bubble_sync_promo_view_unittest.cc",
-        "../browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_unittest.cc",
-        "../browser/ui/views/tabs/alert_indicator_button_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",
-        "../browser/ui/views/tabs/tab_strip_layout_unittest.cc",
-        "../browser/ui/views/tabs/tab_strip_unittest.cc",
-        "../browser/ui/views/tabs/tab_unittest.cc",
-        "../browser/ui/views/toolbar/reload_button_unittest.cc",
-        "../browser/ui/views/toolbar/toolbar_action_view_unittest.cc",
-        "../browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc",
-        "../browser/ui/views/translate/translate_bubble_view_unittest.cc",
-        "../browser/ui/views/webshare/webshare_target_picker_view_unittest.cc",
+        "../browser/ui/app_list/app_context_menu_unittest.cc",
+        "../browser/ui/app_list/app_list_syncable_service_unittest.cc",
+        "../browser/ui/app_list/app_list_test_util.cc",
+        "../browser/ui/app_list/app_list_test_util.h",
+        "../browser/ui/app_list/arc/arc_app_test.cc",
+        "../browser/ui/app_list/arc/arc_app_test.h",
+        "../browser/ui/app_list/arc/arc_app_unittest.cc",
+        "../browser/ui/app_list/arc/arc_app_utils_unittest.cc",
+        "../browser/ui/app_list/arc/arc_vpn_provider_unittest.cc",
+        "../browser/ui/app_list/extension_app_model_builder_unittest.cc",
+        "../browser/ui/app_list/search/answer_card/answer_card_result_unittest.cc",
+        "../browser/ui/app_list/search/answer_card/answer_card_search_provider_unittest.cc",
+        "../browser/ui/app_list/search/arc/arc_app_data_search_provider_unittest.cc",
+        "../browser/ui/app_list/search/arc/arc_playstore_search_provider_unittest.cc",
+        "../browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_unittest.cc",
+        "../browser/ui/app_list/search/tests/app_search_provider_unittest.cc",
+        "../browser/ui/app_list/search/tests/history_data_store_unittest.cc",
+        "../browser/ui/app_list/search/tests/history_unittest.cc",
+        "../browser/ui/app_list/search/tests/mixer_unittest.cc",
+        "../browser/ui/app_list/search/tests/omnibox_result_unittest.cc",
+        "../browser/ui/app_list/search/tests/term_break_iterator_unittest.cc",
+        "../browser/ui/app_list/search/tests/tokenized_string_char_iterator_unittest.cc",
+        "../browser/ui/app_list/search/tests/tokenized_string_match_unittest.cc",
+        "../browser/ui/app_list/search/tests/tokenized_string_unittest.cc",
+        "../browser/ui/app_list/test/fake_app_list_model_updater.cc",
+        "../browser/ui/app_list/test/fake_app_list_model_updater.h",
+        "../browser/ui/app_list/test/fake_profile.cc",
+        "../browser/ui/app_list/test/fake_profile.h",
+      ]
+      deps += [
+        "//components/arc:arc_test_support",
+        "//ui/app_list:test_support",
       ]
     }
-    if ((is_linux && !is_chromeos) || is_win) {
-      sources += [ "../browser/ui/views/message_center/popups_only_ui_delegate_unittest.cc" ]
+
+    if (is_win || is_mac || (is_linux && !is_chromeos)) {
+      sources += [ "../browser/password_manager/password_store_signin_notifier_impl_unittest.cc" ]
     }
-    if (use_aura) {
-      sources += [
-        "../browser/ui/views/apps/shaped_app_window_targeter_unittest.cc",
 
-        # Get these compiling on Mac - see http://crbug.com/657883.
-        "../browser/ui/views/crypto_module_password_dialog_view_unittest.cc",
-        "../browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc",
-      ]
+    # TODO(crbug.com/349182): Replace "is_chrome_branded" with "enable_widevine".
+    if (is_chrome_branded && is_win) {
+      sources += [ "../gpu/widevine_cdm_proxy_factory_unittest.cc" ]
     }
   }
-  if (!is_android && use_nss_certs) {
-    sources += [ "../common/net/x509_certificate_model_nss_unittest.cc" ]
-  }
-  if (is_desktop_linux || is_mac) {
-    sources += [ "../browser/net/trial_comparison_cert_verifier_unittest.cc" ]
-  }
-  if (enable_supervised_users) {
-    sources += [
-      "../browser/content_settings/content_settings_supervised_provider_unittest.cc",
-      "../browser/supervised_user/child_accounts/child_account_service_unittest.cc",
-      "../browser/supervised_user/child_accounts/family_info_fetcher_unittest.cc",
-      "../browser/supervised_user/child_accounts/permission_request_creator_apiary_unittest.cc",
-      "../browser/supervised_user/experimental/safe_search_url_reporter_unittest.cc",
-      "../browser/supervised_user/supervised_user_pref_store_unittest.cc",
-      "../browser/supervised_user/supervised_user_service_unittest.cc",
-      "../browser/supervised_user/supervised_user_settings_service_unittest.cc",
-      "../browser/supervised_user/supervised_user_url_filter_unittest.cc",
-      "../browser/supervised_user/supervised_user_whitelist_service_unittest.cc",
-    ]
-  }
-  if (enable_supervised_users && !is_android) {
-    # TODO(bauerb): This code should be removed (on desktop) once child account
-    # support has launched (https://crbug.com/505443).
-    sources += [
-      "../browser/supervised_user/legacy/supervised_user_pref_mapping_service_unittest.cc",
-      "../browser/supervised_user/legacy/supervised_user_refresh_token_fetcher_unittest.cc",
-      "../browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc",
-      "../browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc",
-      "../browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc",
-      "../browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc",
-    ]
-  }
-  if (enable_supervised_users && !is_android && !is_chromeos) {
-    sources += [
-      "../browser/supervised_user/supervised_user_creation_policy_handler_unittest.cc",
-      "../browser/ui/webui/signin/signin_supervised_user_import_handler_unittest.cc",
-    ]
-  }
-  if (safe_browsing_mode == 1 && enable_extensions) {
-    sources += [ "../browser/extensions/blacklist_unittest.cc" ]
-  }
-  if (enable_app_list) {
-    sources += [
-      "../browser/ui/app_list/app_context_menu_unittest.cc",
-      "../browser/ui/app_list/app_list_syncable_service_unittest.cc",
-      "../browser/ui/app_list/app_list_test_util.cc",
-      "../browser/ui/app_list/app_list_test_util.h",
-      "../browser/ui/app_list/arc/arc_app_test.cc",
-      "../browser/ui/app_list/arc/arc_app_test.h",
-      "../browser/ui/app_list/arc/arc_app_unittest.cc",
-      "../browser/ui/app_list/arc/arc_app_utils_unittest.cc",
-      "../browser/ui/app_list/arc/arc_vpn_provider_unittest.cc",
-      "../browser/ui/app_list/extension_app_model_builder_unittest.cc",
-      "../browser/ui/app_list/search/answer_card/answer_card_result_unittest.cc",
-      "../browser/ui/app_list/search/answer_card/answer_card_search_provider_unittest.cc",
-      "../browser/ui/app_list/search/arc/arc_app_data_search_provider_unittest.cc",
-      "../browser/ui/app_list/search/arc/arc_playstore_search_provider_unittest.cc",
-      "../browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_unittest.cc",
-      "../browser/ui/app_list/search/tests/app_search_provider_unittest.cc",
-      "../browser/ui/app_list/search/tests/history_data_store_unittest.cc",
-      "../browser/ui/app_list/search/tests/history_unittest.cc",
-      "../browser/ui/app_list/search/tests/mixer_unittest.cc",
-      "../browser/ui/app_list/search/tests/omnibox_result_unittest.cc",
-      "../browser/ui/app_list/search/tests/term_break_iterator_unittest.cc",
-      "../browser/ui/app_list/search/tests/tokenized_string_char_iterator_unittest.cc",
-      "../browser/ui/app_list/search/tests/tokenized_string_match_unittest.cc",
-      "../browser/ui/app_list/search/tests/tokenized_string_unittest.cc",
-      "../browser/ui/app_list/test/fake_app_list_model_updater.cc",
-      "../browser/ui/app_list/test/fake_app_list_model_updater.h",
-      "../browser/ui/app_list/test/fake_profile.cc",
-      "../browser/ui/app_list/test/fake_profile.h",
+
+  static_library("test_support_unit") {
+    testonly = true
+    sources = [
+      "base/run_all_unittests.cc",
     ]
-    deps += [
-      "//components/arc:arc_test_support",
-      "//ui/app_list:test_support",
+
+    public_deps = [
+      ":test_support",
+      "//base",
+      "//chrome:resources",
+      "//chrome:strings",
+      "//chrome/browser",
+      "//chrome/common",
+      "//mojo/edk/test:test_support",
     ]
-  }
 
-  if (is_win || is_mac || (is_linux && !is_chromeos)) {
-    sources += [ "../browser/password_manager/password_store_signin_notifier_impl_unittest.cc" ]
-  }
+    if (is_win) {
+      deps = [
+        "//chrome/install_static/test:test_support",
+      ]
+    }
 
-  # TODO(crbug.com/349182): Replace "is_chrome_branded" with "enable_widevine".
-  if (is_chrome_branded && is_win) {
-    sources += [ "../gpu/widevine_cdm_proxy_factory_unittest.cc" ]
+    if (is_chromeos) {
+      deps = [
+        "//ash:test_support_with_content",
+        "//ash/public/cpp",
+      ]
+    }
   }
-}
-
-static_library("test_support_unit") {
-  testonly = true
-  sources = [
-    "base/run_all_unittests.cc",
-  ]
-
-  public_deps = [
-    ":test_support",
-    "//base",
-    "//chrome:resources",
-    "//chrome:strings",
-    "//chrome/browser",
-    "//chrome/common",
-    "//mojo/edk/test:test_support",
-  ]
 
   if (is_win) {
-    deps = [
-      "//chrome/install_static/test:test_support",
-    ]
+    loadable_module("conflicts_dll") {
+      testonly = true
+      sources = [
+        "conflicts/conflicts_dll.cc",
+      ]
+    }
   }
 
-  if (is_chromeos) {
-    deps = [
-      "//ash:test_support_with_content",
-      "//ash/public/cpp",
-    ]
-  }
-}
+  if (!is_android) {
+    static_library("test_support_ui") {
+      defines = []
+      testonly = true
 
-if (is_win) {
-  loadable_module("conflicts_dll") {
-    testonly = true
-    sources = [
-      "conflicts/conflicts_dll.cc",
-    ]
-  }
-}
+      sources = [
+        "../browser/permissions/permission_request_manager_test_api.cc",
+        "../browser/permissions/permission_request_manager_test_api.h",
+        "../browser/ssl/cert_verifier_browser_test.cc",
+        "../browser/ssl/cert_verifier_browser_test.h",
+        "base/in_process_browser_test.cc",
+        "base/in_process_browser_test.h",
+        "base/in_process_browser_test_mac.cc",
+        "base/javascript_browser_test.cc",
+        "base/javascript_browser_test.h",
+        "base/test_chrome_web_ui_controller_factory.cc",
+        "base/test_chrome_web_ui_controller_factory.h",
+        "base/ui_test_utils.cc",
+        "base/ui_test_utils.h",
+        "base/web_ui_browser_test.cc",
+        "base/web_ui_browser_test.h",
+      ]
 
-if (!is_android) {
-  static_library("test_support_ui") {
-    defines = []
-    testonly = true
+      configs += [ "//build/config:precompiled_headers" ]
 
-    sources = [
-      "../browser/permissions/permission_request_manager_test_api.cc",
-      "../browser/permissions/permission_request_manager_test_api.h",
-      "../browser/ssl/cert_verifier_browser_test.cc",
-      "../browser/ssl/cert_verifier_browser_test.h",
-      "base/in_process_browser_test.cc",
-      "base/in_process_browser_test.h",
-      "base/in_process_browser_test_mac.cc",
-      "base/javascript_browser_test.cc",
-      "base/javascript_browser_test.h",
-      "base/test_chrome_web_ui_controller_factory.cc",
-      "base/test_chrome_web_ui_controller_factory.h",
-      "base/ui_test_utils.cc",
-      "base/ui_test_utils.h",
-      "base/web_ui_browser_test.cc",
-      "base/web_ui_browser_test.h",
-    ]
+      public_deps = [
+        "//chrome/browser:test_support_ui",
+        "//content/public/browser",
+      ]
+      deps = [
+        "//components/metrics:test_support",
+        "//components/nacl/common:buildflags",
+        "//components/os_crypt:test_support",
+        "//content/public/browser:browser",
+        "//extensions/buildflags",
+        "//skia",
+        "//testing/gtest",
+        "//third_party/blink/public:blink_headers",
+      ]
 
-    configs += [ "//build/config:precompiled_headers" ]
+      if (enable_plugins) {
+        sources += [
+          "ppapi/ppapi_test.cc",
+          "ppapi/ppapi_test.h",
+        ]
+      }
 
-    public_deps = [
-      "//chrome/browser:test_support_ui",
-      "//content/public/browser",
-    ]
-    deps = [
-      "//components/metrics:test_support",
-      "//components/nacl/common:buildflags",
-      "//components/os_crypt:test_support",
-      "//content/public/browser:browser",
-      "//extensions/buildflags",
-      "//skia",
-      "//testing/gtest",
-      "//third_party/blink/public:blink_headers",
-    ]
+      if (enable_extensions) {
+        deps += [ "//extensions/browser" ]
+      }
+    }
 
-    if (enable_plugins) {
-      sources += [
-        "ppapi/ppapi_test.cc",
-        "ppapi/ppapi_test.h",
+    import("//third_party/protobuf/proto_library.gni")
+
+    proto_library("test_proto") {
+      sources = [
+        "../common/safe_browsing/ipc_protobuf_message_test.proto",
       ]
     }
 
-    if (enable_extensions) {
-      deps += [ "//extensions/browser" ]
+    if (is_chromeos) {
+      assert(enable_app_list)
+      assert(enable_extensions)
+
+      # These tests are only meant to run on an FYI bot because they
+      # test against live sites, as a way to catch potential regressions.
+      test("accessibility_live_site_tests") {
+        sources = [
+          "../browser/chromeos/accessibility/select_to_speak_live_site_browsertest.cc",
+          "base/interactive_test_utils.cc",
+          "base/interactive_test_utils.h",
+          "base/interactive_test_utils_aura.cc",
+          "base/interactive_test_utils_aura.h",
+          "base/interactive_test_utils_common_views.cc",
+          "base/interactive_ui_tests_main.cc",
+        ]
+        configs += [ "//build/config:precompiled_headers" ]
+
+        defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+        ldflags = []
+
+        deps = [
+          ":test_support",
+          ":test_support_ui",
+          "//chrome:packed_resources",
+          "//chrome:resources",
+          "//chrome:strings",
+          "//chrome/browser",
+          "//chrome/browser/devtools",
+          "//chrome/renderer",
+          "//components/resources",
+          "//components/sync",
+          "//components/sync:test_support_model",
+          "//content/app/resources",
+          "//content/test:test_support",
+          "//crypto:platform",
+          "//crypto:test_support",
+          "//extensions/buildflags",
+          "//google_apis:test_support",
+          "//net",
+          "//net:net_resources",
+          "//net:test_support",
+          "//skia",
+          "//testing/gmock",
+          "//testing/gtest",
+          "//third_party/hunspell",
+          "//third_party/icu",
+          "//third_party/libpng",
+          "//third_party/zlib",
+          "//ui/base:test_support",
+          "//ui/resources:ui_test_pak",
+          "//ui/web_dialogs:test_support",
+        ]
+      }
     }
-  }
 
-  import("//third_party/protobuf/proto_library.gni")
-
-  proto_library("test_proto") {
-    sources = [
-      "../common/safe_browsing/ipc_protobuf_message_test.proto",
-    ]
-  }
-
-  if (is_chromeos) {
-    assert(enable_app_list)
-    assert(enable_extensions)
-
-    # These tests are only meant to run on an FYI bot because they
-    # test against live sites, as a way to catch potential regressions.
-    test("accessibility_live_site_tests") {
+    test("interactive_ui_tests") {
       sources = [
-        "../browser/chromeos/accessibility/select_to_speak_live_site_browsertest.cc",
+        "../browser/apps/app_browsertest_util.cc",
+        "../browser/apps/app_browsertest_util.h",
+        "../browser/apps/app_pointer_lock_interactive_uitest.cc",
+        "../browser/apps/app_shim/app_shim_interactive_uitest_mac.mm",
+        "../browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm",
+        "../browser/apps/app_window_interactive_uitest.cc",
+        "../browser/apps/app_window_interactive_uitest.h",
+        "../browser/apps/guest_view/web_view_interactive_browsertest.cc",
+        "../browser/autofill/autofill_interactive_uitest.cc",
+        "../browser/autofill/autofill_uitest_util.cc",
+        "../browser/autofill/autofill_uitest_util.h",
+        "../browser/browser_keyevents_browsertest.cc",
+        "../browser/devtools/devtools_sanity_interactive_browsertest.cc",
+        "../browser/extensions/api/extension_action/browser_action_interactive_test.cc",
+        "../browser/extensions/api/notifications/notifications_apitest.cc",
+        "../browser/extensions/api/omnibox/omnibox_api_interactive_test.cc",
+        "../browser/extensions/api/tabs/tabs_interactive_test.cc",
+        "../browser/extensions/browsertest_util.cc",
+        "../browser/extensions/chrome_extension_test_notification_observer.cc",
+        "../browser/extensions/chrome_extension_test_notification_observer.h",
+        "../browser/extensions/clipboard_extension_apitest_chromeos.cc",
+        "../browser/extensions/extension_apitest.cc",
+        "../browser/extensions/extension_browsertest.cc",
+        "../browser/extensions/extension_commands_global_registry_apitest.cc",
+        "../browser/extensions/extension_crash_recovery_browsertest.cc",
+        "../browser/extensions/extension_fullscreen_apitest.cc",
+        "../browser/extensions/extension_function_test_utils.cc",
+        "../browser/extensions/extension_keybinding_apitest.cc",
+        "../browser/extensions/updater/extension_cache_fake.cc",
+        "../browser/extensions/updater/extension_cache_fake.h",
+        "../browser/extensions/window_open_interactive_apitest.cc",
+        "../browser/mouse_events_interactive_uitest.cc",
+        "../browser/notifications/message_center_notifications_browsertest.cc",
+        "../browser/notifications/platform_notification_service_interactive_uitest.cc",
+        "../browser/password_manager/password_generation_interactive_uitest.cc",
+        "../browser/password_manager/password_manager_interactive_uitest.cc",
+        "../browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc",
+        "../browser/renderer_context_menu/render_view_context_menu_browsertest_util.h",
+        "../browser/renderer_host/site_per_process_text_input_browsertest.cc",
+        "../browser/site_per_process_interactive_browsertest.cc",
+        "../browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc",
+        "../browser/ui/blocked_content/popup_blocker_browsertest.cc",
+        "../browser/ui/browser_command_controller_interactive_browsertest.cc",
+        "../browser/ui/browser_focus_uitest.cc",
+        "../browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm",
+        "../browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm",
+        "../browser/ui/cocoa/status_bubble_mac_interactive_uitest.mm",
+        "../browser/ui/cocoa/tab_contents/web_contents_view_mac_interactive_uitest.mm",
+        "../browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc",
+        "../browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc",
+        "../browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc",
+        "../browser/ui/find_bar/find_bar_host_interactive_uitest.cc",
+        "../browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc",
+        "../browser/ui/omnibox/omnibox_view_browsertest.cc",
+        "../browser/ui/passwords/manage_passwords_test.cc",
+        "../browser/ui/passwords/manage_passwords_test.h",
+        "../browser/ui/search/instant_extended_interactive_uitest.cc",
+        "../browser/ui/search/instant_test_base.cc",
+        "../browser/ui/search/instant_test_base.h",
+        "../browser/ui/search/instant_test_utils.cc",
+        "../browser/ui/search/instant_test_utils.h",
+        "../browser/ui/search/instant_uitest_base.cc",
+        "../browser/ui/search/instant_uitest_base.h",
+        "../browser/ui/search/local_ntp_uitest.cc",
+        "../browser/ui/send_mouse_move_uitest_win.cc",
+        "../browser/ui/startup/startup_browser_creator_interactive_uitest.cc",
+        "../browser/ui/tabs/window_activity_watcher_interactive_uitest.cc",
+        "../browser/ui/translate/translate_bubble_test_utils.h",
+        "../browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc",
+        "//ui/base/clipboard/clipboard_unittest.cc",
+        "base/always_on_top_window_killer_win.cc",
+        "base/always_on_top_window_killer_win.h",
         "base/interactive_test_utils.cc",
         "base/interactive_test_utils.h",
         "base/interactive_test_utils_aura.cc",
         "base/interactive_test_utils_aura.h",
         "base/interactive_test_utils_common_views.cc",
+        "base/interactive_test_utils_mac.mm",
+        "base/interactive_test_utils_win.cc",
         "base/interactive_ui_tests_main.cc",
+        "base/process_inspector_win.cc",
+        "base/process_inspector_win.h",
+        "base/save_desktop_snapshot_win.cc",
+        "base/save_desktop_snapshot_win.h",
+        "base/view_event_test_platform_part.h",
+        "base/view_event_test_platform_part_chromeos.cc",
+        "base/view_event_test_platform_part_default.cc",
+        "ppapi/ppapi_interactive_browsertest.cc",
       ]
+
       configs += [ "//build/config:precompiled_headers" ]
 
+      data = [
+        "data/",
+        "//chrome/third_party/mock4js/",
+        "//content/test/data/",
+        "//net/tools/testserver/",
+        "//ppapi/tests/test_case.html",
+        "//ppapi/tests/test_case.html.mock-http-headers",
+        "//ppapi/tests/test_page.css",
+        "//ppapi/tests/test_page.css.mock-http-headers",
+        "//third_party/accessibility-audit/axs_testing.js",
+        "//third_party/chaijs/chai.js",
+        "//third_party/mocha/mocha.js",
+        "//third_party/polymer/v1_0/components-chromium/iron-test-helpers/mock-interactions.js",
+        "//third_party/pyftpdlib/",
+        "//third_party/pywebsocket/",
+        "//third_party/tlslite/",
+        "//third_party/zlib/google/test/data/",
+        "//tools/metrics/histograms/enums.xml",
+        "//ui/webui/resources/js/",
+        "$root_out_dir/pyproto/google/",
+        "$root_out_dir/test_case.html",
+        "$root_out_dir/test_case.html.mock-http-headers",
+        "$root_out_dir/test_page.css",
+        "$root_out_dir/test_page.css.mock-http-headers",
+        "$root_out_dir/ui_test.pak",
+      ]
+      if (is_linux || is_win) {
+        data += [
+          "$root_out_dir/chrome_100_percent.pak",
+          "$root_out_dir/chrome_200_percent.pak",
+          "$root_out_dir/locales/en-US.pak",
+          "$root_out_dir/locales/fr.pak",
+          "$root_out_dir/resources.pak",
+        ]
+      }
+      if (is_linux) {
+        data += [ "$root_out_dir/libppapi_tests.so" ]
+      }
+
       defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
       ldflags = []
 
@@ -4516,19 +4688,24 @@ if (!is_android) {
         "//chrome:strings",
         "//chrome/browser",
         "//chrome/browser/devtools",
+        "//chrome/browser/resource_coordinator:tab_metrics_event_proto",
         "//chrome/renderer",
+        "//components/keep_alive_registry",
         "//components/resources",
         "//components/sync",
         "//components/sync:test_support_model",
+        "//components/ukm:test_support",
         "//content/app/resources",
         "//content/test:test_support",
         "//crypto:platform",
         "//crypto:test_support",
         "//extensions/buildflags",
         "//google_apis:test_support",
+        "//mojo/edk",
         "//net",
         "//net:net_resources",
         "//net:test_support",
+        "//services/metrics/public/cpp:ukm_builders",
         "//skia",
         "//testing/gmock",
         "//testing/gtest",
@@ -4540,1015 +4717,840 @@ if (!is_android) {
         "//ui/resources:ui_test_pak",
         "//ui/web_dialogs:test_support",
       ]
-    }
-  }
-
-  test("interactive_ui_tests") {
-    sources = [
-      "../browser/apps/app_browsertest_util.cc",
-      "../browser/apps/app_browsertest_util.h",
-      "../browser/apps/app_pointer_lock_interactive_uitest.cc",
-      "../browser/apps/app_shim/app_shim_interactive_uitest_mac.mm",
-      "../browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm",
-      "../browser/apps/app_window_interactive_uitest.cc",
-      "../browser/apps/app_window_interactive_uitest.h",
-      "../browser/apps/guest_view/web_view_interactive_browsertest.cc",
-      "../browser/autofill/autofill_interactive_uitest.cc",
-      "../browser/autofill/autofill_uitest_util.cc",
-      "../browser/autofill/autofill_uitest_util.h",
-      "../browser/browser_keyevents_browsertest.cc",
-      "../browser/devtools/devtools_sanity_interactive_browsertest.cc",
-      "../browser/extensions/api/extension_action/browser_action_interactive_test.cc",
-      "../browser/extensions/api/notifications/notifications_apitest.cc",
-      "../browser/extensions/api/omnibox/omnibox_api_interactive_test.cc",
-      "../browser/extensions/api/tabs/tabs_interactive_test.cc",
-      "../browser/extensions/browsertest_util.cc",
-      "../browser/extensions/chrome_extension_test_notification_observer.cc",
-      "../browser/extensions/chrome_extension_test_notification_observer.h",
-      "../browser/extensions/clipboard_extension_apitest_chromeos.cc",
-      "../browser/extensions/extension_apitest.cc",
-      "../browser/extensions/extension_browsertest.cc",
-      "../browser/extensions/extension_commands_global_registry_apitest.cc",
-      "../browser/extensions/extension_crash_recovery_browsertest.cc",
-      "../browser/extensions/extension_fullscreen_apitest.cc",
-      "../browser/extensions/extension_function_test_utils.cc",
-      "../browser/extensions/extension_keybinding_apitest.cc",
-      "../browser/extensions/updater/extension_cache_fake.cc",
-      "../browser/extensions/updater/extension_cache_fake.h",
-      "../browser/extensions/window_open_interactive_apitest.cc",
-      "../browser/mouse_events_interactive_uitest.cc",
-      "../browser/notifications/message_center_notifications_browsertest.cc",
-      "../browser/notifications/platform_notification_service_interactive_uitest.cc",
-      "../browser/password_manager/password_generation_interactive_uitest.cc",
-      "../browser/password_manager/password_manager_interactive_uitest.cc",
-      "../browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc",
-      "../browser/renderer_context_menu/render_view_context_menu_browsertest_util.h",
-      "../browser/renderer_host/site_per_process_text_input_browsertest.cc",
-      "../browser/site_per_process_interactive_browsertest.cc",
-      "../browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc",
-      "../browser/ui/blocked_content/popup_blocker_browsertest.cc",
-      "../browser/ui/browser_command_controller_interactive_browsertest.cc",
-      "../browser/ui/browser_focus_uitest.cc",
-      "../browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm",
-      "../browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm",
-      "../browser/ui/cocoa/status_bubble_mac_interactive_uitest.mm",
-      "../browser/ui/cocoa/tab_contents/web_contents_view_mac_interactive_uitest.mm",
-      "../browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc",
-      "../browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc",
-      "../browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc",
-      "../browser/ui/find_bar/find_bar_host_interactive_uitest.cc",
-      "../browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc",
-      "../browser/ui/omnibox/omnibox_view_browsertest.cc",
-      "../browser/ui/passwords/manage_passwords_test.cc",
-      "../browser/ui/passwords/manage_passwords_test.h",
-      "../browser/ui/search/instant_extended_interactive_uitest.cc",
-      "../browser/ui/search/instant_test_base.cc",
-      "../browser/ui/search/instant_test_base.h",
-      "../browser/ui/search/instant_test_utils.cc",
-      "../browser/ui/search/instant_test_utils.h",
-      "../browser/ui/search/instant_uitest_base.cc",
-      "../browser/ui/search/instant_uitest_base.h",
-      "../browser/ui/search/local_ntp_uitest.cc",
-      "../browser/ui/send_mouse_move_uitest_win.cc",
-      "../browser/ui/startup/startup_browser_creator_interactive_uitest.cc",
-      "../browser/ui/tabs/window_activity_watcher_interactive_uitest.cc",
-      "../browser/ui/translate/translate_bubble_test_utils.h",
-      "../browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc",
-      "//ui/base/clipboard/clipboard_unittest.cc",
-      "base/always_on_top_window_killer_win.cc",
-      "base/always_on_top_window_killer_win.h",
-      "base/interactive_test_utils.cc",
-      "base/interactive_test_utils.h",
-      "base/interactive_test_utils_aura.cc",
-      "base/interactive_test_utils_aura.h",
-      "base/interactive_test_utils_common_views.cc",
-      "base/interactive_test_utils_mac.mm",
-      "base/interactive_test_utils_win.cc",
-      "base/interactive_ui_tests_main.cc",
-      "base/process_inspector_win.cc",
-      "base/process_inspector_win.h",
-      "base/save_desktop_snapshot_win.cc",
-      "base/save_desktop_snapshot_win.h",
-      "base/view_event_test_platform_part.h",
-      "base/view_event_test_platform_part_chromeos.cc",
-      "base/view_event_test_platform_part_default.cc",
-      "ppapi/ppapi_interactive_browsertest.cc",
-    ]
 
-    configs += [ "//build/config:precompiled_headers" ]
+      if (include_js_tests) {
+        deps += [ "//chrome/test/data/webui:interactive_ui_tests_js_webui" ]
+      }
 
-    data = [
-      "data/",
-      "//chrome/third_party/mock4js/",
-      "//content/test/data/",
-      "//net/tools/testserver/",
-      "//ppapi/tests/test_case.html",
-      "//ppapi/tests/test_case.html.mock-http-headers",
-      "//ppapi/tests/test_page.css",
-      "//ppapi/tests/test_page.css.mock-http-headers",
-      "//third_party/accessibility-audit/axs_testing.js",
-      "//third_party/chaijs/chai.js",
-      "//third_party/mocha/mocha.js",
-      "//third_party/polymer/v1_0/components-chromium/iron-test-helpers/mock-interactions.js",
-      "//third_party/pyftpdlib/",
-      "//third_party/pywebsocket/",
-      "//third_party/tlslite/",
-      "//third_party/zlib/google/test/data/",
-      "//tools/metrics/histograms/enums.xml",
-      "//ui/webui/resources/js/",
-      "$root_out_dir/pyproto/google/",
-      "$root_out_dir/test_case.html",
-      "$root_out_dir/test_case.html.mock-http-headers",
-      "$root_out_dir/test_page.css",
-      "$root_out_dir/test_page.css.mock-http-headers",
-      "$root_out_dir/ui_test.pak",
-    ]
-    if (is_linux || is_win) {
-      data += [
-        "$root_out_dir/chrome_100_percent.pak",
-        "$root_out_dir/chrome_200_percent.pak",
-        "$root_out_dir/locales/en-US.pak",
-        "$root_out_dir/locales/fr.pak",
-        "$root_out_dir/resources.pak",
+      # Runtime dependencies
+      data_deps = [
+        "//ppapi:ppapi_tests",
+        "//third_party/mesa:osmesa",
       ]
-    }
-    if (is_linux) {
-      data += [ "$root_out_dir/libppapi_tests.so" ]
-    }
-
-    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-    ldflags = []
-
-    deps = [
-      ":test_support",
-      ":test_support_ui",
-      "//chrome:packed_resources",
-      "//chrome:resources",
-      "//chrome:strings",
-      "//chrome/browser",
-      "//chrome/browser/devtools",
-      "//chrome/browser/resource_coordinator:tab_metrics_event_proto",
-      "//chrome/renderer",
-      "//components/keep_alive_registry",
-      "//components/resources",
-      "//components/sync",
-      "//components/sync:test_support_model",
-      "//components/ukm:test_support",
-      "//content/app/resources",
-      "//content/test:test_support",
-      "//crypto:platform",
-      "//crypto:test_support",
-      "//extensions/buildflags",
-      "//google_apis:test_support",
-      "//mojo/edk",
-      "//net",
-      "//net:net_resources",
-      "//net:test_support",
-      "//services/metrics/public/cpp:ukm_builders",
-      "//skia",
-      "//testing/gmock",
-      "//testing/gtest",
-      "//third_party/hunspell",
-      "//third_party/icu",
-      "//third_party/libpng",
-      "//third_party/zlib",
-      "//ui/base:test_support",
-      "//ui/resources:ui_test_pak",
-      "//ui/web_dialogs:test_support",
-    ]
-
-    if (include_js_tests) {
-      deps += [ "//chrome/test/data/webui:interactive_ui_tests_js_webui" ]
-    }
-
-    # Runtime dependencies
-    data_deps = [
-      "//ppapi:ppapi_tests",
-      "//third_party/mesa:osmesa",
-    ]
 
-    if (use_aura) {
-      sources += [ "../browser/ui/views/drag_and_drop_interactive_uitest.cc" ]
-    } else {
-      sources -= [
-        "base/interactive_test_utils_aura.cc",
-        "base/interactive_test_utils_aura.h",
-      ]
-    }
+      if (use_aura) {
+        sources += [ "../browser/ui/views/drag_and_drop_interactive_uitest.cc" ]
+      } else {
+        sources -= [
+          "base/interactive_test_utils_aura.cc",
+          "base/interactive_test_utils_aura.h",
+        ]
+      }
 
-    if (toolkit_views) {
-      sources += [
-        "../browser/ui/views/menu_controller_interactive_uitest.cc",
-        "../browser/ui/views/menu_item_view_interactive_uitest.cc",
-        "../browser/ui/views/menu_model_adapter_test.cc",
-        "../browser/ui/views/menu_test_base.cc",
-        "../browser/ui/views/menu_test_base.h",
-        "../browser/ui/views/menu_view_drag_and_drop_test.cc",
-        "../browser/ui/views/passwords/password_bubble_interactive_uitest.cc",
-        "../browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc",
-        "base/view_event_test_base.cc",
-        "base/view_event_test_base.h",
-      ]
-      deps += [
-        "//ui/views",
-        "//ui/views:test_support",
-        "//ui/views:views_interactive_ui_tests",
-        "//ui/views/controls/webview:test_support",
-      ]
-      if (!is_mac || mac_views_browser) {
-        # TODO(tapted): Move these to chrome_interactive_ui_test_views_sources
-        # when the corresponding files are moved in chrome_browser_ui.gypi
-        # (i.e. out of chrome_browser_ui_views_non_mac_sources).
+      if (toolkit_views) {
+        sources += [
+          "../browser/ui/views/menu_controller_interactive_uitest.cc",
+          "../browser/ui/views/menu_item_view_interactive_uitest.cc",
+          "../browser/ui/views/menu_model_adapter_test.cc",
+          "../browser/ui/views/menu_test_base.cc",
+          "../browser/ui/views/menu_test_base.h",
+          "../browser/ui/views/menu_view_drag_and_drop_test.cc",
+          "../browser/ui/views/passwords/password_bubble_interactive_uitest.cc",
+          "../browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc",
+          "base/view_event_test_base.cc",
+          "base/view_event_test_base.h",
+        ]
+        deps += [
+          "//ui/views",
+          "//ui/views:test_support",
+          "//ui/views:views_interactive_ui_tests",
+          "//ui/views/controls/webview:test_support",
+        ]
+        if (!is_mac || mac_views_browser) {
+          # TODO(tapted): Move these to chrome_interactive_ui_test_views_sources
+          # when the corresponding files are moved in chrome_browser_ui.gypi
+          # (i.e. out of chrome_browser_ui_views_non_mac_sources).
+          sources += [
+            "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc",
+            "../browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h",
+            "../browser/ui/views/certificate_selector_browsertest.cc",
+            "../browser/ui/views/constrained_window_views_browsertest.cc",
+            "../browser/ui/views/exclusive_access_bubble_views_interactive_uitest.cc",
+            "../browser/ui/views/extensions/extension_dialog_interactive_uitest.cc",
+            "../browser/ui/views/find_bar_views_interactive_uitest.cc",
+            "../browser/ui/views/frame/browser_view_focus_uitest.cc",
+            "../browser/ui/views/frame/browser_view_interactive_uitest.cc",
+            "../browser/ui/views/fullscreen_control/fullscreen_control_view_interactive_uitest.cc",
+            "../browser/ui/views/keyboard_access_browsertest.cc",
+            "../browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc",
+            "../browser/ui/views/location_bar/selected_keyword_view_interactive_uitest.cc",
+            "../browser/ui/views/location_bar/star_view_browsertest.cc",
+            "../browser/ui/views/omnibox/omnibox_view_views_browsertest.cc",
+            "../browser/ui/views/passwords/manage_passwords_icon_view_interactive_uitest.cc",
+            "../browser/ui/views/sad_tab_view_interactive_uitest.cc",
+            "../browser/ui/views/ssl_client_certificate_selector_browsertest.cc",
+            "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc",
+            "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h",
+            "../browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc",
+            "../browser/ui/views/toolbar/toolbar_button_interactive_uitest.cc",
+            "../browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc",
+            "../browser/ui/views/translate/translate_bubble_test_utils_views.cc",
+            "base/interactive_test_utils_views.cc",
+          ]
+        }
+        if (is_linux && !is_chromeos) {
+          # Desktop linux.
+          sources -= [
+            # TODO(port): This times out. Attempts have been made to fix the
+            # individual failures, but each time I disable a test from these
+            # suites, it seems like one or another starts timing out too.
+            "../browser/ui/views/keyboard_access_browsertest.cc",
+          ]
+          if (!use_ozone) {
+            sources += [
+              "../browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc",
+            ]
+            deps += [ "//build/config/linux/gtk" ]
+          }
+        }
+        if (use_aura || is_mac) {
+          deps += [ "//ui/touch_selection" ]
+        }
+        if (is_mac) {
+          deps += [ "//content/test:browsertest_support" ]
+        }
+      }
+
+      if (is_chromeos) {
         sources += [
-          "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc",
-          "../browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h",
-          "../browser/ui/views/certificate_selector_browsertest.cc",
-          "../browser/ui/views/constrained_window_views_browsertest.cc",
-          "../browser/ui/views/exclusive_access_bubble_views_interactive_uitest.cc",
-          "../browser/ui/views/extensions/extension_dialog_interactive_uitest.cc",
-          "../browser/ui/views/find_bar_views_interactive_uitest.cc",
-          "../browser/ui/views/frame/browser_view_focus_uitest.cc",
-          "../browser/ui/views/frame/browser_view_interactive_uitest.cc",
-          "../browser/ui/views/fullscreen_control/fullscreen_control_view_interactive_uitest.cc",
-          "../browser/ui/views/keyboard_access_browsertest.cc",
-          "../browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc",
-          "../browser/ui/views/location_bar/selected_keyword_view_interactive_uitest.cc",
-          "../browser/ui/views/location_bar/star_view_browsertest.cc",
-          "../browser/ui/views/omnibox/omnibox_view_views_browsertest.cc",
-          "../browser/ui/views/passwords/manage_passwords_icon_view_interactive_uitest.cc",
-          "../browser/ui/views/sad_tab_view_interactive_uitest.cc",
-          "../browser/ui/views/ssl_client_certificate_selector_browsertest.cc",
-          "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc",
-          "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h",
-          "../browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc",
-          "../browser/ui/views/toolbar/toolbar_button_interactive_uitest.cc",
-          "../browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc",
-          "../browser/ui/views/translate/translate_bubble_test_utils_views.cc",
-          "base/interactive_test_utils_views.cc",
+          "../browser/chromeos/accessibility/magnification_controller_browsertest.cc",
+          "../browser/chromeos/accessibility/select_to_speak_browsertest.cc",
+          "../browser/chromeos/accessibility/spoken_feedback_browsertest.cc",
+          "../browser/chromeos/accessibility/sticky_keys_browsertest.cc",
+          "../browser/chromeos/input_method/textinput_browsertest.cc",
+          "../browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc",
+          "../browser/chromeos/input_method/textinput_test_helper.cc",
+          "../browser/chromeos/input_method/textinput_test_helper.h",
+          "../browser/chromeos/login/active_directory_login_browsertest.cc",
+          "../browser/chromeos/login/lock/screen_locker_browsertest.cc",
+          "../browser/chromeos/login/lock/screen_locker_tester.cc",
+          "../browser/chromeos/login/lock/screen_locker_tester.h",
+          "../browser/chromeos/login/login_browsertest.cc",
+          "../browser/chromeos/login/login_manager_test.cc",
+          "../browser/chromeos/login/login_manager_test.h",
+          "../browser/chromeos/login/login_ui_browsertest.cc",
+          "../browser/chromeos/login/mixin_based_browser_test.cc",
+          "../browser/chromeos/login/mixin_based_browser_test.h",
+          "../browser/chromeos/login/oobe_browsertest.cc",
+          "../browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric.h",
+          "../browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric_cpu.cpp",
+          "../browser/chromeos/login/screenshot_testing/SkImageDiffer.cpp",
+          "../browser/chromeos/login/screenshot_testing/SkImageDiffer.h",
+          "../browser/chromeos/login/screenshot_testing/SkPMetric.cpp",
+          "../browser/chromeos/login/screenshot_testing/SkPMetric.h",
+          "../browser/chromeos/login/screenshot_testing/SkPMetricUtil_gen.h",
+          "../browser/chromeos/login/screenshot_testing/login_screen_areas.h",
+          "../browser/chromeos/login/screenshot_testing/screenshot_tester.cc",
+          "../browser/chromeos/login/screenshot_testing/screenshot_tester.h",
+          "../browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.cc",
+          "../browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.h",
+          "../browser/chromeos/login/test/https_forwarder.cc",
+          "../browser/chromeos/login/test/https_forwarder.h",
+          "../browser/chromeos/login/test/oobe_base_test.cc",
+          "../browser/chromeos/login/test/oobe_base_test.h",
+          "../browser/download/notification/download_notification_interactive_uitest.cc",
+          "../browser/ui/app_list/app_list_interactive_uitest.cc",
+          "../browser/ui/ash/tab_scrubber_browsertest.cc",
+          "../browser/ui/views/apps/chrome_native_app_window_views_aura_ash_interactive_uitest.cc",
+          "../browser/ui/webui/chromeos/login/oobe_display_chooser_browsertest.cc",
+          "../browser/ui/window_sizer/window_sizer_ash_uitest.cc",
+          "//ash/accelerators/accelerator_interactive_uitest_chromeos.cc",
+          "//ash/drag_drop/drag_drop_interactive_uitest.cc",
+          "//ash/wm/native_cursor_manager_ash_interactive_uitest.cc",
+          "data/chromeos/service_login.html",
         ]
-      }
-      if (is_linux && !is_chromeos) {
-        # Desktop linux.
         sources -= [
-          # TODO(port): This times out. Attempts have been made to fix the
-          # individual failures, but each time I disable a test from these
-          # suites, it seems like one or another starts timing out too.
-          "../browser/ui/views/keyboard_access_browsertest.cc",
+          # Use only the _chromeos version on Ash / Chrome OS.
+          "base/view_event_test_platform_part_default.cc",
         ]
-        if (!use_ozone) {
-          sources += [
-            "../browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc",
+        deps += [
+          "//ash:interactive_ui_test_support",
+          "//ash/app_list/presenter:test_support",
+          "//ash/resources",
+          "//chrome/browser/media/router:test_support",
+          "//chromeos",
+          "//mojo/edk",
+        ]
+
+        data += [
+          "//chrome/browser/chromeos/login/test/https_forwarder.py",
+          "//google_apis/test/",
+          "$root_out_dir/resources/chromeos/",
+        ]
+
+        data_deps += [ "//ui/keyboard:resources" ]
+
+        if (enable_nacl) {
+          data_deps += [
+            "//components/nacl/loader:nacl_helper",
+            "//ppapi/native_client:irt",
           ]
-          deps += [ "//build/config/linux/gtk" ]
+
+          if (enable_nacl_nonsfi) {
+            data_deps += [ "//components/nacl/loader:helper_nonsfi" ]
+          }
         }
+      } else {  # ! is_chromeos
+        # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform
+        # panels).
+        sources += [
+          "../browser/notifications/notification_interactive_uitest.cc",
+          "../browser/notifications/notification_interactive_uitest_mac.mm",
+          "../browser/notifications/notification_interactive_uitest_support.cc",
+          "../browser/notifications/notification_interactive_uitest_support.h",
+        ]
       }
-      if (use_aura || is_mac) {
-        deps += [ "//ui/touch_selection" ]
-      }
-      if (is_mac) {
-        deps += [ "//content/test:browsertest_support" ]
-      }
-    }
 
-    if (is_chromeos) {
-      sources += [
-        "../browser/chromeos/accessibility/magnification_controller_browsertest.cc",
-        "../browser/chromeos/accessibility/select_to_speak_browsertest.cc",
-        "../browser/chromeos/accessibility/spoken_feedback_browsertest.cc",
-        "../browser/chromeos/accessibility/sticky_keys_browsertest.cc",
-        "../browser/chromeos/input_method/textinput_browsertest.cc",
-        "../browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc",
-        "../browser/chromeos/input_method/textinput_test_helper.cc",
-        "../browser/chromeos/input_method/textinput_test_helper.h",
-        "../browser/chromeos/login/active_directory_login_browsertest.cc",
-        "../browser/chromeos/login/lock/screen_locker_browsertest.cc",
-        "../browser/chromeos/login/lock/screen_locker_tester.cc",
-        "../browser/chromeos/login/lock/screen_locker_tester.h",
-        "../browser/chromeos/login/login_browsertest.cc",
-        "../browser/chromeos/login/login_manager_test.cc",
-        "../browser/chromeos/login/login_manager_test.h",
-        "../browser/chromeos/login/login_ui_browsertest.cc",
-        "../browser/chromeos/login/mixin_based_browser_test.cc",
-        "../browser/chromeos/login/mixin_based_browser_test.h",
-        "../browser/chromeos/login/oobe_browsertest.cc",
-        "../browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric.h",
-        "../browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric_cpu.cpp",
-        "../browser/chromeos/login/screenshot_testing/SkImageDiffer.cpp",
-        "../browser/chromeos/login/screenshot_testing/SkImageDiffer.h",
-        "../browser/chromeos/login/screenshot_testing/SkPMetric.cpp",
-        "../browser/chromeos/login/screenshot_testing/SkPMetric.h",
-        "../browser/chromeos/login/screenshot_testing/SkPMetricUtil_gen.h",
-        "../browser/chromeos/login/screenshot_testing/login_screen_areas.h",
-        "../browser/chromeos/login/screenshot_testing/screenshot_tester.cc",
-        "../browser/chromeos/login/screenshot_testing/screenshot_tester.h",
-        "../browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.cc",
-        "../browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.h",
-        "../browser/chromeos/login/test/https_forwarder.cc",
-        "../browser/chromeos/login/test/https_forwarder.h",
-        "../browser/chromeos/login/test/oobe_base_test.cc",
-        "../browser/chromeos/login/test/oobe_base_test.h",
-        "../browser/download/notification/download_notification_interactive_uitest.cc",
-        "../browser/ui/app_list/app_list_interactive_uitest.cc",
-        "../browser/ui/ash/tab_scrubber_browsertest.cc",
-        "../browser/ui/views/apps/chrome_native_app_window_views_aura_ash_interactive_uitest.cc",
-        "../browser/ui/webui/chromeos/login/oobe_display_chooser_browsertest.cc",
-        "../browser/ui/window_sizer/window_sizer_ash_uitest.cc",
-        "//ash/accelerators/accelerator_interactive_uitest_chromeos.cc",
-        "//ash/drag_drop/drag_drop_interactive_uitest.cc",
-        "//ash/wm/native_cursor_manager_ash_interactive_uitest.cc",
-        "data/chromeos/service_login.html",
-      ]
-      sources -= [
-        # Use only the _chromeos version on Ash / Chrome OS.
-        "base/view_event_test_platform_part_default.cc",
-      ]
-      deps += [
-        "//ash:interactive_ui_test_support",
-        "//ash/app_list/presenter:test_support",
-        "//ash/resources",
-        "//chrome/browser/media/router:test_support",
-        "//chromeos",
-        "//mojo/edk",
-      ]
+      if (is_win) {
+        sources += [
+          "../browser/downgrade/user_data_downgrade_browsertest.cc",
+          "../browser/notifications/notification_platform_bridge_win_interactive_uitest.cc",
+          "../browser/ui/views/touch_events_interactive_uitest_win.cc",
+          "//ui/resources/cursors/aliasb.cur",
+          "//ui/resources/cursors/cell.cur",
+          "//ui/resources/cursors/col_resize.cur",
+          "//ui/resources/cursors/copy.cur",
+          "//ui/resources/cursors/none.cur",
+          "//ui/resources/cursors/row_resize.cur",
+          "//ui/resources/cursors/vertical_text.cur",
+          "//ui/resources/cursors/zoom_in.cur",
+          "//ui/resources/cursors/zoom_out.cur",
+          "data/resource.rc",
+        ]
+        deps += [
+          "//chrome:other_version",
+          "//chrome/app:chrome_dll_resources",
+          "//chrome/install_static:install_static_util",
+          "//third_party/isimpledom",
+          "//third_party/webrtc/modules/desktop_capture",
+          "//third_party/wtl",
+          "//ui/resources",
+        ]
 
-      data += [
-        "//chrome/browser/chromeos/login/test/https_forwarder.py",
-        "//google_apis/test/",
-        "$root_out_dir/resources/chromeos/",
-      ]
+        configs -= [ "//build/config/win:default_incremental_linking" ]
+        configs +=
+            [ "//build/config/win:default_large_module_incremental_linking" ]
 
-      data_deps += [ "//ui/keyboard:resources" ]
+        libs = [
+          "oleacc.lib",
+          "runtimeobject.lib",
+        ]
+
+        ldflags += [
+          "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
+          "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
+          "/DELAYLOAD:api-ms-win-core-winrt-string-l1-1-0.dll",
+        ]
+      }
+
+      if (is_mac) {
+        sources += [
+          "base/interactive_test_utils_cocoa.h",
+          "base/interactive_test_utils_cocoa.mm",
+        ]
 
-      if (enable_nacl) {
         data_deps += [
-          "//components/nacl/loader:nacl_helper",
-          "//ppapi/native_client:irt",
+          "//chrome",
+          "//chrome:chrome_framework",
         ]
 
-        if (enable_nacl_nonsfi) {
-          data_deps += [ "//components/nacl/loader:helper_nonsfi" ]
+        # The browser window can be views or Cocoa on Mac. Test accordingly.
+        if (mac_views_browser) {
+          # Aura depended tests.
+          sources -=
+              [ "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc" ]
+        } else {
+          sources += [
+            "../browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm",
+            "../browser/ui/cocoa/permission_bubble/permission_bubble_cocoa_interactive_uitest.mm",
+            "../browser/ui/cocoa/translate/translate_bubble_test_utils_views_cocoa.mm",
+          ]
         }
       }
-    } else {  # ! is_chromeos
-      # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform
-      # panels).
-      sources += [
-        "../browser/notifications/notification_interactive_uitest.cc",
-        "../browser/notifications/notification_interactive_uitest_mac.mm",
-        "../browser/notifications/notification_interactive_uitest_support.cc",
-        "../browser/notifications/notification_interactive_uitest_support.h",
-      ]
-    }
 
-    if (is_win) {
-      sources += [
-        "../browser/downgrade/user_data_downgrade_browsertest.cc",
-        "../browser/notifications/notification_platform_bridge_win_interactive_uitest.cc",
-        "../browser/ui/views/touch_events_interactive_uitest_win.cc",
-        "//ui/resources/cursors/aliasb.cur",
-        "//ui/resources/cursors/cell.cur",
-        "//ui/resources/cursors/col_resize.cur",
-        "//ui/resources/cursors/copy.cur",
-        "//ui/resources/cursors/none.cur",
-        "//ui/resources/cursors/row_resize.cur",
-        "//ui/resources/cursors/vertical_text.cur",
-        "//ui/resources/cursors/zoom_in.cur",
-        "//ui/resources/cursors/zoom_out.cur",
-        "data/resource.rc",
-      ]
-      deps += [
-        "//chrome:other_version",
-        "//chrome/app:chrome_dll_resources",
-        "//chrome/install_static:install_static_util",
-        "//third_party/isimpledom",
-        "//third_party/webrtc/modules/desktop_capture",
-        "//third_party/wtl",
-        "//ui/resources",
-      ]
+      if (use_x11) {
+        configs += [ "//build/config/linux:xtst" ]
+      }
 
-      configs -= [ "//build/config/win:default_incremental_linking" ]
-      configs +=
-          [ "//build/config/win:default_large_module_incremental_linking" ]
+      if (enable_app_list) {
+        sources +=
+            [ "../browser/ui/app_list/app_list_service_interactive_uitest.cc" ]
+      }
 
-      libs = [
-        "oleacc.lib",
-        "runtimeobject.lib",
-      ]
+      if (enable_extensions) {
+        # TODO(rockot) bug 505926: The chrome_extensions_interactive_uitests
+        # target should be deleted and this line removed. See the
+        # chrome_extensions_interactive_uitests target for more.
+        deps += [ "//extensions:chrome_extensions_interactive_uitests" ]
+      }
 
-      ldflags += [
-        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
-        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-        "/DELAYLOAD:api-ms-win-core-winrt-string-l1-1-0.dll",
-      ]
-    }
+      if (!enable_native_notifications) {
+        sources += [ "../browser/notifications/message_center_notification_manager_interactive_uitest.cc" ]
+      }
 
-    if (is_mac) {
-      sources += [
-        "base/interactive_test_utils_cocoa.h",
-        "base/interactive_test_utils_cocoa.mm",
-      ]
+      if (is_android) {
+        sources -= [
+          # Android does not use the message center-based Notification system.
+          "../browser/notifications/message_center_notifications_browsertest.cc",
 
-      data_deps += [
-        "//chrome",
-        "//chrome:chrome_framework",
-      ]
+          # TODO(peter): Enable the Notification browser tests.
+          "../browser/notifications/notification_interactive_uitest.cc",
+          "../browser/notifications/platform_notification_service_interactive_uitest.cc",
+        ]
+      }
 
-      # The browser window can be views or Cocoa on Mac. Test accordingly.
-      if (mac_views_browser) {
-        # Aura depended tests.
-        sources -= [ "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc" ]
-      } else {
+      if (is_mac || is_win || (is_linux && !is_chromeos)) {
         sources += [
-          "../browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm",
-          "../browser/ui/cocoa/permission_bubble/permission_bubble_cocoa_interactive_uitest.mm",
-          "../browser/ui/cocoa/translate/translate_bubble_test_utils_views_cocoa.mm",
+          # Tests for non mobile and non CrOS (includes Linux, Win, Mac).
+          "../browser/metrics/desktop_session_duration/chrome_visibility_observer_interactive_uitest.cc",
         ]
       }
     }
 
-    if (use_x11) {
-      configs += [ "//build/config/linux:xtst" ]
-    }
-
-    if (enable_app_list) {
-      sources +=
-          [ "../browser/ui/app_list/app_list_service_interactive_uitest.cc" ]
-    }
-
-    if (enable_extensions) {
-      # TODO(rockot) bug 505926: The chrome_extensions_interactive_uitests
-      # target should be deleted and this line removed. See the
-      # chrome_extensions_interactive_uitests target for more.
-      deps += [ "//extensions:chrome_extensions_interactive_uitests" ]
-    }
-
-    if (!enable_native_notifications) {
-      sources += [ "../browser/notifications/message_center_notification_manager_interactive_uitest.cc" ]
-    }
-
-    if (is_android) {
-      sources -= [
-        # Android does not use the message center-based Notification system.
-        "../browser/notifications/message_center_notifications_browsertest.cc",
-
-        # TODO(peter): Enable the Notification browser tests.
-        "../browser/notifications/notification_interactive_uitest.cc",
-        "../browser/notifications/platform_notification_service_interactive_uitest.cc",
+    # TODO(609855): Make this compile on Android and run on the bots.
+    test("chrome_app_unittests") {
+      sources = [
+        "../app/chrome_watcher_client_unittest_win.cc",
+        "../app/chrome_watcher_client_win.cc",
+        "../app/chrome_watcher_command_line_win.cc",
+        "../app/chrome_watcher_command_line_win_unittest.cc",
+        "../app/resources/resources_unittest.cc",
       ]
-    }
-
-    if (is_mac || is_win || (is_linux && !is_chromeos)) {
-      sources += [
-        # Tests for non mobile and non CrOS (includes Linux, Win, Mac).
-        "../browser/metrics/desktop_session_duration/chrome_visibility_observer_interactive_uitest.cc",
+      deps = [
+        ":test_support",
+        "//base/test:run_all_unittests",
+        "//base/test:test_support",
+        "//chrome/browser",
+        "//chrome/child",
+        "//components/crash/core/common",
+        "//components/flags_ui:switches",
       ]
+      if (!is_fuchsia) {
+        # TODO(crbug.com/753619): Enable crash reporting on Fuchsia.
+        deps += [ "//third_party/breakpad:client" ]
+      }
     }
   }
 
-  # TODO(609855): Make this compile on Android and run on the bots.
-  test("chrome_app_unittests") {
-    sources = [
-      "../app/chrome_watcher_client_unittest_win.cc",
-      "../app/chrome_watcher_client_win.cc",
-      "../app/chrome_watcher_command_line_win.cc",
-      "../app/chrome_watcher_command_line_win_unittest.cc",
-      "../app/resources/resources_unittest.cc",
-    ]
-    deps = [
-      ":test_support",
-      "//base/test:run_all_unittests",
-      "//base/test:test_support",
-      "//chrome/browser",
-      "//chrome/child",
-      "//components/crash/core/common",
-      "//components/flags_ui:switches",
-    ]
-    if (!is_fuchsia) {
-      # TODO(crbug.com/753619): Enable crash reporting on Fuchsia.
-      deps += [ "//third_party/breakpad:client" ]
-    }
-  }
-}
+  if (!is_android && !is_chromecast) {
+    test("performance_browser_tests") {
+      sources = [
+        "../app/chrome_version.rc.version",
+        "../browser/extensions/api/cast_streaming/performance_test.cc",
+        "../browser/extensions/api/tab_capture/tab_capture_performancetest.cc",
+        "../browser/extensions/browsertest_util.cc",
+        "../browser/extensions/chrome_extension_test_notification_observer.cc",
+        "../browser/extensions/chrome_extension_test_notification_observer.h",
+        "../browser/extensions/extension_apitest.cc",
+        "../browser/extensions/extension_browsertest.cc",
+        "../browser/extensions/updater/extension_cache_fake.cc",
+        "../browser/extensions/updater/extension_cache_fake.h",
+        "base/browser_perf_tests_main.cc",
+        "base/chrome_render_view_test.cc",
+        "base/chrome_render_view_test.h",
+        "perf/mach_ports_performancetest.cc",
+        "perf/url_parse_perftest.cc",
+      ]
 
-if (!is_android && !is_chromecast) {
-  test("performance_browser_tests") {
-    sources = [
-      "../app/chrome_version.rc.version",
-      "../browser/extensions/api/cast_streaming/performance_test.cc",
-      "../browser/extensions/api/tab_capture/tab_capture_performancetest.cc",
-      "../browser/extensions/browsertest_util.cc",
-      "../browser/extensions/chrome_extension_test_notification_observer.cc",
-      "../browser/extensions/chrome_extension_test_notification_observer.h",
-      "../browser/extensions/extension_apitest.cc",
-      "../browser/extensions/extension_browsertest.cc",
-      "../browser/extensions/updater/extension_cache_fake.cc",
-      "../browser/extensions/updater/extension_cache_fake.h",
-      "base/browser_perf_tests_main.cc",
-      "base/chrome_render_view_test.cc",
-      "base/chrome_render_view_test.h",
-      "perf/mach_ports_performancetest.cc",
-      "perf/url_parse_perftest.cc",
-    ]
+      defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
-    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+      deps = [
+        ":test_support",
+        ":test_support_ui",
+        "//base",
+        "//base:i18n",
+        "//base/test:test_support",
+        "//chrome/app:chrome_dll_resources",
+        "//chrome/browser",
+        "//chrome/renderer",
+        "//components/about_handler",
+        "//components/autofill/content/renderer:test_support",
+        "//components/spellcheck:buildflags",
+        "//content/test:test_support",
+        "//extensions/buildflags",
+        "//media/cast:test_support",
+        "//testing/gmock",
+        "//testing/gtest",
+        "//testing/perf",
+      ]
 
-    deps = [
-      ":test_support",
-      ":test_support_ui",
-      "//base",
-      "//base:i18n",
-      "//base/test:test_support",
-      "//chrome/app:chrome_dll_resources",
-      "//chrome/browser",
-      "//chrome/renderer",
-      "//components/about_handler",
-      "//components/autofill/content/renderer:test_support",
-      "//components/spellcheck:buildflags",
-      "//content/test:test_support",
-      "//extensions/buildflags",
-      "//media/cast:test_support",
-      "//testing/gmock",
-      "//testing/gtest",
-      "//testing/perf",
-    ]
+      data = [
+        "//chrome/test/data/extensions/api_test/",
+      ]
 
-    data = [
-      "//chrome/test/data/extensions/api_test/",
-    ]
+      data_deps = [
+        "//testing:run_perf_test",
+      ]
 
-    data_deps = [
-      "//testing:run_perf_test",
-    ]
+      if (is_win) {
+        configs -= [ "//build/config/win:default_incremental_linking" ]
+        configs +=
+            [ "//build/config/win:default_large_module_incremental_linking" ]
+        deps += [ "//chrome/app:command_ids" ]
+      } else {
+        sources -= [ "../app/chrome_version.rc.version" ]
+      }
+      if (!is_mac) {
+        sources -= [ "perf/mach_ports_performancetest.cc" ]
+      }
 
-    if (is_win) {
-      configs -= [ "//build/config/win:default_incremental_linking" ]
-      configs +=
-          [ "//build/config/win:default_large_module_incremental_linking" ]
-      deps += [ "//chrome/app:command_ids" ]
-    } else {
-      sources -= [ "../app/chrome_version.rc.version" ]
-    }
-    if (!is_mac) {
-      sources -= [ "perf/mach_ports_performancetest.cc" ]
-    }
+      if (is_linux || is_win) {
+        data += [
+          "$root_out_dir/chrome_100_percent.pak",
+          "$root_out_dir/chrome_200_percent.pak",
+          "$root_out_dir/locales/en-US.pak",
+          "$root_out_dir/locales/fr.pak",
+          "$root_out_dir/resources.pak",
+        ]
+      }
+      if (is_mac) {
+        deps += [ "//chrome:chrome_app" ]
+      }
 
-    if (is_linux || is_win) {
-      data += [
-        "$root_out_dir/chrome_100_percent.pak",
-        "$root_out_dir/chrome_200_percent.pak",
-        "$root_out_dir/locales/en-US.pak",
-        "$root_out_dir/locales/fr.pak",
-        "$root_out_dir/resources.pak",
-      ]
-    }
-    if (is_mac) {
-      deps += [ "//chrome:chrome_app" ]
+      # This target should not require the Chrome executable to run.
+      assert_no_deps = [ "//chrome" ]
     }
-
-    # This target should not require the Chrome executable to run.
-    assert_no_deps = [ "//chrome" ]
   }
-}
-
-if (!is_android && !is_fuchsia) {
-  static_library("sync_integration_test_support") {
-    testonly = true
-    sources = [
-      "../browser/sync/test/integration/apps_helper.cc",
-      "../browser/sync/test/integration/apps_helper.h",
-      "../browser/sync/test/integration/autofill_helper.cc",
-      "../browser/sync/test/integration/autofill_helper.h",
-      "../browser/sync/test/integration/await_match_status_change_checker.cc",
-      "../browser/sync/test/integration/await_match_status_change_checker.h",
-      "../browser/sync/test/integration/bookmarks_helper.cc",
-      "../browser/sync/test/integration/bookmarks_helper.h",
-      "../browser/sync/test/integration/configuration_refresher.cc",
-      "../browser/sync/test/integration/configuration_refresher.h",
-      "../browser/sync/test/integration/dictionary_helper.cc",
-      "../browser/sync/test/integration/dictionary_helper.h",
-      "../browser/sync/test/integration/dictionary_load_observer.cc",
-      "../browser/sync/test/integration/dictionary_load_observer.h",
-      "../browser/sync/test/integration/extension_settings_helper.cc",
-      "../browser/sync/test/integration/extension_settings_helper.h",
-      "../browser/sync/test/integration/extensions_helper.cc",
-      "../browser/sync/test/integration/extensions_helper.h",
-      "../browser/sync/test/integration/fake_server_invalidation_service.cc",
-      "../browser/sync/test/integration/fake_server_invalidation_service.h",
-      "../browser/sync/test/integration/fake_server_match_status_checker.cc",
-      "../browser/sync/test/integration/fake_server_match_status_checker.h",
-      "../browser/sync/test/integration/migration_waiter.cc",
-      "../browser/sync/test/integration/migration_waiter.h",
-      "../browser/sync/test/integration/migration_watcher.cc",
-      "../browser/sync/test/integration/migration_watcher.h",
-      "../browser/sync/test/integration/multi_client_status_change_checker.cc",
-      "../browser/sync/test/integration/multi_client_status_change_checker.h",
-      "../browser/sync/test/integration/p2p_invalidation_forwarder.cc",
-      "../browser/sync/test/integration/p2p_invalidation_forwarder.h",
-      "../browser/sync/test/integration/p2p_sync_refresher.cc",
-      "../browser/sync/test/integration/p2p_sync_refresher.h",
-      "../browser/sync/test/integration/passwords_helper.cc",
-      "../browser/sync/test/integration/passwords_helper.h",
-      "../browser/sync/test/integration/preferences_helper.cc",
-      "../browser/sync/test/integration/preferences_helper.h",
-      "../browser/sync/test/integration/printers_helper.cc",
-      "../browser/sync/test/integration/printers_helper.h",
-      "../browser/sync/test/integration/profile_sync_service_harness.cc",
-      "../browser/sync/test/integration/profile_sync_service_harness.h",
-      "../browser/sync/test/integration/quiesce_status_change_checker.cc",
-      "../browser/sync/test/integration/quiesce_status_change_checker.h",
-      "../browser/sync/test/integration/retry_verifier.cc",
-      "../browser/sync/test/integration/retry_verifier.h",
-      "../browser/sync/test/integration/search_engines_helper.cc",
-      "../browser/sync/test/integration/search_engines_helper.h",
-      "../browser/sync/test/integration/session_hierarchy_match_checker.cc",
-      "../browser/sync/test/integration/session_hierarchy_match_checker.h",
-      "../browser/sync/test/integration/sessions_helper.cc",
-      "../browser/sync/test/integration/sessions_helper.h",
-      "../browser/sync/test/integration/single_client_status_change_checker.cc",
-      "../browser/sync/test/integration/single_client_status_change_checker.h",
-      "../browser/sync/test/integration/status_change_checker.cc",
-      "../browser/sync/test/integration/status_change_checker.h",
-      "../browser/sync/test/integration/sync_app_helper.cc",
-      "../browser/sync/test/integration/sync_app_helper.h",
-      "../browser/sync/test/integration/sync_app_list_helper.cc",
-      "../browser/sync/test/integration/sync_app_list_helper.h",
-      "../browser/sync/test/integration/sync_arc_package_helper.cc",
-      "../browser/sync/test/integration/sync_arc_package_helper.h",
-      "../browser/sync/test/integration/sync_datatype_helper.cc",
-      "../browser/sync/test/integration/sync_datatype_helper.h",
-      "../browser/sync/test/integration/sync_extension_helper.cc",
-      "../browser/sync/test/integration/sync_extension_helper.h",
-      "../browser/sync/test/integration/sync_extension_installer.cc",
-      "../browser/sync/test/integration/sync_extension_installer.h",
-      "../browser/sync/test/integration/sync_integration_test_util.cc",
-      "../browser/sync/test/integration/sync_integration_test_util.h",
-      "../browser/sync/test/integration/sync_test.cc",
-      "../browser/sync/test/integration/sync_test.h",
-      "../browser/sync/test/integration/themes_helper.cc",
-      "../browser/sync/test/integration/themes_helper.h",
-      "../browser/sync/test/integration/typed_urls_helper.cc",
-      "../browser/sync/test/integration/typed_urls_helper.h",
-      "../browser/sync/test/integration/updated_progress_marker_checker.cc",
-      "../browser/sync/test/integration/updated_progress_marker_checker.h",
-      "../browser/sync/test/integration/wifi_credentials_helper.cc",
-      "../browser/sync/test/integration/wifi_credentials_helper.h",
-      "../browser/sync/test/integration/wifi_credentials_helper_chromeos.cc",
-      "../browser/sync/test/integration/wifi_credentials_helper_chromeos.h",
-    ]
-    public_deps = [
-      "//chrome/browser",
-    ]
-    deps = [
-      ":test_support",
-      "//base",
-      "//components/invalidation/impl",
-      "//components/invalidation/impl:test_support",
-      "//components/sync",
-      "//components/sync:test_support_fake_server",
-      "//components/sync:test_support_model",
-      "//components/sync:test_support_testserver",
-      "//content/test:test_support",
-      "//net",
-      "//skia",
-    ]
 
-    if (is_mac) {
-      sources -= [
+  if (!is_android && !is_fuchsia) {
+    static_library("sync_integration_test_support") {
+      testonly = true
+      sources = [
+        "../browser/sync/test/integration/apps_helper.cc",
+        "../browser/sync/test/integration/apps_helper.h",
+        "../browser/sync/test/integration/autofill_helper.cc",
+        "../browser/sync/test/integration/autofill_helper.h",
+        "../browser/sync/test/integration/await_match_status_change_checker.cc",
+        "../browser/sync/test/integration/await_match_status_change_checker.h",
+        "../browser/sync/test/integration/bookmarks_helper.cc",
+        "../browser/sync/test/integration/bookmarks_helper.h",
+        "../browser/sync/test/integration/configuration_refresher.cc",
+        "../browser/sync/test/integration/configuration_refresher.h",
         "../browser/sync/test/integration/dictionary_helper.cc",
         "../browser/sync/test/integration/dictionary_helper.h",
         "../browser/sync/test/integration/dictionary_load_observer.cc",
         "../browser/sync/test/integration/dictionary_load_observer.h",
-      ]
-    }
-    if (enable_app_list) {
-      sources += [
-        "../browser/ui/app_list/test/fake_app_list_model_updater.cc",
-        "../browser/ui/app_list/test/fake_app_list_model_updater.h",
-      ]
-      deps += [ "//ui/app_list:test_support" ]
-    } else {
-      sources -= [
-        "../browser/sync/test/integration/sync_app_list_helper.cc",
-        "../browser/sync/test/integration/sync_app_list_helper.h",
-      ]
-    }
-    if (is_chromeos) {
-      deps += [
-        "//components/arc:arc_test_support",
-        "//components/user_manager:test_support",
-      ]
-    } else {
-      sources -= [
+        "../browser/sync/test/integration/extension_settings_helper.cc",
+        "../browser/sync/test/integration/extension_settings_helper.h",
+        "../browser/sync/test/integration/extensions_helper.cc",
+        "../browser/sync/test/integration/extensions_helper.h",
+        "../browser/sync/test/integration/fake_server_invalidation_service.cc",
+        "../browser/sync/test/integration/fake_server_invalidation_service.h",
+        "../browser/sync/test/integration/fake_server_match_status_checker.cc",
+        "../browser/sync/test/integration/fake_server_match_status_checker.h",
+        "../browser/sync/test/integration/migration_waiter.cc",
+        "../browser/sync/test/integration/migration_waiter.h",
+        "../browser/sync/test/integration/migration_watcher.cc",
+        "../browser/sync/test/integration/migration_watcher.h",
+        "../browser/sync/test/integration/multi_client_status_change_checker.cc",
+        "../browser/sync/test/integration/multi_client_status_change_checker.h",
+        "../browser/sync/test/integration/p2p_invalidation_forwarder.cc",
+        "../browser/sync/test/integration/p2p_invalidation_forwarder.h",
+        "../browser/sync/test/integration/p2p_sync_refresher.cc",
+        "../browser/sync/test/integration/p2p_sync_refresher.h",
+        "../browser/sync/test/integration/passwords_helper.cc",
+        "../browser/sync/test/integration/passwords_helper.h",
+        "../browser/sync/test/integration/preferences_helper.cc",
+        "../browser/sync/test/integration/preferences_helper.h",
         "../browser/sync/test/integration/printers_helper.cc",
         "../browser/sync/test/integration/printers_helper.h",
+        "../browser/sync/test/integration/profile_sync_service_harness.cc",
+        "../browser/sync/test/integration/profile_sync_service_harness.h",
+        "../browser/sync/test/integration/quiesce_status_change_checker.cc",
+        "../browser/sync/test/integration/quiesce_status_change_checker.h",
+        "../browser/sync/test/integration/retry_verifier.cc",
+        "../browser/sync/test/integration/retry_verifier.h",
+        "../browser/sync/test/integration/search_engines_helper.cc",
+        "../browser/sync/test/integration/search_engines_helper.h",
+        "../browser/sync/test/integration/session_hierarchy_match_checker.cc",
+        "../browser/sync/test/integration/session_hierarchy_match_checker.h",
+        "../browser/sync/test/integration/sessions_helper.cc",
+        "../browser/sync/test/integration/sessions_helper.h",
+        "../browser/sync/test/integration/single_client_status_change_checker.cc",
+        "../browser/sync/test/integration/single_client_status_change_checker.h",
+        "../browser/sync/test/integration/status_change_checker.cc",
+        "../browser/sync/test/integration/status_change_checker.h",
+        "../browser/sync/test/integration/sync_app_helper.cc",
+        "../browser/sync/test/integration/sync_app_helper.h",
+        "../browser/sync/test/integration/sync_app_list_helper.cc",
+        "../browser/sync/test/integration/sync_app_list_helper.h",
         "../browser/sync/test/integration/sync_arc_package_helper.cc",
         "../browser/sync/test/integration/sync_arc_package_helper.h",
+        "../browser/sync/test/integration/sync_datatype_helper.cc",
+        "../browser/sync/test/integration/sync_datatype_helper.h",
+        "../browser/sync/test/integration/sync_extension_helper.cc",
+        "../browser/sync/test/integration/sync_extension_helper.h",
+        "../browser/sync/test/integration/sync_extension_installer.cc",
+        "../browser/sync/test/integration/sync_extension_installer.h",
+        "../browser/sync/test/integration/sync_integration_test_util.cc",
+        "../browser/sync/test/integration/sync_integration_test_util.h",
+        "../browser/sync/test/integration/sync_test.cc",
+        "../browser/sync/test/integration/sync_test.h",
+        "../browser/sync/test/integration/themes_helper.cc",
+        "../browser/sync/test/integration/themes_helper.h",
+        "../browser/sync/test/integration/typed_urls_helper.cc",
+        "../browser/sync/test/integration/typed_urls_helper.h",
+        "../browser/sync/test/integration/updated_progress_marker_checker.cc",
+        "../browser/sync/test/integration/updated_progress_marker_checker.h",
         "../browser/sync/test/integration/wifi_credentials_helper.cc",
         "../browser/sync/test/integration/wifi_credentials_helper.h",
+        "../browser/sync/test/integration/wifi_credentials_helper_chromeos.cc",
+        "../browser/sync/test/integration/wifi_credentials_helper_chromeos.h",
       ]
-    }
-  }
-
-  test("sync_integration_tests") {
-    sources = [
-      "../app/chrome_version.rc.version",
-      "../browser/sync/test/integration/enable_disable_test.cc",
-      "../browser/sync/test/integration/migration_test.cc",
-      "../browser/sync/test/integration/single_client_app_list_sync_test.cc",
-      "../browser/sync/test/integration/single_client_apps_sync_test.cc",
-      "../browser/sync/test/integration/single_client_arc_package_sync_test.cc",
-      "../browser/sync/test/integration/single_client_bookmarks_sync_test.cc",
-      "../browser/sync/test/integration/single_client_dictionary_sync_test.cc",
-      "../browser/sync/test/integration/single_client_directory_sync_test.cc",
-      "../browser/sync/test/integration/single_client_extensions_sync_test.cc",
-      "../browser/sync/test/integration/single_client_passwords_sync_test.cc",
-      "../browser/sync/test/integration/single_client_preferences_sync_test.cc",
-      "../browser/sync/test/integration/single_client_printers_sync_test.cc",
-      "../browser/sync/test/integration/single_client_search_engines_sync_test.cc",
-      "../browser/sync/test/integration/single_client_sessions_sync_test.cc",
-      "../browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc",
-      "../browser/sync/test/integration/single_client_themes_sync_test.cc",
-      "../browser/sync/test/integration/single_client_typed_urls_sync_test.cc",
-      "../browser/sync/test/integration/single_client_user_events_sync_test.cc",
-      "../browser/sync/test/integration/single_client_wallet_sync_test.cc",
-      "../browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc",
-      "../browser/sync/test/integration/sync_auth_test.cc",
-      "../browser/sync/test/integration/sync_errors_test.cc",
-      "../browser/sync/test/integration/sync_exponential_backoff_test.cc",
-      "../browser/sync/test/integration/two_client_app_list_sync_test.cc",
-      "../browser/sync/test/integration/two_client_apps_sync_test.cc",
-      "../browser/sync/test/integration/two_client_arc_package_sync_test.cc",
-      "../browser/sync/test/integration/two_client_autofill_sync_test.cc",
-      "../browser/sync/test/integration/two_client_bookmarks_sync_test.cc",
-      "../browser/sync/test/integration/two_client_dictionary_sync_test.cc",
-      "../browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc",
-      "../browser/sync/test/integration/two_client_extensions_sync_test.cc",
-      "../browser/sync/test/integration/two_client_passwords_sync_test.cc",
-      "../browser/sync/test/integration/two_client_preferences_sync_test.cc",
-      "../browser/sync/test/integration/two_client_printers_sync_test.cc",
-      "../browser/sync/test/integration/two_client_search_engines_sync_test.cc",
-      "../browser/sync/test/integration/two_client_sessions_sync_test.cc",
-      "../browser/sync/test/integration/two_client_themes_sync_test.cc",
-      "../browser/sync/test/integration/two_client_typed_urls_sync_test.cc",
-      "../browser/sync/test/integration/two_client_uss_sync_test.cc",
-      "../browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc",
-      "data/resource.rc",
-    ]
-
-    data = [
-      "//chrome/test/data/sync/",
-      "//net/tools/testserver/",
-      "//components/sync/tools/testserver/",
-      "//third_party/pyftpdlib/",
-      "//third_party/pywebsocket/",
-      "//third_party/tlslite/",
-      "$root_out_dir/pyproto/",
-      "//testing/xvfb.py",
-    ]
-
-    if (is_linux || is_win) {
-      data += [
-        "$root_out_dir/chrome_100_percent.pak",
-        "$root_out_dir/chrome_200_percent.pak",
-        "$root_out_dir/locales/en-US.pak",
-        "$root_out_dir/resources.pak",
+      public_deps = [
+        "//chrome/browser",
       ]
-    }
-
-    # TODO(phajdan.jr): Only temporary, to make transition easier.
-    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-
-    deps = [
-      ":browser_tests_runner",
-      ":sync_integration_test_support",
-      ":test_support",
-      ":test_support_ui",
-      "//chrome:packed_resources",
-      "//chrome:resources",
-      "//chrome:strings",
-      "//chrome/app:chrome_dll_resources",
-      "//chrome/app:command_ids",
-      "//chrome/common",
-      "//chrome/renderer",
-      "//components/sync",
-      "//crypto:platform",
-      "//testing/gmock",
-      "//testing/gtest",
-      "//third_party/blink/public:blink",
-      "//third_party/icu",
-      "//third_party/leveldatabase",
-    ]
-
-    data_deps = [
-      "//third_party/mesa:osmesa",
-    ]
-
-    if (is_mac) {
-      # Dictionary sync is disabled on Mac.
-      sources -= [
-        "../browser/sync/test/integration/single_client_dictionary_sync_test.cc",
-        "../browser/sync/test/integration/two_client_dictionary_sync_test.cc",
+      deps = [
+        ":test_support",
+        "//base",
+        "//components/invalidation/impl",
+        "//components/invalidation/impl:test_support",
+        "//components/sync",
+        "//components/sync:test_support_fake_server",
+        "//components/sync:test_support_model",
+        "//components/sync:test_support_testserver",
+        "//content/test:test_support",
+        "//net",
+        "//skia",
       ]
 
-      data_deps += [
-        "//chrome",
-        "//chrome:chrome_framework",
-      ]
+      if (is_mac) {
+        sources -= [
+          "../browser/sync/test/integration/dictionary_helper.cc",
+          "../browser/sync/test/integration/dictionary_helper.h",
+          "../browser/sync/test/integration/dictionary_load_observer.cc",
+          "../browser/sync/test/integration/dictionary_load_observer.h",
+        ]
+      }
+      if (enable_app_list) {
+        sources += [
+          "../browser/ui/app_list/test/fake_app_list_model_updater.cc",
+          "../browser/ui/app_list/test/fake_app_list_model_updater.h",
+        ]
+        deps += [ "//ui/app_list:test_support" ]
+      } else {
+        sources -= [
+          "../browser/sync/test/integration/sync_app_list_helper.cc",
+          "../browser/sync/test/integration/sync_app_list_helper.h",
+        ]
+      }
+      if (is_chromeos) {
+        deps += [
+          "//components/arc:arc_test_support",
+          "//components/user_manager:test_support",
+        ]
+      } else {
+        sources -= [
+          "../browser/sync/test/integration/printers_helper.cc",
+          "../browser/sync/test/integration/printers_helper.h",
+          "../browser/sync/test/integration/sync_arc_package_helper.cc",
+          "../browser/sync/test/integration/sync_arc_package_helper.h",
+          "../browser/sync/test/integration/wifi_credentials_helper.cc",
+          "../browser/sync/test/integration/wifi_credentials_helper.h",
+        ]
+      }
     }
-    if (is_win) {
-      deps += [
-        "//chrome:other_version",
-        "//third_party/wtl",
-        "//ui/resources",
-      ]
 
-      configs -= [ "//build/config/win:default_incremental_linking" ]
-      configs +=
-          [ "//build/config/win:default_large_module_incremental_linking" ]
-    } else {
-      sources -= [ "../app/chrome_version.rc.version" ]
-    }
-    if (!is_chromeos) {
-      sources -= [
+    test("sync_integration_tests") {
+      sources = [
+        "../app/chrome_version.rc.version",
+        "../browser/sync/test/integration/enable_disable_test.cc",
+        "../browser/sync/test/integration/migration_test.cc",
+        "../browser/sync/test/integration/single_client_app_list_sync_test.cc",
+        "../browser/sync/test/integration/single_client_apps_sync_test.cc",
         "../browser/sync/test/integration/single_client_arc_package_sync_test.cc",
+        "../browser/sync/test/integration/single_client_bookmarks_sync_test.cc",
+        "../browser/sync/test/integration/single_client_dictionary_sync_test.cc",
+        "../browser/sync/test/integration/single_client_directory_sync_test.cc",
+        "../browser/sync/test/integration/single_client_extensions_sync_test.cc",
+        "../browser/sync/test/integration/single_client_passwords_sync_test.cc",
+        "../browser/sync/test/integration/single_client_preferences_sync_test.cc",
         "../browser/sync/test/integration/single_client_printers_sync_test.cc",
+        "../browser/sync/test/integration/single_client_search_engines_sync_test.cc",
+        "../browser/sync/test/integration/single_client_sessions_sync_test.cc",
+        "../browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc",
+        "../browser/sync/test/integration/single_client_themes_sync_test.cc",
+        "../browser/sync/test/integration/single_client_typed_urls_sync_test.cc",
+        "../browser/sync/test/integration/single_client_user_events_sync_test.cc",
+        "../browser/sync/test/integration/single_client_wallet_sync_test.cc",
         "../browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc",
+        "../browser/sync/test/integration/sync_auth_test.cc",
+        "../browser/sync/test/integration/sync_errors_test.cc",
+        "../browser/sync/test/integration/sync_exponential_backoff_test.cc",
+        "../browser/sync/test/integration/two_client_app_list_sync_test.cc",
+        "../browser/sync/test/integration/two_client_apps_sync_test.cc",
         "../browser/sync/test/integration/two_client_arc_package_sync_test.cc",
+        "../browser/sync/test/integration/two_client_autofill_sync_test.cc",
+        "../browser/sync/test/integration/two_client_bookmarks_sync_test.cc",
+        "../browser/sync/test/integration/two_client_dictionary_sync_test.cc",
+        "../browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc",
+        "../browser/sync/test/integration/two_client_extensions_sync_test.cc",
+        "../browser/sync/test/integration/two_client_passwords_sync_test.cc",
+        "../browser/sync/test/integration/two_client_preferences_sync_test.cc",
         "../browser/sync/test/integration/two_client_printers_sync_test.cc",
+        "../browser/sync/test/integration/two_client_search_engines_sync_test.cc",
+        "../browser/sync/test/integration/two_client_sessions_sync_test.cc",
+        "../browser/sync/test/integration/two_client_themes_sync_test.cc",
+        "../browser/sync/test/integration/two_client_typed_urls_sync_test.cc",
+        "../browser/sync/test/integration/two_client_uss_sync_test.cc",
         "../browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc",
+        "data/resource.rc",
       ]
-    }
 
-    if (toolkit_views) {
-      deps += [ "//ui/views" ]
-    }
-    if (enable_basic_printing || enable_print_preview) {
-      deps += [ "//printing" ]
-    }
-    if (!enable_app_list) {
-      sources -= [
-        "../browser/sync/test/integration/single_client_app_list_sync_test.cc",
-        "../browser/sync/test/integration/two_client_app_list_sync_test.cc",
+      data = [
+        "//chrome/test/data/sync/",
+        "//net/tools/testserver/",
+        "//components/sync/tools/testserver/",
+        "//third_party/pyftpdlib/",
+        "//third_party/pywebsocket/",
+        "//third_party/tlslite/",
+        "$root_out_dir/pyproto/",
+        "//testing/xvfb.py",
       ]
-    }
-    if (!enable_supervised_users) {
-      sources -= [ "../browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc" ]
-    }
-  }
 
-  test("sync_performance_tests") {
-    sources = [
-      "../app/chrome_version.rc.version",
-      "../browser/sync/test/integration/performance/autofill_sync_perf_test.cc",
-      "../browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc",
-      "../browser/sync/test/integration/performance/dictionary_sync_perf_test.cc",
-      "../browser/sync/test/integration/performance/extensions_sync_perf_test.cc",
-      "../browser/sync/test/integration/performance/passwords_sync_perf_test.cc",
-      "../browser/sync/test/integration/performance/sessions_sync_perf_test.cc",
-      "../browser/sync/test/integration/performance/sync_timing_helper.cc",
-      "../browser/sync/test/integration/performance/sync_timing_helper.h",
-      "../browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc",
-      "base/browser_perf_tests_main.cc",
-      "data/resource.rc",
-    ]
+      if (is_linux || is_win) {
+        data += [
+          "$root_out_dir/chrome_100_percent.pak",
+          "$root_out_dir/chrome_200_percent.pak",
+          "$root_out_dir/locales/en-US.pak",
+          "$root_out_dir/resources.pak",
+        ]
+      }
 
-    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+      # TODO(phajdan.jr): Only temporary, to make transition easier.
+      defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
-    deps = [
-      ":sync_integration_test_support",
-      ":test_support_ui",
-      "//chrome/app:chrome_dll_resources",
-      "//chrome/app:command_ids",
-      "//components/sync",
-      "//crypto:platform",
-      "//testing/gmock",
-      "//testing/gtest",
-    ]
+      deps = [
+        ":browser_tests_runner",
+        ":sync_integration_test_support",
+        ":test_support",
+        ":test_support_ui",
+        "//chrome:packed_resources",
+        "//chrome:resources",
+        "//chrome:strings",
+        "//chrome/app:chrome_dll_resources",
+        "//chrome/app:command_ids",
+        "//chrome/common",
+        "//chrome/renderer",
+        "//components/sync",
+        "//crypto:platform",
+        "//testing/gmock",
+        "//testing/gtest",
+        "//third_party/blink/public:blink",
+        "//third_party/icu",
+        "//third_party/leveldatabase",
+      ]
 
-    if (is_mac) {
-      # Dictionary sync is disabled on Mac.
-      sources -= [ "../browser/sync/test/integration/performance/dictionary_sync_perf_test.cc" ]
+      data_deps = [
+        "//third_party/mesa:osmesa",
+      ]
 
-      # The sync_performance_tests do not run on mac without this flag.
-      # Search for comments about "xcode_settings" elsewhere in this file.
-      ldflags = [ "-Wl,-ObjC" ]
+      if (is_mac) {
+        # Dictionary sync is disabled on Mac.
+        sources -= [
+          "../browser/sync/test/integration/single_client_dictionary_sync_test.cc",
+          "../browser/sync/test/integration/two_client_dictionary_sync_test.cc",
+        ]
+
+        data_deps += [
+          "//chrome",
+          "//chrome:chrome_framework",
+        ]
+      }
+      if (is_win) {
+        deps += [
+          "//chrome:other_version",
+          "//third_party/wtl",
+          "//ui/resources",
+        ]
+
+        configs -= [ "//build/config/win:default_incremental_linking" ]
+        configs +=
+            [ "//build/config/win:default_large_module_incremental_linking" ]
+      } else {
+        sources -= [ "../app/chrome_version.rc.version" ]
+      }
+      if (!is_chromeos) {
+        sources -= [
+          "../browser/sync/test/integration/single_client_arc_package_sync_test.cc",
+          "../browser/sync/test/integration/single_client_printers_sync_test.cc",
+          "../browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc",
+          "../browser/sync/test/integration/two_client_arc_package_sync_test.cc",
+          "../browser/sync/test/integration/two_client_printers_sync_test.cc",
+          "../browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc",
+        ]
+      }
+
+      if (toolkit_views) {
+        deps += [ "//ui/views" ]
+      }
+      if (enable_basic_printing || enable_print_preview) {
+        deps += [ "//printing" ]
+      }
+      if (!enable_app_list) {
+        sources -= [
+          "../browser/sync/test/integration/single_client_app_list_sync_test.cc",
+          "../browser/sync/test/integration/two_client_app_list_sync_test.cc",
+        ]
+      }
+      if (!enable_supervised_users) {
+        sources -= [ "../browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc" ]
+      }
     }
-    if (is_win) {
-      deps += [
-        "//chrome:other_version",
-        "//chrome/installer/util:strings",
-        "//third_party/wtl",
-        "//ui/resources",
+
+    test("sync_performance_tests") {
+      sources = [
+        "../app/chrome_version.rc.version",
+        "../browser/sync/test/integration/performance/autofill_sync_perf_test.cc",
+        "../browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc",
+        "../browser/sync/test/integration/performance/dictionary_sync_perf_test.cc",
+        "../browser/sync/test/integration/performance/extensions_sync_perf_test.cc",
+        "../browser/sync/test/integration/performance/passwords_sync_perf_test.cc",
+        "../browser/sync/test/integration/performance/sessions_sync_perf_test.cc",
+        "../browser/sync/test/integration/performance/sync_timing_helper.cc",
+        "../browser/sync/test/integration/performance/sync_timing_helper.h",
+        "../browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc",
+        "base/browser_perf_tests_main.cc",
+        "data/resource.rc",
       ]
-      configs -= [ "//build/config/win:default_incremental_linking" ]
-      configs +=
-          [ "//build/config/win:default_large_module_incremental_linking" ]
-    } else {
-      sources -= [ "../app/chrome_version.rc.version" ]
-    }
 
-    if (toolkit_views) {
-      deps += [ "//ui/views" ]
-    }
+      defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
-    # This target should not require the Chrome executable to run.
-    assert_no_deps = [ "//chrome" ]
-  }
+      deps = [
+        ":sync_integration_test_support",
+        ":test_support_ui",
+        "//chrome/app:chrome_dll_resources",
+        "//chrome/app:command_ids",
+        "//components/sync",
+        "//crypto:platform",
+        "//testing/gmock",
+        "//testing/gtest",
+      ]
 
-  # Executable to measure time to load libraries.
-  test("load_library_perf_tests") {
-    sources = [
-      "../browser/load_library_perf_test.cc",
-    ]
+      if (is_mac) {
+        # Dictionary sync is disabled on Mac.
+        sources -= [ "../browser/sync/test/integration/performance/dictionary_sync_perf_test.cc" ]
 
-    # This test deliberately does not depend in chrome's test support targets.
-    # This is a small test and Chrome's test support targets bring in the
-    # world, causing link time to explode. Please don't add more dependencies
-    # here without understanding how it affects link time (and factor them
-    # differently if possible).
-    deps = [
-      "//base/test:test_support_perf",
-      "//media:media_buildflags",
-      "//testing/gtest",
-      "//testing/perf",
-      "//third_party/widevine/cdm:headers",
-    ]
+        # The sync_performance_tests do not run on mac without this flag.
+        # Search for comments about "xcode_settings" elsewhere in this file.
+        ldflags = [ "-Wl,-ObjC" ]
+      }
+      if (is_win) {
+        deps += [
+          "//chrome:other_version",
+          "//chrome/installer/util:strings",
+          "//third_party/wtl",
+          "//ui/resources",
+        ]
+        configs -= [ "//build/config/win:default_incremental_linking" ]
+        configs +=
+            [ "//build/config/win:default_large_module_incremental_linking" ]
+      } else {
+        sources -= [ "../app/chrome_version.rc.version" ]
+      }
 
-    data_deps = [
-      "//testing:run_perf_test",
-    ]
+      if (toolkit_views) {
+        deps += [ "//ui/views" ]
+      }
 
-    if (enable_library_cdms) {
-      deps += [ "//media/cdm:cdm_paths" ]
-      data_deps += [
-        "//media/cdm/library_cdm/clear_key_cdm",
-        "//third_party/widevine/cdm",
-      ]
+      # This target should not require the Chrome executable to run.
+      assert_no_deps = [ "//chrome" ]
     }
 
-    # This target should not require the Chrome executable to run.
-    assert_no_deps = [ "//chrome" ]
-  }
+    # Executable to measure time to load libraries.
+    test("load_library_perf_tests") {
+      sources = [
+        "../browser/load_library_perf_test.cc",
+      ]
 
-  group("telemetry_unittests") {
-    testonly = true
-    deps = [
-      "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
-    ]
+      # This test deliberately does not depend in chrome's test support targets.
+      # This is a small test and Chrome's test support targets bring in the
+      # world, causing link time to explode. Please don't add more dependencies
+      # here without understanding how it affects link time (and factor them
+      # differently if possible).
+      deps = [
+        "//base/test:test_support_perf",
+        "//media:media_buildflags",
+        "//testing/gtest",
+        "//testing/perf",
+        "//third_party/widevine/cdm:headers",
+      ]
 
-    data = [
-      "//tools/perf/run_telemetry_tests",
+      data_deps = [
+        "//testing:run_perf_test",
+      ]
 
-      # For isolate contract.
-      "//testing/scripts/common.py",
-      "//testing/xvfb.py",
-      "//testing/scripts/run_telemetry_as_googletest.py",
-    ]
+      if (enable_library_cdms) {
+        deps += [ "//media/cdm:cdm_paths" ]
+        data_deps += [
+          "//media/cdm/library_cdm/clear_key_cdm",
+          "//third_party/widevine/cdm",
+        ]
+      }
 
-    if (enable_mus) {
-      deps += [ "//chrome:chrome_test" ]
-      data_deps = [
-        "//chrome:chrome_test",
+      # This target should not require the Chrome executable to run.
+      assert_no_deps = [ "//chrome" ]
+    }
+
+    group("telemetry_unittests") {
+      testonly = true
+      deps = [
+        "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
+      ]
+
+      data = [
+        "//tools/perf/run_telemetry_tests",
+
+        # For isolate contract.
+        "//testing/scripts/common.py",
+        "//testing/xvfb.py",
+        "//testing/scripts/run_telemetry_as_googletest.py",
       ]
+
+      if (enable_mus) {
+        deps += [ "//chrome:chrome_test" ]
+        data_deps = [
+          "//chrome:chrome_test",
+        ]
+      }
     }
-  }
 
-  group("telemetry_gpu_unittests_run") {
-    testonly = true
-    deps = [
-      ":telemetry_gpu_unittests",
-    ]
-  }
+    group("telemetry_gpu_unittests_run") {
+      testonly = true
+      deps = [
+        ":telemetry_gpu_unittests",
+      ]
+    }
 
-  group("telemetry_gpu_unittests") {
-    deps = [
-      "//third_party/catapult/telemetry:telemetry_test_support",
-    ]
-    data = [
-      # TODO(kbr): refactor the telemetry dependencies more cleanly.
-      "//content/test/gpu/",
-      "//content/test/data/gpu/",
-
-      # For GpuProcess.video
-      "//content/test/data/media/bear.ogv",
-
-      # For webgl_conformance_expectations_unittest
-      "//third_party/webgl/src/sdk/tests/",
-
-      # For resolve the imports in content/test/gpu/run_gpu_test.py
-      "//tools/perf/core/",
-      "//tools/perf/chrome_telemetry_build/",
-
-      # From telemetry_gpu_unittests.isolate
-      "//third_party/pylint/",
-      "//third_party/logilab/",
-      "//testing/scripts/common.py",
-      "//testing/xvfb.py",
-      "//testing/scripts/run_telemetry_as_googletest.py",
-    ]
+    group("telemetry_gpu_unittests") {
+      deps = [
+        "//third_party/catapult/telemetry:telemetry_test_support",
+      ]
+      data = [
+        # TODO(kbr): refactor the telemetry dependencies more cleanly.
+        "//content/test/gpu/",
+        "//content/test/data/gpu/",
+
+        # For GpuProcess.video
+        "//content/test/data/media/bear.ogv",
+
+        # For webgl_conformance_expectations_unittest
+        "//third_party/webgl/src/sdk/tests/",
+
+        # For resolve the imports in content/test/gpu/run_gpu_test.py
+        "//tools/perf/core/",
+        "//tools/perf/chrome_telemetry_build/",
+
+        # From telemetry_gpu_unittests.isolate
+        "//third_party/pylint/",
+        "//third_party/logilab/",
+        "//testing/scripts/common.py",
+        "//testing/xvfb.py",
+        "//testing/scripts/run_telemetry_as_googletest.py",
+      ]
+    }
   }
 }
-}
 
 if (safe_browsing_mode == 1 && is_mac) {
   action("mac_safe_browsing_test_data") {

diff --git a/components/crash/content/app/BUILD.gn b/components/crash/content/app/BUILD.gn
index 6e27f0c..1c67c60 100644 (file)
--- a/components/crash/content/app/BUILD.gn
+++ b/components/crash/content/app/BUILD.gn
@@ -58,7 +58,8 @@ static_library("app") {
     "//base",
   ]
 
-  if ((is_mac || is_win || is_android || (is_linux && !is_chromeos)) && !use_efl) {
+  if ((is_mac || is_win || is_android || (is_linux && !is_chromeos)) &&
+      !use_efl) {
     deps += [
       "//third_party/crashpad/crashpad/client",
       "//third_party/crashpad/crashpad/snapshot:snapshot_api",

diff --git a/components/nacl/features.gni b/components/nacl/features.gni
index 26af61e..4172d9a 100644 (file)
--- a/components/nacl/features.gni
+++ b/components/nacl/features.gni
@@ -12,7 +12,8 @@ declare_args() {
   enable_nacl =
       checkout_nacl && !is_ios && !is_android && !is_fuchsia &&
       !is_chromecast && current_cpu != "mipsel" && current_cpu != "mips64el" &&
-      !(is_linux && target_cpu == "arm64") && !(is_win && host_os != "win") && !use_efl
+      !(is_linux && target_cpu == "arm64") && !(is_win && host_os != "win") &&
+      !use_efl
 
   # Non-SFI is not yet supported on mipsel
   enable_nacl_nonsfi = current_cpu != "mipsel" && current_cpu != "mips64el"

diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index c556b45..bb3d60a 100644 (file)
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -410,7 +410,6 @@ source_set("common") {
     "//url/ipc:url_ipc",
   ]
 
-
   defines = []
   include_dirs = []
   libs = []

diff --git a/content/common/cursors/webcursor.h b/content/common/cursors/webcursor.h
index 214cc27..88a4bb7 100644 (file)
--- a/content/common/cursors/webcursor.h
+++ b/content/common/cursors/webcursor.h
@@ -138,7 +138,8 @@ class CONTENT_EXPORT WebCursor {
   float custom_scale_;
   std::vector<char> custom_data_;
 
-#if (defined(USE_AURA) || defined(USE_EFL)) && (defined(USE_X11) || defined(USE_OZONE))
+#if (defined(USE_AURA) || defined(USE_EFL)) && \
+    (defined(USE_X11) || defined(USE_OZONE))
   // Only used for custom cursors.
   ui::PlatformCursor platform_cursor_;
 #elif defined(OS_WIN)

diff --git a/content/public/common/BUILD.gn b/content/public/common/BUILD.gn
index 653a500..a4c7601 100644 (file)
--- a/content/public/common/BUILD.gn
+++ b/content/public/common/BUILD.gn
@@ -339,6 +339,7 @@ jumbo_source_set("common_sources") {
 
   if (use_efl) {
     configs += external_content_common_efl_configs
+
     # This target depends on the //content/common so below
     # sources are not required here
     sources -= external_exclude_content_common_efl_sources

diff --git a/testing/test.gni b/testing/test.gni
index 63ceeae..7cfc8ef 100644 (file)
--- a/testing/test.gni
+++ b/testing/test.gni
@@ -354,7 +354,6 @@ template("test") {
         # All shared libraries must have the sanitizer deps to properly link in
         # asan mode (this target will be empty in other cases).
         "//build/config:exe_and_shlib_deps",
-
         # Give tests the default manifest on Windows (a no-op elsewhere).
         #"//build/win:default_exe_manifest",
       ]

diff --git a/third_party/ffmpeg/ffmpeg_options.gni b/third_party/ffmpeg/ffmpeg_options.gni
index c1ae7dd..3adeda1 100644 (file)
--- a/third_party/ffmpeg/ffmpeg_options.gni
+++ b/third_party/ffmpeg/ffmpeg_options.gni
@@ -51,13 +51,13 @@ declare_args() {
   ffmpeg_use_atomics_fallback = !is_clang
 }
 
-assert(ffmpeg_branding == "Chromium" ||
-       ffmpeg_branding == "Chrome" ||
+assert(ffmpeg_branding == "Chromium" || ffmpeg_branding == "Chrome" ||
        ffmpeg_branding == "ChromeOS")
 
 if (current_cpu == "x86") {
   ffmpeg_arch = "ia32"
-} else if ((current_cpu == "arm" || is_tizen) && arm_version >= 7 && arm_use_neon) {
+} else if ((current_cpu == "arm" || is_tizen) && arm_version >= 7 &&
+           arm_use_neon) {
   ffmpeg_arch = "arm-neon"
 } else if (is_tizen) {
   ffmpeg_arch = "arm"

diff --git a/third_party/libxml/BUILD.gn b/third_party/libxml/BUILD.gn
index aafa506..fe660ac 100644 (file)
--- a/third_party/libxml/BUILD.gn
+++ b/third_party/libxml/BUILD.gn
@@ -16,4 +16,3 @@ static_library("libxml") {
 
   public_configs = [ ":system_libxml" ]
 }
-

diff --git a/third_party/opus/BUILD.gn b/third_party/opus/BUILD.gn
index e653e2f..ce16d48 100644 (file)
--- a/third_party/opus/BUILD.gn
+++ b/third_party/opus/BUILD.gn
@@ -11,12 +11,13 @@ use_opus_fixed_point = current_cpu == "arm" || current_cpu == "arm64"
 # If ARM optimizations shall be used to accelerate performance.
 # TODO(scottmg): Disabled on Fuchsia for now, see https://crbug.com/775272.
 use_opus_arm_optimization =
-    current_cpu == "arm" || (current_cpu == "arm64" && is_ios || is_tizen)
+    current_cpu == "arm" || ((current_cpu == "arm64" && is_ios) || is_tizen)
 
 # If OPUS Run Time CPU Detections (RTCD) shall be used.
 # Based on the conditions in celt/arm/armcpu.c:
 # defined(_MSC_VER) || defined(__linux__).
-use_opus_rtcd = current_cpu == "arm" && (is_win || is_android || is_linux) || is_tizen
+use_opus_rtcd =
+    (current_cpu == "arm" && (is_win || is_android || is_linux)) || is_tizen
 
 config("opus_config") {
   include_dirs = [ "src/include" ]

diff --git a/tizen_src/.gn b/tizen_src/.gn
index 9aebe3e..ec8d752 100644 (file)
--- a/tizen_src/.gn
+++ b/tizen_src/.gn
@@ -234,6 +234,7 @@ exec_script_whitelist =
 
       "//terrace/BUILD.gn",
       "//terrace/make_terrace_target.gni",
+
       # TODO(dpranke): Get these from the appropriate repos instead.
       "//third_party/angle/BUILD.gn",
       "//third_party/angle/src/tests/BUILD.gn",

diff --git a/tizen_src/BUILD.gn b/tizen_src/BUILD.gn
index 3550d31..59807f1 100644 (file)
--- a/tizen_src/BUILD.gn
+++ b/tizen_src/BUILD.gn
@@ -13,6 +13,6 @@
 group("tizen_src_root") {
   testonly = true
   deps = [
-    "//tizen_src/ewk:chromium_efl_all"
+    "//tizen_src/ewk:chromium_efl_all",
   ]
 }

diff --git a/tizen_src/build/BUILD.gn b/tizen_src/build/BUILD.gn
index 4b125f2..116e75e 100644 (file)
--- a/tizen_src/build/BUILD.gn
+++ b/tizen_src/build/BUILD.gn
@@ -116,7 +116,7 @@ tizen_pkg_config("libelementary") {
 }
 
 config("elementary-public") {
-  cflags = [] #[ "-elementary" ]
+  cflags = []  #[ "-elementary" ]
   if (is_clang) {
     # Fix: elm_prefs_common.h:27:9: warning: empty struct has size 0 in C, size 1 in C++
     cflags += [ "-Wno-extern-c-compat" ]
@@ -155,20 +155,20 @@ config("efl-extension-public") {
 }
 
 config("ui-gadget") {
-  if (building_for_tizen && building_strategy=="ewk") {
+  if (building_for_tizen && building_strategy == "ewk") {
     ldflags = [ "-lui-gadget-1" ]
   }
 }
 
 tizen_pkg_config("libui-gadget") {
   packages = []
-  if (building_for_tizen && building_strategy=="ewk") {
+  if (building_for_tizen && building_strategy == "ewk") {
     packages = [ "ui-gadget-1" ]
   }
 }
 
 config("ui-gadget-public") {
-  if (building_for_tizen && building_strategy=="ewk") {
+  if (building_for_tizen && building_strategy == "ewk") {
     cflags = [ "-DUG_WAYLAND" ]
   }
 }
@@ -188,44 +188,44 @@ tizen_pkg_config("libcapi-appfw-application") {
 
 config("capi-appfw-application-public") {
   if (building_for_tizen) {
-#    cflags = [ "-capi-appfw-application" ]
+    #    cflags = [ "-capi-appfw-application" ]
   }
 }
 
 config("capi-location-manager") {
-  if (building_for_tizen && building_strategy=="ewk") {
+  if (building_for_tizen && building_strategy == "ewk") {
     ldflags = [ "-lcapi-location-manager" ]
   }
 }
 
 tizen_pkg_config("libcapi-location-manager") {
   packages = []
-  if (building_for_tizen && building_strategy=="ewk") {
+  if (building_for_tizen && building_strategy == "ewk") {
     packages = [ "capi-location-manager" ]
   }
 }
 
 config("capi-location-manager-public") {
-  if (building_for_tizen && building_strategy=="ewk") {
+  if (building_for_tizen && building_strategy == "ewk") {
     #cflags = [ "-capi-location-manager" ]
   }
 }
 
 config("capi-system-info") {
-  if (building_for_tizen && building_strategy=="ewk") {
+  if (building_for_tizen && building_strategy == "ewk") {
     ldflags = [ "-lcapi-system-info" ]
   }
 }
 
 tizen_pkg_config("libcapi-system-info") {
   packages = []
-  if (building_for_tizen && building_strategy=="ewk") {
+  if (building_for_tizen && building_strategy == "ewk") {
     packages = [ "capi-system-info" ]
   }
 }
 
 config("capi-system-info-public") {
-  if (building_for_tizen && building_strategy=="ewk") {
+  if (building_for_tizen && building_strategy == "ewk") {
     #cflags = [ "-capi-system-info" ]
   }
 }
@@ -372,7 +372,7 @@ config("gstreamer") {
       "-lgstpbutils-1.0",
       "-lgstvideo-1.0",
     ]
-  } else { # for Tizen v2.X
+  } else {  # for Tizen v2.X
     ldflags = [
       "gstreamer-0.10",
       "gstreamer-base-0.10",
@@ -393,7 +393,7 @@ tizen_pkg_config("libgstreamer") {
       "gstreamer-pbutils-1.0",
       "gstreamer-video-1.0",
     ]
-  } else { # for Tizen v2.X
+  } else {  # for Tizen v2.X
     packages = [
       "gstreamer-0.10",
       "gstreamer-base-0.10",
@@ -555,20 +555,20 @@ config("vconf-public") {
 }
 
 config("feedback") {
-  if (building_for_tizen && building_strategy=="ewk") {
+  if (building_for_tizen && building_strategy == "ewk") {
     ldflags = [ "-lfeedback" ]
   }
 }
 
 tizen_pkg_config("libfeedback") {
   packages = []
-  if (building_for_tizen && building_strategy=="ewk") {
+  if (building_for_tizen && building_strategy == "ewk") {
     packages = [ "feedback" ]
   }
 }
 
 config("feedback-public") {
-  if (building_for_tizen && building_strategy=="ewk") {
+  if (building_for_tizen && building_strategy == "ewk") {
     #cflags = [ "-feedback" ]
   }
 }

diff --git a/tizen_src/build/config/BUILD.gn b/tizen_src/build/config/BUILD.gn
index 67a787e..fdb0c82 100644 (file)
--- a/tizen_src/build/config/BUILD.gn
+++ b/tizen_src/build/config/BUILD.gn
@@ -60,6 +60,7 @@ config("tizen_feature_flags") {
       "OS_TIZEN",
       "WTF_OS_TIZEN",
     ]
+
     # Tizen build system has a global option '-Wformat-security'.
     # So, a cflag '-Wno-format' from chromium-efl needs to be ignored.
     # Otherwise, following error will happen.

diff --git a/tizen_src/build/config/BUILDCONFIG.gn b/tizen_src/build/config/BUILDCONFIG.gn
index 72d85b1..9a19b1b 100644 (file)
--- a/tizen_src/build/config/BUILDCONFIG.gn
+++ b/tizen_src/build/config/BUILDCONFIG.gn
@@ -495,9 +495,8 @@ default_compiler_configs = [
   "//build/config/sanitizers:default_sanitizer_flags",
 ]
 if (!is_tizen) {
-  default_compiler_configs += [
-    "//tizen_src/build/config/compiler:tizen_default_lib_dirs",
-  ]
+  default_compiler_configs +=
+      [ "//tizen_src/build/config/compiler:tizen_default_lib_dirs" ]
 }
 if (is_win) {
   default_compiler_configs += [

diff --git a/tizen_src/build/config/compiler/BUILD.gn b/tizen_src/build/config/compiler/BUILD.gn
index dc194a3..4279cac 100644 (file)
--- a/tizen_src/build/config/compiler/BUILD.gn
+++ b/tizen_src/build/config/compiler/BUILD.gn
@@ -12,8 +12,7 @@ declare_args() {
 }
 
 config("tizen_default_lib_dirs") {
-  lib_dirs = [
-  ]
+  lib_dirs = []
 }
 
 config("tizen_default_include_dirs") {
@@ -25,6 +24,7 @@ config("tizen_default_include_dirs") {
     "//third_party/blink/renderer",
 
     deps_include_path,
+
     # find / -name *.h -printf '%h\n' | sort --unique
     "$deps_include_path/dbus-1.0",
     "$deps_include_path/ecore-1",

diff --git a/tizen_src/build/config/tizen_features.gni b/tizen_src/build/config/tizen_features.gni
index b5e4f0b..99d6579 100644 (file)
--- a/tizen_src/build/config/tizen_features.gni
+++ b/tizen_src/build/config/tizen_features.gni
@@ -9,7 +9,7 @@ declare_args() {
 
   use_wayland = false
 
-  linux_use_gold_flags = false   # no use of this variable, if removing then revome from gn_chromiumefl.sh also
+  linux_use_gold_flags = false  # no use of this variable, if removing then revome from gn_chromiumefl.sh also
 
   deps_lib_path = ""
   disable_fatal_linker_warnings = true  # no use of this variable, if removing then revome from gn_chromiumefl.sh also
@@ -23,7 +23,8 @@ declare_args() {
   use_pango = false
 
   tizen_multimedia_support = false
-  werror=false
+  werror = false
+
   # declared from BUILDCONFIG.gn
   #is_clang = false
   xwalk_link_against_chromium_ewk = false
@@ -61,7 +62,7 @@ use_aura = false
 ewk_bringup = true
 wayland_bringup = use_wayland
 
-building_strategy = "ewk" # 'ewk', 'libs' and 'crosswalk-bin'
+building_strategy = "ewk"  # 'ewk', 'libs' and 'crosswalk-bin'
 
 compile_suid_client = true
 compile_credentials = true
@@ -82,6 +83,6 @@ if (xwalk_link_against_chromium_ewk) {
 
 is_official_build = false
 
-treat_warnings_as_errors=werror
+treat_warnings_as_errors = werror
 
-use_x11=false
+use_x11 = false

diff --git a/tizen_src/build/toolchain/tizen/BUILD.gn b/tizen_src/build/toolchain/tizen/BUILD.gn
index af68b41..699f672 100644 (file)
--- a/tizen_src/build/toolchain/tizen/BUILD.gn
+++ b/tizen_src/build/toolchain/tizen/BUILD.gn
@@ -7,7 +7,6 @@ import("//build/toolchain/gcc_toolchain.gni")
 
 template("tizen_gcc_toolchain") {
   gcc_toolchain(target_name) {
-
     is_clang = invoker.is_clang
     if (is_clang) {
       prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
@@ -22,6 +21,7 @@ template("tizen_gcc_toolchain") {
     ld = cxx
     readelf = "readelf"
     nm = "nm"
+
     #strip = "strip"
 
     # Don't use .cr.so for loadable_modules since they are always loaded via

diff --git a/tizen_src/chromium_impl/chrome/chrome_tests_efl.gni b/tizen_src/chromium_impl/chrome/chrome_tests_efl.gni
index d411852..c21cc29 100644 (file)
--- a/tizen_src/chromium_impl/chrome/chrome_tests_efl.gni
+++ b/tizen_src/chromium_impl/chrome/chrome_tests_efl.gni
@@ -6,7 +6,7 @@ import("//tizen_src/build/config/tizen_features.gni")
 
 # For //chrome/test/chromedriver:lib target
 # It seems that keycode_text_conversion_win.cc is not used in gn files so no need to exclude it.
-external_exclude_chrome_test_driver_sources = [] #[ "test/chromedriver/keycode_text_conversion_win.cc" ]
+external_exclude_chrome_test_driver_sources = []  #[ "test/chromedriver/keycode_text_conversion_win.cc" ]
 if (use_wayland) {
   #external_exclude_chrome_test_driver_sources += [ "test/chromedriver/keycode_text_conversion_x.cc" ]
 }

diff --git a/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.cc b/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.cc
index 8a07259..da2aed4 100644 (file)
--- a/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.cc
+++ b/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.cc
@@ -26,7 +26,6 @@ void JavaScriptDialogManagerEfl::RunJavaScriptDialog(
     const base::string16& default_prompt_text,
     DialogClosedCallback callback,
     bool* did_suppress_message) {
-
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(web_contents);
 

diff --git a/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.h b/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.h
index fed946f..1b7c42d 100644 (file)
--- a/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.h
+++ b/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.h
@@ -53,8 +53,7 @@ class JavaScriptDialogManagerEfl: public JavaScriptDialogManager {
 
   // Cancels all active and pending dialogs for the given WebContents. If
   // |reset_state| is true, resets any saved state tied to |web_contents|.
-  void CancelDialogs(WebContents* web_contents,
-                     bool reset_state) override;
+  void CancelDialogs(WebContents* web_contents, bool reset_state) override;
 
  private:
   std::map<WebContents*, JavaScriptModalDialogEfl*> open_dialogs_;

diff --git a/tizen_src/chromium_impl/content/BUILD.gn b/tizen_src/chromium_impl/content/BUILD.gn
index 37e17f9..62198de 100644 (file)
--- a/tizen_src/chromium_impl/content/BUILD.gn
+++ b/tizen_src/chromium_impl/content/BUILD.gn
@@ -5,14 +5,14 @@
 static_library("android_content_detection") {
   set_sources_assignment_filter([])
   sources = [
-    "//content/renderer/android/renderer_date_time_picker.h",
     "//content/renderer/android/renderer_date_time_picker.cc",
+    "//content/renderer/android/renderer_date_time_picker.h",
   ]
 
   deps = [
-    "//third_party/libphonenumber:libphonenumber",
-    "//third_party/icu:icui18n",
-    "//third_party/blink/public:blink",
     "//mojo/public/cpp/bindings:bindings",
+    "//third_party/blink/public:blink",
+    "//third_party/icu:icui18n",
+    "//third_party/libphonenumber:libphonenumber",
   ]
 }

diff --git a/tizen_src/chromium_impl/content/browser/browser_efl.gni b/tizen_src/chromium_impl/content/browser/browser_efl.gni
index 6238706..594c13b 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/browser_efl.gni
+++ b/tizen_src/chromium_impl/content/browser/browser_efl.gni
@@ -60,7 +60,8 @@ if (building_for_tizen) {
   ]
 }
 if (building_for_tizen_mobile) {
-  external_exclude_content_browser_efl_sources = [ "device_sensors/data_fetcher_shared_memory_default.cc" ]
+  external_exclude_content_browser_efl_sources =
+      [ "device_sensors/data_fetcher_shared_memory_default.cc" ]
   external_content_browser_efl_sources += [
     "//tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.cc",
     "//tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.h",

diff --git a/tizen_src/chromium_impl/content/browser/compositor/evasgl_context_provider.h b/tizen_src/chromium_impl/content/browser/compositor/evasgl_context_provider.h
index 1edcbe7..42b2fbd 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/compositor/evasgl_context_provider.h
+++ b/tizen_src/chromium_impl/content/browser/compositor/evasgl_context_provider.h
@@ -15,9 +15,9 @@
 
 namespace content {
 
-class CONTENT_EXPORT EvasGLContextProvider : 
-  public base::RefCountedThreadSafe<EvasGLContextProvider>,
-  public viz::ContextProvider {
+class CONTENT_EXPORT EvasGLContextProvider
+    : public base::RefCountedThreadSafe<EvasGLContextProvider>,
+      public viz::ContextProvider {
  public:
   EvasGLContextProvider(Evas_GL_API* evas_gl_api);
 

diff --git a/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc b/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc
index 165c79d..14bbba0 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc
+++ b/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc
@@ -33,7 +33,7 @@ void EvasGLDelegatedFrameHost::Initialize() {
   output_surface_->BindToClient(output_surface_client_.get());
 
   // TODO: Check if this has to be true.
-  //constexpr bool delegated_sync_points_required = false;
+  // constexpr bool delegated_sync_points_required = false;
   resource_provider_ = std::make_unique<cc::DisplayResourceProvider>(
       output_surface_->context_provider(), nullptr);
 

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
index 0037820..4388166 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
@@ -508,11 +508,12 @@ bool RenderWidgetHostViewEfl::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewEfl, message)
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputInFormStateChanged,
-                      OnTextInputInFormStateChanged)
-  IPC_MESSAGE_HANDLER(ViewHostMsg_SnapshotDataReceived, OnSnapshotDataReceived)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputInFormStateChanged,
+                        OnTextInputInFormStateChanged)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_SnapshotDataReceived,
+                        OnSnapshotDataReceived)
 #endif
-  IPC_MESSAGE_UNHANDLED(handled = false)
+    IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
@@ -701,8 +702,7 @@ gfx::Vector2d RenderWidgetHostViewEfl::GetOffsetFromRootSurface() {
   return gfx::Vector2d();
 }
 
-void RenderWidgetHostViewEfl::UpdateBackgroundColorFromRenderer(
-    SkColor color) {
+void RenderWidgetHostViewEfl::UpdateBackgroundColorFromRenderer(SkColor color) {
   if (color == background_color())
     return;
   background_color_ = color;

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
index 4b54549..9b86c97 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
@@ -154,8 +154,8 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl
   void HandleDisambiguationPopupMouseUpEvent(Evas_Event_Mouse_Up*);
 
   void DidCreateNewRendererCompositorFrameSink(
-      viz::mojom::CompositorFrameSinkClient*
-          renderer_compositor_frame_sink) override;
+      viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink)
+      override;
   void SubmitCompositorFrame(
       const viz::LocalSurfaceId& local_surface_id,
       viz::CompositorFrame frame,

diff --git a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc
index 1ee6d12..59c0370 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc
@@ -582,12 +582,11 @@ bool SelectionControllerEfl::HandleLongPressEvent(
     SetSelectionEditable(true);
     HandleLongPressEventPrivate(touch_point);
     return true;
-  } else if (params.link_url.is_empty()
-      && params.src_url.is_empty()
+  } else if (params.link_url.is_empty() && params.src_url.is_empty()
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-      && params.is_text_node) {
+             && params.is_text_node) {
 #else
-    ) {
+                 ) {
 #endif
     // If user is long pressing on a content with
     // -webkit-user-select: none, we should bail and not enter

diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc
index 7b80a26..9a62828 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc
@@ -90,8 +90,7 @@ WebContents* WebContentsImplEfl::Clone() {
 }
 
 void WebContentsImplEfl::SetUserAgentOverride(const std::string& override,
-                                           bool override_in_new_tabs) {
-}
+                                              bool override_in_new_tabs) {}
 
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
 // FIXME: EWK_BRINGUP definition should be removed.

diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.h b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.h
index 668f073..0013d68 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.h
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.h
@@ -47,10 +47,9 @@ class CONTENT_EXPORT WebContentsImplEfl : public WebContentsImpl {
   friend class WebContentsImpl;
   friend class WebContents;
 
-  void CancelWindowRequest(
-      int32_t render_process_id,
-      int32_t route_id,
-      int32_t main_frame_route_id);
+  void CancelWindowRequest(int32_t render_process_id,
+                           int32_t route_id,
+                           int32_t main_frame_route_id);
 
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
   // FIXME: EWK_BRINGUP definition should be removed.

diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc
index 118565b..ebe30d7 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc
@@ -262,14 +262,14 @@ void WebContentsViewEfl::QuerySelectionStyle() {
 }
 
 #if BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
- void WebContentsViewEfl::ShowPopupMenu(RenderFrameHost* render_frame_host,
-                                        const gfx::Rect& bounds,
-                                        int item_height,
-                                        double item_font_size,
-                                        int selected_item,
-                                        const std::vector<MenuItem>& items,
-                                        bool right_aligned,
-                                        bool allow_multiple_selection) {
+void WebContentsViewEfl::ShowPopupMenu(RenderFrameHost* render_frame_host,
+                                       const gfx::Rect& bounds,
+                                       int item_height,
+                                       double item_font_size,
+                                       int selected_item,
+                                       const std::vector<MenuItem>& items,
+                                       bool right_aligned,
+                                       bool allow_multiple_selection) {
   if (efl_delegate_)
     efl_delegate_->ShowPopupMenu(render_frame_host, bounds, item_height,
                                  item_font_size, selected_item, items,

diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.cc
index fdd4c1a..ffcef4d 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.cc
@@ -84,7 +84,7 @@ void WebDragDestEfl::DragStateEnter() {
 
 void WebDragDestEfl::DragStateLeave() {
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-// FIXME: EWK_BRINGUP definition should be removed.
+                           // FIXME: EWK_BRINGUP definition should be removed.
   GetRenderViewHost()->DragTargetDragLeave();
 #endif  // !defined(EWK_BRINGUP)
   if (delegate_)
@@ -101,7 +101,7 @@ void WebDragDestEfl::DragPos(
 
   if (!drag_initialized_) {
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-// FIXME: EWK_BRINGUP definition should be removed.
+                           // FIXME: EWK_BRINGUP definition should be removed.
     GetRenderViewHost()->DragTargetDragEnter(
         *drop_data_,
         client_pt,

diff --git a/tizen_src/chromium_impl/content/common/common_efl.gni b/tizen_src/chromium_impl/content/common/common_efl.gni
index 21a7133..4756286 100644 (file)
--- a/tizen_src/chromium_impl/content/common/common_efl.gni
+++ b/tizen_src/chromium_impl/content/common/common_efl.gni
@@ -4,7 +4,8 @@
 
 import("//tizen_src/build/config/tizen_features.gni")
 
-external_content_common_efl_configs = [ "//tizen_src/chromium_impl/content/common:content_common_efl" ]
+external_content_common_efl_configs =
+    [ "//tizen_src/chromium_impl/content/common:content_common_efl" ]
 
 external_exclude_content_common_efl_sources = []
 

diff --git a/tizen_src/chromium_impl/content/content_efl.gni b/tizen_src/chromium_impl/content/content_efl.gni
index 8430f21..ddabf51 100644 (file)
--- a/tizen_src/chromium_impl/content/content_efl.gni
+++ b/tizen_src/chromium_impl/content/content_efl.gni
@@ -14,7 +14,6 @@ external_content_common_configs = [
   "//tizen_src/build:libtts",
 ]
 
-
 external_content_browser_configs = [
   "//tizen_src/build:capi-media-player",
   "//tizen_src/build:libcapi-media-player",
@@ -50,9 +49,8 @@ external_content_renderer_extra_configs = [
   "//tizen_src/build:libtts",
 ]
 
-external_content_renderer_deps = [
-  "//tizen_src/chromium_impl/content:android_content_detection",
-]
+external_content_renderer_deps =
+    [ "//tizen_src/chromium_impl/content:android_content_detection" ]
 
 external_content_gpu_configs = [
   "//tizen_src/build:evas",
@@ -68,9 +66,7 @@ external_content_shell_configs = [
   "//tizen_src/build:libelementary",
 ]
 
-external_content_shell_deps = [
-  "//tizen_src/chromium_impl/efl:efl-init",
-]
+external_content_shell_deps = [ "//tizen_src/chromium_impl/efl:efl-init" ]
 external_content_shell_deps += js_dialog_efl_deps
 
 if (building_for_tizen) {
@@ -81,28 +77,28 @@ if (building_for_tizen) {
 }
 
 if (!use_wayland) {
-    external_content_common_configs += [ "//tizen_src/build:ecore-x" ]
-    external_content_common_configs += [ "//tizen_src/build:libecore-x" ]
-    external_content_browser_configs += [ "//tizen_src/build:x11" ]
-    external_content_browser_configs += [ "//tizen_src/build:libx11" ]
-    external_content_browser_extra_configs += [ "//tizen_src/build:ecore-x" ]
-    external_content_browser_extra_configs += [ "//tizen_src/build:libecore-x" ]
-    external_content_shell_configs += [ "//tizen_src/build:ecore-x" ]
-    external_content_shell_configs += [ "//tizen_src/build:libecore-x" ]
+  external_content_common_configs += [ "//tizen_src/build:ecore-x" ]
+  external_content_common_configs += [ "//tizen_src/build:libecore-x" ]
+  external_content_browser_configs += [ "//tizen_src/build:x11" ]
+  external_content_browser_configs += [ "//tizen_src/build:libx11" ]
+  external_content_browser_extra_configs += [ "//tizen_src/build:ecore-x" ]
+  external_content_browser_extra_configs += [ "//tizen_src/build:libecore-x" ]
+  external_content_shell_configs += [ "//tizen_src/build:ecore-x" ]
+  external_content_shell_configs += [ "//tizen_src/build:libecore-x" ]
 } else {
-   external_content_common_configs += [ "//tizen_src/build:ecore-wayland" ]
-   external_content_common_configs += [ "//tizen_src/build:libecore-wayland" ]
-   external_content_shell_configs += [ "//tizen_src/build:ecore-wayland" ]
-   external_content_shell_configs += [ "//tizen_src/build:libecore-wayland" ]
+  external_content_common_configs += [ "//tizen_src/build:ecore-wayland" ]
+  external_content_common_configs += [ "//tizen_src/build:libecore-wayland" ]
+  external_content_shell_configs += [ "//tizen_src/build:ecore-wayland" ]
+  external_content_shell_configs += [ "//tizen_src/build:libecore-wayland" ]
 }
 
 if (tizen_multimedia_support) {
-   external_content_browser_configs += [
-     "//tizen_src/build:capi-media-player",
-     "//tizen_src/build:libcapi-media-player",
-     "//tizen_src/build:capi-media-tool",
-     "//tizen_src/build:libcapi-media-tool",
-   ]
-   external_content_common_configs += ["//tizen_src/build:gstreamer"]
-   external_content_common_configs += ["//tizen_src/build:libgstreamer"]
+  external_content_browser_configs += [
+    "//tizen_src/build:capi-media-player",
+    "//tizen_src/build:libcapi-media-player",
+    "//tizen_src/build:capi-media-tool",
+    "//tizen_src/build:libcapi-media-tool",
+  ]
+  external_content_common_configs += [ "//tizen_src/build:gstreamer" ]
+  external_content_common_configs += [ "//tizen_src/build:libgstreamer" ]
 }

diff --git a/tizen_src/chromium_impl/content/gpu/in_process_gpu_thread_efl.cc b/tizen_src/chromium_impl/content/gpu/in_process_gpu_thread_efl.cc
index 27bbb9a..b070329 100644 (file)
--- a/tizen_src/chromium_impl/content/gpu/in_process_gpu_thread_efl.cc
+++ b/tizen_src/chromium_impl/content/gpu/in_process_gpu_thread_efl.cc
@@ -23,9 +23,8 @@
 namespace content {
 
 struct GpuChildThreadEfl : public content::GpuChildThread {
-  explicit GpuChildThreadEfl(
-      const InProcessChildThreadParams& params,
-      std::unique_ptr<gpu::GpuInit> gpu_init)
+  explicit GpuChildThreadEfl(const InProcessChildThreadParams& params,
+                             std::unique_ptr<gpu::GpuInit> gpu_init)
       : GpuChildThread(params, std::move(gpu_init)) {}
 };
 
@@ -42,12 +41,13 @@ struct InProcessGpuThreadEfl : public content::InProcessGpuThread {
     gpu::CollectContextGraphicsInfo(&gpu_info);
 
     auto gpu_init = std::make_unique<gpu::GpuInit>();
-    gpu_init->InitializeInProcess(base::CommandLine::ForCurrentProcess(), gpu_preferences_);
+    gpu_init->InitializeInProcess(base::CommandLine::ForCurrentProcess(),
+                                  gpu_preferences_);
 
     // The process object takes ownership of the thread object, so do not
     // save and delete the pointer.
-    gpu_process_->set_main_thread(new GpuChildThreadEfl(
-        params_, std::move(gpu_init)));
+    gpu_process_->set_main_thread(
+        new GpuChildThreadEfl(params_, std::move(gpu_init)));
   }
 };
 

diff --git a/tizen_src/chromium_impl/content/gpu/shared_mailbox_manager.h b/tizen_src/chromium_impl/content/gpu/shared_mailbox_manager.h
index e89306f..41ca19b 100644 (file)
--- a/tizen_src/chromium_impl/content/gpu/shared_mailbox_manager.h
+++ b/tizen_src/chromium_impl/content/gpu/shared_mailbox_manager.h
@@ -10,8 +10,8 @@ namespace gpu {
 
 namespace content {
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  struct CONTENT_EXPORT SharedMailboxManager {
-    static gpu::gles2::MailboxManager* GetMailboxManager();
+struct CONTENT_EXPORT SharedMailboxManager {
+  static gpu::gles2::MailboxManager* GetMailboxManager();
   };
 #endif  // !defined(EWK_BRINGUP)
 }

diff --git a/tizen_src/chromium_impl/content/public/browser/web_contents_view_efl_delegate.h b/tizen_src/chromium_impl/content/public/browser/web_contents_view_efl_delegate.h
index e353fb7..9ac9418 100644 (file)
--- a/tizen_src/chromium_impl/content/public/browser/web_contents_view_efl_delegate.h
+++ b/tizen_src/chromium_impl/content/public/browser/web_contents_view_efl_delegate.h
@@ -10,9 +10,9 @@
 #include "content/common/content_export.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/common/menu_item.h"
+#include "third_party/blink/public/platform/modules/screen_orientation/web_screen_orientation_lock_type.h"
 #include "third_party/blink/public/platform/web_gesture_event.h"
 #include "third_party/blink/public/platform/web_input_event.h"
-#include "third_party/blink/public/platform/modules/screen_orientation/web_screen_orientation_lock_type.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace content {

diff --git a/tizen_src/chromium_impl/content/renderer/media/efl/media_source_delegate_efl.cc b/tizen_src/chromium_impl/content/renderer/media/efl/media_source_delegate_efl.cc
index ab42639..cc04928 100644 (file)
--- a/tizen_src/chromium_impl/content/renderer/media/efl/media_source_delegate_efl.cc
+++ b/tizen_src/chromium_impl/content/renderer/media/efl/media_source_delegate_efl.cc
@@ -6,8 +6,8 @@
 
 #include "base/process/process.h"
 #include "media/base/bind_to_current_loop.h"
-#include "media/base/media_log.h"
 #include "media/base/efl/demuxer_stream_player_params_efl.h"
+#include "media/base/media_log.h"
 #include "media/blink/webmediaplayer_util.h"
 #include "media/blink/webmediasource_impl.h"
 #include "media/filters/chunk_demuxer.h"

diff --git a/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.cc b/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.cc
index 360ce84..4e7a357 100644 (file)
--- a/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.cc
+++ b/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.cc
@@ -14,9 +14,9 @@
 #include "media/base/efl/media_player_util_efl.h"
 #include "media/base/video_frame.h"
 #include "media/blink/webmediaplayer_util.h"
-#include "third_party/libyuv/include/libyuv/planar_functions.h"
 #include "third_party/blink/public/platform/WebMediaPlayer.h"
 #include "third_party/blink/public/platform/WebMediaPlayerClient.h"
+#include "third_party/libyuv/include/libyuv/planar_functions.h"
 
 #define BIND_TO_RENDER_LOOP(function) \
   (DCHECK(main_loop_->BelongsToCurrentThread()), \

diff --git a/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.h b/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.h
index a5d2d93..d145e68 100644 (file)
--- a/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.h
+++ b/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.h
@@ -7,15 +7,15 @@
 
 #include <vector>
 
-#include "base/message_loop/message_loop.h"
 #include "base/memory/shared_memory.h"
+#include "base/message_loop/message_loop.h"
 #include "cc/layers/video_frame_provider_client_impl.h"
 #include "content/renderer/media/efl/media_source_delegate_efl.h"
 #include "content/renderer/media/efl/renderer_media_player_manager_efl.h"
-#include "media/blink/webmediaplayer_util.h"
 #include "media/base/efl/media_player_efl.h"
 #include "media/blink/video_frame_compositor.h"
 #include "media/blink/webmediaplayer_params.h"
+#include "media/blink/webmediaplayer_util.h"
 #include "media/renderers/skcanvas_video_renderer.h"
 #include "third_party/blink/public/platform/WebMediaPlayer.h"
 #include "third_party/blink/public/platform/WebMediaPlayerEncryptedMediaClient.h"

diff --git a/tizen_src/chromium_impl/content/shell/shell_efl.gni b/tizen_src/chromium_impl/content/shell/shell_efl.gni
index 7e051e6..e00d303 100644 (file)
--- a/tizen_src/chromium_impl/content/shell/shell_efl.gni
+++ b/tizen_src/chromium_impl/content/shell/shell_efl.gni
@@ -4,9 +4,10 @@
 
 external_content_shell_lib_efl_sources = [
   "//tizen_src/chromium_impl/content/shell/browser/shell_efl.cc",
-  "//tizen_src/chromium_impl/content/shell/browser/shell_web_contents_view_delegate_efl.cc"
+  "//tizen_src/chromium_impl/content/shell/browser/shell_web_contents_view_delegate_efl.cc",
 ]
 
-external_content_shell_efl_sources = [ "//tizen_src/chromium_impl/content/shell/browser/shell_main_efl.cc" ]
+external_content_shell_efl_sources =
+    [ "//tizen_src/chromium_impl/content/shell/browser/shell_main_efl.cc" ]
 
 external_exclude_content_shell_efl_sources = [ "app/shell_main.cc" ]

diff --git a/tizen_src/chromium_impl/device/vibration/vibration_efl.gni b/tizen_src/chromium_impl/device/vibration/vibration_efl.gni
index d0869ec..870d447 100644 (file)
--- a/tizen_src/chromium_impl/device/vibration/vibration_efl.gni
+++ b/tizen_src/chromium_impl/device/vibration/vibration_efl.gni
@@ -8,4 +8,5 @@ external_device_vibration_efl_sources = [
   "//tizen_src/chromium_impl/device/vibration/vibration_provider_client.h",
 ]
 
-external_exclude_device_vibration_efl_sources = [ "vibration_manager_impl_default.cc" ]
+external_exclude_device_vibration_efl_sources =
+    [ "vibration_manager_impl_default.cc" ]

diff --git a/tizen_src/chromium_impl/device/vibration/vibration_manager_impl_efl.cc b/tizen_src/chromium_impl/device/vibration/vibration_manager_impl_efl.cc
index c6313e1..b159ef6 100644 (file)
--- a/tizen_src/chromium_impl/device/vibration/vibration_manager_impl_efl.cc
+++ b/tizen_src/chromium_impl/device/vibration/vibration_manager_impl_efl.cc
@@ -8,11 +8,9 @@
 
 namespace device {
 
-VibrationManagerImplEfl::VibrationManagerImplEfl() {
-}
+VibrationManagerImplEfl::VibrationManagerImplEfl() {}
 
-VibrationManagerImplEfl::~VibrationManagerImplEfl() {
-}
+VibrationManagerImplEfl::~VibrationManagerImplEfl() {}
 
 std::unique_ptr<VibrationProviderClient> VibrationManagerImplEfl::provider_client_ = std::unique_ptr<VibrationProviderClient>();
 

diff --git a/tizen_src/chromium_impl/device/vibration/vibration_manager_impl_efl.h b/tizen_src/chromium_impl/device/vibration/vibration_manager_impl_efl.h
index 2cac114..8af90d5 100644 (file)
--- a/tizen_src/chromium_impl/device/vibration/vibration_manager_impl_efl.h
+++ b/tizen_src/chromium_impl/device/vibration/vibration_manager_impl_efl.h
@@ -7,9 +7,9 @@
 
 #include "services/device/vibration/vibration_manager_impl.h"
 
+#include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/device/vibration/vibration_export.h"
 #include "services/device/vibration/vibration_provider_client.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace device {
 

diff --git a/tizen_src/chromium_impl/edje_resources/BUILD.gn b/tizen_src/chromium_impl/edje_resources/BUILD.gn
index b43c08f..9c03ac4 100644 (file)
--- a/tizen_src/chromium_impl/edje_resources/BUILD.gn
+++ b/tizen_src/chromium_impl/edje_resources/BUILD.gn
@@ -9,7 +9,9 @@ template("edje_res_efl") {
   action_foreach(edje_target_name) {
     script = "//tizen_src/build/cmd_execution.py"
     sources = invoker.sources
-    outputs = [ "$root_out_dir/resources/{{source_name_part}}.edj" ]
+    outputs = [
+      "$root_out_dir/resources/{{source_name_part}}.edj",
+    ]
     args = [
       "$edje_compiler",
       "-id",
@@ -20,15 +22,17 @@ template("edje_res_efl") {
   }
 
   source_set(target_name) {
-    deps = [ ":$edje_target_name" ]
+    deps = [
+      ":$edje_target_name",
+    ]
   }
 }
 
 edje_res_efl("edje_resources_efl") {
   sources = [
-    "SelectionHandles.edc",
-    "Magnifier.edc",
     "DisambiguationPopup.edc",
     "Edge.edc",
+    "Magnifier.edc",
+    "SelectionHandles.edc",
   ]
 }

diff --git a/tizen_src/chromium_impl/efl/BUILD.gn b/tizen_src/chromium_impl/efl/BUILD.gn
index e44699f..eedc991 100644 (file)
--- a/tizen_src/chromium_impl/efl/BUILD.gn
+++ b/tizen_src/chromium_impl/efl/BUILD.gn
@@ -12,8 +12,8 @@ static_library("window-factory") {
   public_configs = [ "//tizen_src/build:elementary-public" ]
 
   sources = [
-    "window_factory.h",
     "window_factory.cc",
+    "window_factory.h",
   ]
 }
 
@@ -24,12 +24,14 @@ static_library("efl-init") {
   configs += [ "//tizen_src/build:libelementary" ]
   public_configs = [ "//tizen_src/build:elementary-public" ]
 
-  deps = [ "//ui/compositor:compositor" ]
+  deps = [
+    "//ui/compositor:compositor",
+  ]
 
   sources = [
     "efl_export.h",
-    "init.h",
     "init.cc",
+    "init.h",
   ]
 
   if (use_ozone) {

diff --git a/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc b/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc
index 08844ae..f15c2cd 100644 (file)
--- a/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc
+++ b/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc
@@ -59,8 +59,9 @@ void* GLES2ImplementationEfl::MapTransferCacheEntry(size_t serialized_size) {
   return nullptr;
 }
 
-bool GLES2ImplementationEfl::ThreadsafeLockTransferCacheEntry(uint32_t entry_type,
-                                                          uint32_t entry_id) {
+bool GLES2ImplementationEfl::ThreadsafeLockTransferCacheEntry(
+    uint32_t entry_type,
+    uint32_t entry_id) {
   NOTIMPLEMENTED();
   return false;
 }

diff --git a/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h b/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h
index ffc9b06..88d29c9 100644 (file)
--- a/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h
+++ b/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h
@@ -37,7 +37,8 @@ class GLES2_IMPL_EXPORT GLES2ImplementationEfl : public ContextSupport,
   void GetGpuFence(uint32_t gpu_fence_id,
                    base::OnceCallback<void(std::unique_ptr<gfx::GpuFence>)>
                        callback) override {}
-  void SetAggressivelyFreeResources(bool aggressively_free_resources) override {}
+  void SetAggressivelyFreeResources(bool aggressively_free_resources) override {
+  }
   void Swap() override {}
   void SwapWithBounds(const std::vector<gfx::Rect>& rects) override {}
   void PartialSwapBuffers(const gfx::Rect& sub_buffer) override {}

diff --git a/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h b/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h
index 45be136..c74a828 100644 (file)
--- a/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h
+++ b/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h
@@ -11,10 +11,10 @@
 #include "base/threading/thread.h"
 #include "base/time/default_tick_clock.h"
 #include "base/timer/timer.h"
+#include "media/base/decoder_buffer.h"
 #include "media/base/efl/demuxer_efl.h"
 #include "media/base/efl/media_player_efl.h"
 #include "media/base/efl/media_player_util_efl.h"
-#include "media/base/decoder_buffer.h"
 #include "third_party/blink/public/platform/WebMediaPlayer.h"
 
 namespace media {

diff --git a/tizen_src/chromium_impl/third_party/WebKit/Source/core/BUILD.gn b/tizen_src/chromium_impl/third_party/WebKit/Source/core/BUILD.gn
index d436269..b9ce9e8 100644 (file)
--- a/tizen_src/chromium_impl/third_party/WebKit/Source/core/BUILD.gn
+++ b/tizen_src/chromium_impl/third_party/WebKit/Source/core/BUILD.gn
@@ -8,7 +8,9 @@ source_set("webkit_core_generated") {
     "$root_gen_dir/TizenUserAgentStyleSheetsData.cpp",
   ]
 
-  deps = [ ":TizenUserAgentStyleSheets" ]
+  deps = [
+    ":TizenUserAgentStyleSheets",
+  ]
 }
 
 action("TizenUserAgentStyleSheets") {
@@ -21,12 +23,14 @@ action("TizenUserAgentStyleSheets") {
     "$root_gen_dir/TizenUserAgentStyleSheets.h",
     "$root_gen_dir/TizenUserAgentStyleSheetsData.cpp",
   ]
-  out_h = rebase_path("$root_gen_dir/TizenUserAgentStyleSheets.h", root_build_dir)
-  out_cpp = rebase_path("$root_gen_dir/TizenUserAgentStyleSheetsData.cpp", root_build_dir)
+  out_h =
+      rebase_path("$root_gen_dir/TizenUserAgentStyleSheets.h", root_build_dir)
+  out_cpp = rebase_path("$root_gen_dir/TizenUserAgentStyleSheetsData.cpp",
+                        root_build_dir)
   args = [
-    "--namespace",
-    "blink",
-    "--out-h=$out_h",
-    "--out-cpp=$out_cpp",
-  ] + rebase_path(inputs, root_build_dir)
+           "--namespace",
+           "blink",
+           "--out-h=$out_h",
+           "--out-cpp=$out_cpp",
+         ] + rebase_path(inputs, root_build_dir)
 }

diff --git a/tizen_src/chromium_impl/third_party/WebKit/Source/core/core_efl.gni b/tizen_src/chromium_impl/third_party/WebKit/Source/core/core_efl.gni
index 84fbb10..fe38e11 100644 (file)
--- a/tizen_src/chromium_impl/third_party/WebKit/Source/core/core_efl.gni
+++ b/tizen_src/chromium_impl/third_party/WebKit/Source/core/core_efl.gni
@@ -8,8 +8,8 @@ if (is_tizen) {
   # Already excluded using !linux in //third_party/blink/renderer/core/BUILD.gn
   external_exclude_webkit_core_rendering_sources = []
 } else {
-# [TODO] This code should be fixed.
-#  external_exclude_webkit_core_rendering_sources = [ "layout/LayoutThemeLinux.cpp" ]
+  # [TODO] This code should be fixed.
+  #  external_exclude_webkit_core_rendering_sources = [ "layout/LayoutThemeLinux.cpp" ]
   external_exclude_webkit_core_rendering_sources = []
 }
 external_webkit_core_rendering_sources = [
@@ -18,9 +18,7 @@ external_webkit_core_rendering_sources = [
 ]
 
 # For //third_party/blink/renderer/core:core_generated target
-external_webkit_core_generated_deps = [
-  "//tizen_src/chromium_impl/third_party/blink/renderer/core:webkit_core_generated",
-]
+external_webkit_core_generated_deps = [ "//tizen_src/chromium_impl/third_party/blink/renderer/core:webkit_core_generated" ]
 
 # For //third_party/blink/renderer/core:make_core_generated target
 external_webkit_core_make_generated_deps = [ "//tizen_src/chromium_impl/third_party/blink/renderer/core:TizenUserAgentStyleSheets" ]

diff --git a/tizen_src/chromium_impl/ui/BUILD.gn b/tizen_src/chromium_impl/ui/BUILD.gn
index 9625a10..cff8241 100644 (file)
--- a/tizen_src/chromium_impl/ui/BUILD.gn
+++ b/tizen_src/chromium_impl/ui/BUILD.gn
@@ -5,13 +5,13 @@
 static_library("ui_events_source_inject") {
   sources = [
     # Indirectly includes ui/events/gestures/gesture_recognizer_impl_efl.cc/h.
-    "events/gestures/gesture_recognizer_impl_override.cc",
-    "events/gestures/gesture_recognizer_impl_efl.cc",
-    "events/gestures/gesture_recognizer_impl_efl.h",
     "//ui/events/gestures/gesture_provider_aura.cc",
     "//ui/events/gestures/gesture_provider_aura.h",
     "//ui/events/gestures/motion_event_aura.cc",
     "//ui/events/gestures/motion_event_aura.h",
+    "events/gestures/gesture_recognizer_impl_efl.cc",
+    "events/gestures/gesture_recognizer_impl_efl.h",
+    "events/gestures/gesture_recognizer_impl_override.cc",
   ]
   include_dirs = [
     "//third_party/skia/include/android",
@@ -34,10 +34,12 @@ static_library("ui_events_source_inject") {
 
 static_library("ui_native_theme_inject") {
   sources = [
-    "//ui/native_theme/native_theme_aura.h",
     "//ui/native_theme/native_theme_aura.cc",
+    "//ui/native_theme/native_theme_aura.h",
+  ]
+  deps = [
+    "//skia",
   ]
-  deps = [ "//skia" ]
 }
 
 static_library("ui_base_inject") {
@@ -45,5 +47,7 @@ static_library("ui_base_inject") {
     #"//ui/base/cursor/cursors_aura.h",
     #"//ui/base/cursor/cursors_aura.cc",
   ]
-  deps = [ "//skia" ]
+  deps = [
+    "//skia",
+  ]
 }

diff --git a/tizen_src/chromium_impl/ui/snapshot/snapshot_efl.cc b/tizen_src/chromium_impl/ui/snapshot/snapshot_efl.cc
index edafddf..c626fa2 100644 (file)
--- a/tizen_src/chromium_impl/ui/snapshot/snapshot_efl.cc
+++ b/tizen_src/chromium_impl/ui/snapshot/snapshot_efl.cc
@@ -29,17 +29,15 @@ bool GrabWindowSnapshot(gfx::NativeWindow window,
   return false;
 }
 
-void GrabWindowSnapshotAsync(
-  gfx::NativeWindow window,
-  const gfx::Rect& source_rect,
-  const GrabWindowSnapshotAsyncCallback& callback) {
+void GrabWindowSnapshotAsync(gfx::NativeWindow window,
+                             const gfx::Rect& source_rect,
+                             const GrabWindowSnapshotAsyncCallback& callback) {
   NOTIMPLEMENTED();
 }
 
-void GrabViewSnapshotAsync(
-  gfx::NativeView view,
-  const gfx::Rect& source_rect,
-  const GrabWindowSnapshotAsyncCallback& callback) {
+void GrabViewSnapshotAsync(gfx::NativeView view,
+                           const gfx::Rect& source_rect,
+                           const GrabWindowSnapshotAsyncCallback& callback) {
   GrabWindowSnapshotAsync(view, source_rect, callback);
 }
 

diff --git a/tizen_src/chromium_impl/ui/ui_efl_injections.gni b/tizen_src/chromium_impl/ui/ui_efl_injections.gni
index 6209c0a..329d71f 100644 (file)
--- a/tizen_src/chromium_impl/ui/ui_efl_injections.gni
+++ b/tizen_src/chromium_impl/ui/ui_efl_injections.gni
@@ -7,11 +7,14 @@
 # However, in component mode, we build each of ui modules
 # as single DLL. So we include needed sources directly.
 
-external_ui_base_static_lib_deps = [ "//tizen_src/chromium_impl/ui:ui_base_inject" ]
+external_ui_base_static_lib_deps =
+    [ "//tizen_src/chromium_impl/ui:ui_base_inject" ]
 
-external_ui_events_static_lib_deps = [ "//tizen_src/chromium_impl/ui:ui_events_source_inject" ]
+external_ui_events_static_lib_deps =
+    [ "//tizen_src/chromium_impl/ui:ui_events_source_inject" ]
 
-external_native_theme_static_lib_deps = [ "//tizen_src/chromium_impl/ui:ui_native_theme_inject" ]
+external_native_theme_static_lib_deps =
+    [ "//tizen_src/chromium_impl/ui:ui_native_theme_inject" ]
 
 # For //ui/base target
 external_ui_base_shared_lib_sources = [

diff --git a/tizen_src/ewk/BUILD.gn b/tizen_src/ewk/BUILD.gn
index 0770d10..9436b36 100644 (file)
--- a/tizen_src/ewk/BUILD.gn
+++ b/tizen_src/ewk/BUILD.gn
@@ -5,8 +5,8 @@
 group("chromium_efl_all") {
   testonly = true
   deps = [
-#    "//tizen_src/ewk/unittest:ewk_unittests",
-    "//tizen_src/ewk/ubrowser:ubrowser",
+    #    "//tizen_src/ewk/unittest:ewk_unittests",
     "//tizen_src/ewk/efl_webview_app:efl_webview_app",
+    "//tizen_src/ewk/ubrowser:ubrowser",
   ]
 }

diff --git a/tizen_src/ewk/efl_integration/BUILD.gn b/tizen_src/ewk/efl_integration/BUILD.gn
index 938ab5d..ed3a8ac 100644 (file)
--- a/tizen_src/ewk/efl_integration/BUILD.gn
+++ b/tizen_src/ewk/efl_integration/BUILD.gn
@@ -58,31 +58,30 @@ shared_library("chromium-ewk") {
   configs += [ "//tizen_src/build:libui-gadget" ]
   public_configs += [ "//tizen_src/build:ui-gadget-public" ]
   deps = [
-    "//tizen_src/ewk/po_tizen:locale_efl",
-    "//tizen_src/chromium_impl/efl:efl-init",
-
     "//base/:base_static",
-    "//content/public/browser",
-    "//content/shell:resources",
-    "//content/shell:pak",
-    "//components/visitedlink/browser",
-    "//components/visitedlink/renderer",
-    "//components/sessions",
-    "//components/autofill/content/renderer",
     "//components/autofill/content/browser",
+    "//components/autofill/content/renderer",
     "//components/network_session_configurator/browser",
     "//components/password_manager/content/browser",
-    "//components/password_manager/core/common",
     "//components/password_manager/core/browser",
+    "//components/password_manager/core/common",
     "//components/plugins/renderer",
+    "//components/sessions",
     "//components/variations",
-    "//services/device:lib",
+    "//components/visitedlink/browser",
+    "//components/visitedlink/renderer",
+    "//content/public/browser",
+    "//content/shell:pak",
+    "//content/shell:resources",
     "//printing",
+    "//services/device:lib",
     "//skia",
     "//storage/browser",
+    "//third_party/blink/renderer/platform/wtf",
     "//third_party/leveldatabase",
     "//third_party/sqlite",
-    "//third_party/blink/renderer/platform/wtf",
+    "//tizen_src/chromium_impl/efl:efl-init",
+    "//tizen_src/ewk/po_tizen:locale_efl",
     "//ui/compositor",
     "//ui/events",
     "//ui/events:events_base",
@@ -93,13 +92,14 @@ shared_library("chromium-ewk") {
   # TODO : needs to check for generating this macro define
   defines = [ "CHROMIUM_VERSION=\"<!(python <(version_script) -f <(version_file) -t \"<(version_pattern)\")\"" ]
   ldflags = [
-    "-Wl,--no-undefined"
+    "-Wl,--no-undefined",
     # TODO : need to check below for uncomment
     #"-Wl,--version-script,//tizen_src/ewk/<(filter_file)"
   ]
   cflags = [
     # Symbol visibility controled by chromium-ewk.filter
     "-fvisibility=hidden",
+
     # Treat warning as error for this target.
     # It needs to be included by means of pattern list because '-Werror' cflag
     # will be excluded in chromium side (src/build/common.gypi), and GYP
@@ -114,8 +114,8 @@ shared_library("chromium-ewk") {
     #filter_file = "chromium-ewk.filter"
     deps += [
       "//content/common",
+      "//content/public/app:both",
       "//content/public/common",
-      "//content/public/app:both"
     ]
   } else {
     # TODO : needs to check the below filter provision
@@ -123,7 +123,7 @@ shared_library("chromium-ewk") {
     deps += [
       "//components/storage_monitor",
       "//components/web_modal",
-      "//content/app:both"
+      "//content/app:both",
     ]
   }
 
@@ -140,7 +140,7 @@ shared_library("chromium-ewk") {
     exclude_source_set = [
       "browser/sound_effect_tizen.cc",
       "browser/geolocation/location_provider_efl.cc",
-      "browser/geolocation/location_provider_efl.h"
+      "browser/geolocation/location_provider_efl.h",
     ]
   }
 
@@ -184,6 +184,43 @@ shared_library("chromium-ewk") {
   sources += [
     "autofill_popup_view_efl.cc",
     "autofill_popup_view_efl.h",
+    "browser/browsing_data_remover_efl.cc",
+    "browser/browsing_data_remover_efl.h",
+    "browser/download_manager_delegate_efl.cc",
+    "browser/download_manager_delegate_efl.h",
+    "browser/editor_client_observer.cc",
+    "browser/editor_client_observer.h",
+    "browser/javascript_dialog_manager_efl.cc",
+    "browser/javascript_dialog_manager_efl.h",
+    "browser/javascript_modal_dialog_efl.cc",
+    "browser/javascript_modal_dialog_efl.h",
+    "browser/login_delegate_efl.cc",
+    "browser/login_delegate_efl.h",
+    "browser/mime_override_manager_efl.cc",
+    "browser/mime_override_manager_efl.h",
+    "browser/navigation_policy_handler_efl.cc",
+    "browser/navigation_policy_handler_efl.h",
+    "browser/permission_manager_efl.cc",
+    "browser/permission_manager_efl.h",
+    "browser/policy_response_delegate_efl.cc",
+    "browser/policy_response_delegate_efl.h",
+    "browser/quota_permission_context_efl.cc",
+    "browser/quota_permission_context_efl.h",
+    "browser/render_message_filter_efl.cc",
+    "browser/render_message_filter_efl.h",
+    "browser/resource_dispatcher_host_delegate_efl.cc",
+    "browser/resource_dispatcher_host_delegate_efl.h",
+    "browser/resource_throttle_efl.cc",
+    "browser/resource_throttle_efl.h",
+    "browser/scoped_allow_wait_for_legacy_web_view_api.h",
+    "browser/scoped_wait_for_ewk.h",
+    "browser/sound_effect.cc",
+    "browser/sound_effect.h",
+    "browser/sound_effect_tizen.cc",
+    "browser/ssl_host_state_delegate_efl.cc",
+    "browser/ssl_host_state_delegate_efl.h",
+    "browser/web_view_browser_message_filter.cc",
+    "browser/web_view_browser_message_filter.h",
     "browser_context_efl.cc",
     "browser_context_efl.h",
     "browser_main_parts_efl.cc",
@@ -207,9 +244,9 @@ shared_library("chromium-ewk") {
     "efl_webprocess_main.h",
     "eweb_context.cc",
     "eweb_context.h",
-    "eweb_view_callbacks.h",
     "eweb_view.cc",
     "eweb_view.h",
+    "eweb_view_callbacks.h",
     "ewk_global_data.cc",
     "ewk_global_data.h",
     "file_chooser_controller_efl.cc",
@@ -239,100 +276,58 @@ shared_library("chromium-ewk") {
     "url_request_context_getter_efl.h",
     "usermedia_permission_popup.cc",
     "usermedia_permission_popup.h",
-    "web_contents_efl_delegate_ewk.cc",
-    "web_contents_efl_delegate_ewk.h",
     "web_contents_delegate_efl.cc",
     "web_contents_delegate_efl.h",
+    "web_contents_efl_delegate_ewk.cc",
+    "web_contents_efl_delegate_ewk.h",
     "web_contents_view_delegate_ewk.cc",
     "web_contents_view_delegate_ewk.h",
     "web_contents_view_efl_delegate_ewk.cc",
     "web_contents_view_efl_delegate_ewk.h",
 
-    "browser/browsing_data_remover_efl.cc",
-    "browser/browsing_data_remover_efl.h",
-    "browser/download_manager_delegate_efl.cc",
-    "browser/download_manager_delegate_efl.h",
-    "browser/editor_client_observer.cc",
-    "browser/editor_client_observer.h",
-    "browser/javascript_dialog_manager_efl.cc",
-    "browser/javascript_dialog_manager_efl.h",
-    "browser/javascript_modal_dialog_efl.cc",
-    "browser/javascript_modal_dialog_efl.h",
-    "browser/login_delegate_efl.cc",
-    "browser/login_delegate_efl.h",
-    "browser/mime_override_manager_efl.cc",
-    "browser/mime_override_manager_efl.h",
-    "browser/navigation_policy_handler_efl.cc",
-    "browser/navigation_policy_handler_efl.h",
-    "browser/permission_manager_efl.cc",
-    "browser/permission_manager_efl.h",
-    "browser/policy_response_delegate_efl.cc",
-    "browser/policy_response_delegate_efl.h",
-    "browser/quota_permission_context_efl.cc",
-    "browser/quota_permission_context_efl.h",
-    "browser/render_message_filter_efl.cc",
-    "browser/render_message_filter_efl.h",
-    "browser/resource_dispatcher_host_delegate_efl.cc",
-    "browser/resource_dispatcher_host_delegate_efl.h",
-    "browser/resource_throttle_efl.cc",
-    "browser/resource_throttle_efl.h",
-    "browser/scoped_allow_wait_for_legacy_web_view_api.h",
-    "browser/scoped_wait_for_ewk.h",
-    "browser/sound_effect.cc",
-    "browser/sound_effect.h",
-    "browser/sound_effect_tizen.cc",
-    "browser/ssl_host_state_delegate_efl.cc",
-    "browser/ssl_host_state_delegate_efl.h",
-    "browser/web_view_browser_message_filter.cc",
-    "browser/web_view_browser_message_filter.h",
-
     # Make use of Android webview"s simplified pref class.
-    "browser/autofill/autofill_client_efl.h",
     "browser/autofill/autofill_client_efl.cc",
+    "browser/autofill/autofill_client_efl.h",
     "browser/autofill/personal_data_manager_factory.cc",
     "browser/autofill/personal_data_manager_factory.h",
-
+    "browser/favicon/favicon_commands.cc",
+    "browser/favicon/favicon_commands.h",
+    "browser/favicon/favicon_database.cc",
     "browser/favicon/favicon_database.h",
     "browser/favicon/favicon_database_p.cc",
-    "browser/favicon/favicon_commands.cc",
-    "browser/favicon/favicon_downloader.h",
     "browser/favicon/favicon_database_p.h",
-    "browser/favicon/favicon_database.cc",
-    "browser/favicon/favicon_commands.h",
     "browser/favicon/favicon_downloader.cc",
+    "browser/favicon/favicon_downloader.h",
+
     #"browser/geolocation/access_token_store_efl.cc",
     #"browser/geolocation/access_token_store_efl.h",
     "browser/geolocation/geolocation_permission_context_efl.cc",
     "browser/geolocation/geolocation_permission_context_efl.h",
     "browser/geolocation/location_provider_efl.cc",
     "browser/geolocation/location_provider_efl.h",
-    "browser/inputpicker/color_chooser_efl.cc",
-    "browser/inputpicker/color_chooser_efl.h",
     "browser/inputpicker/InputPicker.cc",
     "browser/inputpicker/InputPicker.h",
-
-    "browser/password_manager/password_store_factory.cc",
-    "browser/password_manager/password_store_factory.h",
+    "browser/inputpicker/color_chooser_efl.cc",
+    "browser/inputpicker/color_chooser_efl.h",
     "browser/password_manager/password_manager_client_efl.cc",
     "browser/password_manager/password_manager_client_efl.h",
-
-    "browser/selectpicker/popup_picker.cc",
+    "browser/password_manager/password_store_factory.cc",
+    "browser/password_manager/password_store_factory.h",
     "browser/selectpicker/popup_menu_item.cc",
-    "browser/selectpicker/popup_picker.h",
-    "browser/selectpicker/popup_menu_item_private.h",
     "browser/selectpicker/popup_menu_item.h",
-
+    "browser/selectpicker/popup_menu_item_private.h",
+    "browser/selectpicker/popup_picker.cc",
+    "browser/selectpicker/popup_picker.h",
     "browser/vibration/vibration_provider_client.cc",
     "browser/vibration/vibration_provider_client.h",
-
     "browser/web_cache_efl/web_cache_manager_efl.cc",
     "browser/web_cache_efl/web_cache_manager_efl.h",
-
+    "browser/web_view_evas_handler.cc",
+    "browser/web_view_evas_handler.h",
+    "browser/webdata/web_data_service.cc",
     "browser/webdata/web_data_service.h",
-    "browser/webdata/web_data_service_factory.h",
     "browser/webdata/web_data_service_factory.cc",
-    "browser/webdata/web_data_service.cc",
-
+    "browser/webdata/web_data_service_factory.h",
     "common/cache_params_efl.h",
     "common/content_client_efl.cc",
     "common/content_client_efl.h",
@@ -340,22 +335,21 @@ shared_library("chromium-ewk") {
     "common/content_switches_efl.h",
     "common/editing_messages.h",
     "common/hit_test_params.h",
-    "common/message_generator_ewk.h",
     "common/message_generator_ewk.cc",
+    "common/message_generator_ewk.h",
     "common/navigation_policy_params.cc",
     "common/navigation_policy_params.h",
-    "common/print_pages_params.h",
     "common/print_pages_params.cc",
+    "common/print_pages_params.h",
     "common/render_messages_ewk.h",
     "common/tizen_extensible.cc",
     "common/tizen_extensible.h",
-    "common/version_info_efl.h",
-    "common/version_info.h",
     "common/version_info.cc",
+    "common/version_info.h",
+    "common/version_info_efl.h",
     "common/web_contents_utils.cc",
     "common/web_contents_utils.h",
     "common/web_preferences_efl.h",
-
     "private/back_forward_list.h",
     "private/ewk_auth_challenge_private.h",
     "private/ewk_autofill_profile_private.cc",
@@ -412,7 +406,6 @@ shared_library("chromium-ewk") {
     "private/ewk_wrt_private.h",
     "private/webview_delegate_ewk.cc",
     "private/webview_delegate_ewk.h",
-
     "public/ewk_application_cache_manager.cc",
     "public/ewk_application_cache_manager.h",
     "public/ewk_auth_challenge.cc",
@@ -427,6 +420,8 @@ shared_library("chromium-ewk") {
     "public/ewk_back_forward_list_item.h",
     "public/ewk_certificate.cc",
     "public/ewk_certificate.h",
+    "public/ewk_chromium.cc",
+    "public/ewk_chromium.h",
     "public/ewk_console_message.cc",
     "public/ewk_console_message.h",
     "public/ewk_content_screening_detection.cc",
@@ -441,8 +436,10 @@ shared_library("chromium-ewk") {
     "public/ewk_custom_handlers.h",
     "public/ewk_dispatcher.cc",
     "public/ewk_dispatcher.h",
+    "public/ewk_enums.h",
     "public/ewk_error.cc",
     "public/ewk_error.h",
+    "public/ewk_export.h",
     "public/ewk_favicon_database.cc",
     "public/ewk_favicon_database.h",
     "public/ewk_frame.cc",
@@ -457,6 +454,7 @@ shared_library("chromium-ewk") {
     "public/ewk_intercept_request.h",
     "public/ewk_ipc_message.cc",
     "public/ewk_ipc_message.h",
+    "public/ewk_log.h",
     "public/ewk_main.cc",
     "public/ewk_main.h",
     "public/ewk_notification.cc",
@@ -479,6 +477,7 @@ shared_library("chromium-ewk") {
     "public/ewk_storage_manager.h",
     "public/ewk_text_style.cc",
     "public/ewk_text_style.h",
+    "public/ewk_touch.h",
     "public/ewk_tracing.cc",
     "public/ewk_tracing.h",
     "public/ewk_user_media.cc",
@@ -489,16 +488,6 @@ shared_library("chromium-ewk") {
     "public/ewk_web_application_icon_data.h",
     "public/ewk_window_features.cc",
     "public/ewk_window_features.h",
-    "public/ewk_chromium.cc",
-    "public/ewk_chromium.h",
-    "public/ewk_enums.h",
-    "public/ewk_export.h",
-    "public/ewk_log.h",
-    "public/ewk_touch.h",
-
-    "browser/web_view_evas_handler.cc",
-    "browser/web_view_evas_handler.h",
-
     "renderer/content_renderer_client_efl.cc",
     "renderer/content_renderer_client_efl.h",
     "renderer/editorclient_agent.cc",
@@ -513,17 +502,17 @@ shared_library("chromium-ewk") {
     "renderer/render_thread_observer_efl.h",
     "renderer/render_view_observer_efl.cc",
     "renderer/render_view_observer_efl.h",
-
-    "wrt/wrtwidget.cc",
-    "wrt/wrt_file_protocol_handler.cc",
     "wrt/dynamicplugin.cc",
+    "wrt/dynamicplugin.h",
+    "wrt/wrt_file_protocol_handler.cc",
     "wrt/wrt_file_protocol_handler.h",
     "wrt/wrt_widget_host.cc",
-    "wrt/wrtwidget.h",
     "wrt/wrt_widget_host.h",
-    "wrt/dynamicplugin.h",
+    "wrt/wrtwidget.cc",
+    "wrt/wrtwidget.h",
   ]
   sources -= exclude_source_set
+
   # FIXME: Followings are guarded just for bringup.
   if (ewk_bringup) {
     sources -= [
@@ -537,16 +526,28 @@ shared_library("chromium-ewk") {
 }
 
 executable("efl_webprocess") {
-  sources = [ "efl_webprocess.cc" ]
-  deps = [ ":chromium-ewk" ]
+  sources = [
+    "efl_webprocess.cc",
+  ]
+  deps = [
+    ":chromium-ewk",
+  ]
 }
 
 copy("launch_exec_script") {
-  sources = [ "launch_exec.sh" ]
-  outputs = [ "$root_out_dir/{{source_file_part}}" ]
+  sources = [
+    "launch_exec.sh",
+  ]
+  outputs = [
+    "$root_out_dir/{{source_file_part}}",
+  ]
 }
 
 source_set("launch_exec") {
-  sources = [ "launch_exec.sh" ]
-  deps = [ ":launch_exec_script" ]
+  sources = [
+    "launch_exec.sh",
+  ]
+  deps = [
+    ":launch_exec_script",
+  ]
 }

diff --git a/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc
index 038ae90..758dda6 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc
@@ -191,12 +191,13 @@ void OnGotOriginsWithApplicationCache(Application_Cache_Origins_Get_Callback cal
                                       void* user_data,
                                       scoped_refptr<content::AppCacheInfoCollection> collection,
                                       int result){
-   BrowsingDataRemoverEfl* bdre = static_cast<BrowsingDataRemoverEfl*>(user_data);
-   //information about end of process is not needed so cb left empty
-   net::CompletionCallback cb;
-   if (collection.get()) {
-     for (const auto& origin : collection->infos_by_origin)
-       bdre->DeleteAppCachesForOrigin(origin.first);
+  BrowsingDataRemoverEfl* bdre =
+      static_cast<BrowsingDataRemoverEfl*>(user_data);
+  // information about end of process is not needed so cb left empty
+  net::CompletionCallback cb;
+  if (collection.get()) {
+    for (const auto& origin : collection->infos_by_origin)
+      bdre->DeleteAppCachesForOrigin(origin.first);
    }
 }
 
@@ -232,7 +233,7 @@ void BrowsingDataRemoverEfl::RemoveImpl(int remove_mask,
     }
 
     if (origin.is_valid()) {
-       DeleteAppCachesForOrigin(url::Origin::Create(origin));
+      DeleteAppCachesForOrigin(url::Origin::Create(origin));
     }
     else {
       //if origin is empty delete all app cache (actual deletion in OnGotOriginsWithApplicationCache)
@@ -244,7 +245,8 @@ void BrowsingDataRemoverEfl::RemoveImpl(int remove_mask,
   }
 }
 
-void BrowsingDataRemoverEfl::DeleteAppCachesForOrigin(const url::Origin& origin) {
+void BrowsingDataRemoverEfl::DeleteAppCachesForOrigin(
+    const url::Origin& origin) {
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     // TODO: Using base::Unretained is not thread safe
     // It may happen that on IO thread this ptr will be already deleted
@@ -276,7 +278,8 @@ void BrowsingDataRemoverEfl::OnGotLocalStorageUsageInfo(
   for (size_t i = 0; i < infos.size(); ++i) {
     if (infos[i].last_modified >= delete_begin_
         && infos[i].last_modified <= delete_end_)
-      dom_storage_context_->DeleteLocalStorage(infos[i].origin, base::DoNothing());
+      dom_storage_context_->DeleteLocalStorage(infos[i].origin,
+                                               base::DoNothing());
   }
   waiting_for_clear_local_storage_ = false;
   DeleteIfDone();

diff --git a/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc
index 5861d31..f11c7f1 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc
@@ -6,12 +6,12 @@
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"
-#include "third_party/blink/public/common/mime_util/mime_util.h"
-#include "content/common/paths_efl.h"
 #include "components/download/public/common/download_danger_type.h"
 #include "components/download/public/common/download_item.h"
+#include "content/common/paths_efl.h"
 #include "ewk/efl_integration/browser_context_efl.h"
 #include "ewk/efl_integration/eweb_view.h"
+#include "third_party/blink/public/common/mime_util/mime_util.h"
 
 bool DownloadManagerDelegateEfl::TriggerExternalDownloadManager(
     download::DownloadItem* item) const {
@@ -55,13 +55,13 @@ void DownloadManagerDelegateEfl::CancelDownload(
     const content::DownloadTargetCallback& callback) const {
   callback.Run(base::FilePath(), /* Empty file path for cancellation */
                download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
-               download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-               base::FilePath(),
+               download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, base::FilePath(),
                download::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED);
 }
 
-bool DownloadManagerDelegateEfl::DetermineDownloadTarget(download::DownloadItem* item,
-                                                         const content::DownloadTargetCallback& callback) {
+bool DownloadManagerDelegateEfl::DetermineDownloadTarget(
+    download::DownloadItem* item,
+    const content::DownloadTargetCallback& callback) {
   if (TriggerExternalDownloadManager(item)) {
     CancelDownload(callback);
   } else {
@@ -79,8 +79,9 @@ bool DownloadManagerDelegateEfl::ShouldCompleteDownload(download::DownloadItem*,
   return true;
 }
 
-bool DownloadManagerDelegateEfl::ShouldOpenDownload(download::DownloadItem*,
-                                                    const content::DownloadOpenDelayedCallback&) {
+bool DownloadManagerDelegateEfl::ShouldOpenDownload(
+    download::DownloadItem*,
+    const content::DownloadOpenDelayedCallback&) {
   return true;
 }
 

diff --git a/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.h
index b15b21a..3adbf1a 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.h
@@ -16,9 +16,8 @@ public:
     virtual bool DetermineDownloadTarget(
         download::DownloadItem*,
         const content::DownloadTargetCallback&) override;
-    virtual bool ShouldCompleteDownload(
-        download::DownloadItem*,
-        const base::Closure&) override;
+    virtual bool ShouldCompleteDownload(download::DownloadItem*,
+                                        const base::Closure&) override;
     virtual bool ShouldOpenDownload(
         download::DownloadItem*,
         const content::DownloadOpenDelayedCallback&) override;
@@ -26,11 +25,11 @@ public:
 private:
     // If the external download manager is available, trigger download
     // with it and return true, otherwise return false.
-    bool TriggerExternalDownloadManager(download::DownloadItem* item) const;
+ bool TriggerExternalDownloadManager(download::DownloadItem* item) const;
 
-    base::FilePath GetPlatformDownloadPath(download::DownloadItem* item) const;
+ base::FilePath GetPlatformDownloadPath(download::DownloadItem* item) const;
 
-    void CancelDownload(const content::DownloadTargetCallback&) const;
+ void CancelDownload(const content::DownloadTargetCallback&) const;
 };
 
 #endif // DOWNLOAD_MANAGER_DELEGATE_EFL_H

diff --git a/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc
index f6e97aa..7f58f2b 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc
+++ b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc
@@ -208,9 +208,13 @@ void FaviconDatabase::Close() {
 
 void FaviconDatabase::SyncSQLite() {
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  scoped_refptr<base::SingleThreadTaskRunner> ptr = content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::DB);
+  scoped_refptr<base::SingleThreadTaskRunner> ptr =
+      content::BrowserThread::GetTaskRunnerForThread(
+          content::BrowserThread::DB);
 #else
-  scoped_refptr<base::SingleThreadTaskRunner> ptr = content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::UI);
+  scoped_refptr<base::SingleThreadTaskRunner> ptr =
+      content::BrowserThread::GetTaskRunnerForThread(
+          content::BrowserThread::UI);
 #endif
   ptr->PostTask(FROM_HERE, base::Bind(&FaviconDatabasePrivate::performSync, d->weakPtrFactory.GetWeakPtr()));
 }

diff --git a/tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc
index 33026bf..90baf26 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc
+++ b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc
@@ -46,9 +46,11 @@ bool FaviconDatabasePrivate::existsForFaviconURL(const GURL &faviconUrl) const {
 
 scoped_refptr<base::SingleThreadTaskRunner> FaviconDatabasePrivate::taskRunner() const {
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  return content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::DB);
+  return content::BrowserThread::GetTaskRunnerForThread(
+      content::BrowserThread::DB);
 #else
-  return content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::UI);
+  return content::BrowserThread::GetTaskRunnerForThread(
+      content::BrowserThread::UI);
 #endif
 }
 

diff --git a/tizen_src/ewk/efl_integration/browser/geolocation/access_token_store_efl.cc b/tizen_src/ewk/efl_integration/browser/geolocation/access_token_store_efl.cc
index eb537ad..0139d18 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/geolocation/access_token_store_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/geolocation/access_token_store_efl.cc
@@ -25,13 +25,11 @@ AccessTokenStoreEfl::~AccessTokenStoreEfl()
 
 void AccessTokenStoreEfl::LoadAccessTokens(const LoadAccessTokensCallback& callback)
 {
-  content::BrowserThread::PostTaskAndReply(content::BrowserThread::UI,
-                                  FROM_HERE,
-                                  base::Bind(&AccessTokenStoreEfl::GetRequestContextOnUIThread,
-                                             this),
-                                  base::Bind(&AccessTokenStoreEfl::RespondOnOriginatingThread,
-                                             this,
-                                             callback));
+  content::BrowserThread::PostTaskAndReply(
+      content::BrowserThread::UI, FROM_HERE,
+      base::Bind(&AccessTokenStoreEfl::GetRequestContextOnUIThread, this),
+      base::Bind(&AccessTokenStoreEfl::RespondOnOriginatingThread, this,
+                 callback));
 }
 
 void AccessTokenStoreEfl::GetRequestContextOnUIThread()

diff --git a/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.cc b/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.cc
index db9b68b..3baa752 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.cc
@@ -78,13 +78,14 @@ JavaScriptDialogManagerEfl::JavaScriptDialogManagerEfl() {}
 
 JavaScriptDialogManagerEfl::~JavaScriptDialogManagerEfl() {}
 
-void JavaScriptDialogManagerEfl::RunJavaScriptDialog(content::WebContents* web_contents,
-                                   content::RenderFrameHost* render_frame_host,
-                                   content::JavaScriptDialogType dialog_type,
-                                   const base::string16& message_text,
-                                   const base::string16& default_prompt_text,
-                                   DialogClosedCallback callback,
-                                   bool* did_suppress_message) {
+void JavaScriptDialogManagerEfl::RunJavaScriptDialog(
+    content::WebContents* web_contents,
+    content::RenderFrameHost* render_frame_host,
+    content::JavaScriptDialogType dialog_type,
+    const base::string16& message_text,
+    const base::string16& default_prompt_text,
+    DialogClosedCallback callback,
+    bool* did_suppress_message) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(web_contents);
   dialog_closed_callback_ = std::move(callback);
@@ -96,15 +97,17 @@ void JavaScriptDialogManagerEfl::RunJavaScriptDialog(content::WebContents* web_c
     type = JavaScriptModalDialogEfl::ALERT;
     if (alert_callback_data_) {
       if (!(alert_callback_data_->Run(wv->evas_object(),
-                                      base::UTF16ToUTF8(message_text).c_str(), NULL)))
+                                      base::UTF16ToUTF8(message_text).c_str(),
+                                      NULL)))
         ExecuteDialogClosedCallBack(false, std::string());
     }
   }
   if (dialog_type == content::JAVASCRIPT_DIALOG_TYPE_CONFIRM) {
     type = JavaScriptModalDialogEfl::CONFIRM;
     if (confirm_callback_data_) {
-      if (!(confirm_callback_data_->Run(
-              wv->evas_object(), base::UTF16ToUTF8(message_text).c_str(), NULL)))
+      if (!(confirm_callback_data_->Run(wv->evas_object(),
+                                        base::UTF16ToUTF8(message_text).c_str(),
+                                        NULL)))
         ExecuteDialogClosedCallBack(false, std::string());
     }
   }
@@ -150,7 +153,8 @@ void JavaScriptDialogManagerEfl::SetPromptCallback(
 void JavaScriptDialogManagerEfl::ExecuteDialogClosedCallBack(
     bool result,
     const std::string prompt_data) {
-  std::move(dialog_closed_callback_).Run(result, base::UTF8ToUTF16(prompt_data));
+  std::move(dialog_closed_callback_)
+      .Run(result, base::UTF8ToUTF16(prompt_data));
   if (dialog_) {
     dialog_->close();
   }

diff --git a/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h b/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h
index de3460b..aac9f55 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h
@@ -53,12 +53,12 @@ class JavaScriptDialogManagerEfl : public content::JavaScriptDialogManager {
 
   // JavaScriptDialogManager:
   void RunJavaScriptDialog(content::WebContents* web_contents,
-                                   content::RenderFrameHost* render_frame_host,
-                                   content::JavaScriptDialogType dialog_type,
-                                   const base::string16& message_text,
-                                   const base::string16& default_prompt_text,
-                                   DialogClosedCallback callback,
-                                   bool* did_suppress_message) override;
+                           content::RenderFrameHost* render_frame_host,
+                           content::JavaScriptDialogType dialog_type,
+                           const base::string16& message_text,
+                           const base::string16& default_prompt_text,
+                           DialogClosedCallback callback,
+                           bool* did_suppress_message) override;
   void RunBeforeUnloadDialog(content::WebContents* web_contents,
                              content::RenderFrameHost* render_frame_host,
                              bool is_reload,

diff --git a/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.cc b/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.cc
index c4c8e46..ffbf699 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.cc
@@ -17,11 +17,12 @@
 using web_contents_utils::WebViewFromWebContents;
 
 //static
-JavaScriptModalDialogEfl* JavaScriptModalDialogEfl::CreateDialog(content::WebContents* web_contents,
-                           Type type,
-                           const base::string16& message_text,
-                           const base::string16& default_prompt_text,
-                           content::JavaScriptDialogManager::DialogClosedCallback callback) {
+JavaScriptModalDialogEfl* JavaScriptModalDialogEfl::CreateDialog(
+    content::WebContents* web_contents,
+    Type type,
+    const base::string16& message_text,
+    const base::string16& default_prompt_text,
+    content::JavaScriptDialogManager::DialogClosedCallback callback) {
   JavaScriptModalDialogEfl* dialog =
       new JavaScriptModalDialogEfl(web_contents, type, message_text,
                                    default_prompt_text, std::move(callback));
@@ -32,22 +33,22 @@ JavaScriptModalDialogEfl* JavaScriptModalDialogEfl::CreateDialog(content::WebCon
   return dialog;
 }
 
-JavaScriptModalDialogEfl::JavaScriptModalDialogEfl(content::WebContents* web_contents,
-                                                   Type type,
-                                                   const base::string16& message_text,
-                                                   const base::string16& default_prompt_text,
-                                                   content::JavaScriptDialogManager::DialogClosedCallback callback)
-    : callback_(std::move(callback))
-    , label_(false)
-    , type_(type)
-    , message_text_(message_text)
-    , default_prompt_text_(default_prompt_text)
-    , web_view_(web_contents_utils::WebViewFromWebContents(web_contents))
-    , prompt_entry_(NULL)
-    , ok_button_(NULL)
-    , cancel_button_(NULL)
-    , imfContext(NULL) {
-}
+JavaScriptModalDialogEfl::JavaScriptModalDialogEfl(
+    content::WebContents* web_contents,
+    Type type,
+    const base::string16& message_text,
+    const base::string16& default_prompt_text,
+    content::JavaScriptDialogManager::DialogClosedCallback callback)
+    : callback_(std::move(callback)),
+      label_(false),
+      type_(type),
+      message_text_(message_text),
+      default_prompt_text_(default_prompt_text),
+      web_view_(web_contents_utils::WebViewFromWebContents(web_contents)),
+      prompt_entry_(NULL),
+      ok_button_(NULL),
+      cancel_button_(NULL),
+      imfContext(NULL) {}
 
 static void promptEntryChanged(void* data, Ecore_IMF_Context* ctx, int value) {
   if (value == ECORE_IMF_INPUT_PANEL_STATE_HIDE) {
@@ -92,7 +93,8 @@ bool JavaScriptModalDialogEfl::ShowJavaScriptDialog() {
 
   if (type_ == PROMPT) {
     if (message_text_.c_str())
-      elm_object_part_text_set(popup_, "title,text", base::UTF16ToUTF8(message_text_).c_str());
+      elm_object_part_text_set(popup_, "title,text",
+                               base::UTF16ToUTF8(message_text_).c_str());
 
     base::FilePath edj_dir;
     base::FilePath javaScriptPopup_edj;
@@ -110,7 +112,8 @@ bool JavaScriptModalDialogEfl::ShowJavaScriptDialog() {
     elm_entry_single_line_set(prompt_entry_, EINA_TRUE);
     elm_entry_input_panel_return_key_type_set(prompt_entry_, ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE );
     evas_object_smart_callback_add(prompt_entry_, "activated", promptEnterKeyDownCallback, this);
-    elm_object_text_set(prompt_entry_, base::UTF16ToUTF8(default_prompt_text_).c_str());
+    elm_object_text_set(prompt_entry_,
+                        base::UTF16ToUTF8(default_prompt_text_).c_str());
     elm_entry_scrollable_set(prompt_entry_, EINA_TRUE);
     elm_entry_cursor_end_set(prompt_entry_);
 
@@ -132,14 +135,15 @@ bool JavaScriptModalDialogEfl::ShowJavaScriptDialog() {
 
   } else if (type_ == NAVIGATION) {
     if (message_text_.c_str())
-      elm_object_part_text_set(popup_, "title,text", base::UTF16ToUTF8(message_text_).c_str());
-
+      elm_object_part_text_set(popup_, "title,text",
+                               base::UTF16ToUTF8(message_text_).c_str());
 
     std::string question(dgettext("WebKit", "IDS_WEBVIEW_POP_LEAVE_THIS_PAGE_Q"));
 
     std::string message;
     if (default_prompt_text_.c_str())
-      message = std::string(base::UTF16ToUTF8(default_prompt_text_).c_str()) + ("\n") + question;
+      message = std::string(base::UTF16ToUTF8(default_prompt_text_).c_str()) +
+                ("\n") + question;
     else
       message = question;
 

diff --git a/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.h b/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.h
index cf14f95..03bd38f 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.h
@@ -15,8 +15,6 @@
 #include <Elementary.h>
 #include "ecore_x_wayland_wrapper.h"
 
-
-
 class EWebView;
 
 namespace content {
@@ -40,11 +38,12 @@ class JavaScriptModalDialogEfl {
   static void OkButtonHandlerForPrompt(void *data, Evas_Object *obj, void *event_info);
   static void CancelButtonHandlerForPrompt(void *data, Evas_Object *obj, void *event_info);
   static void javascriptPopupResizeCallback(void *data, Evas *e, Evas_Object *obj, void *event_info);
-  static JavaScriptModalDialogEfl* CreateDialog(content::WebContents* web_contents,
-                           Type type,
-                           const base::string16& message_text,
-                           const base::string16& default_prompt_text,
-                           content::JavaScriptDialogManager::DialogClosedCallback callback);
+  static JavaScriptModalDialogEfl* CreateDialog(
+      content::WebContents* web_contents,
+      Type type,
+      const base::string16& message_text,
+      const base::string16& default_prompt_text,
+      content::JavaScriptDialogManager::DialogClosedCallback callback);
 
   static void KeyUpCallback(void *data, Evas *e, Evas_Object *obj, void *event_info);
   bool ShowJavaScriptDialog();
@@ -55,11 +54,12 @@ class JavaScriptModalDialogEfl {
   Evas_Object* popup_;
 
  private:
-  JavaScriptModalDialogEfl(content::WebContents* web_contents,
-                           Type type,
-                           const base::string16& message_text,
-                           const base::string16& default_prompt_text,
-                           content::JavaScriptDialogManager::DialogClosedCallback callback);
+  JavaScriptModalDialogEfl(
+      content::WebContents* web_contents,
+      Type type,
+      const base::string16& message_text,
+      const base::string16& default_prompt_text,
+      content::JavaScriptDialogManager::DialogClosedCallback callback);
 
   content::JavaScriptDialogManager::DialogClosedCallback callback_;
   bool label_;

diff --git a/tizen_src/ewk/efl_integration/browser/login_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/login_delegate_efl.h
index 23bac62..d6fba0c 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/login_delegate_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/login_delegate_efl.h
@@ -14,7 +14,7 @@ class AuthChallengeInfo;
 class URLRequest;
 }
 
-class LoginDelegateEfl: public content::LoginDelegate {
+class LoginDelegateEfl : public content::LoginDelegate {
  public:
   LoginDelegateEfl(net::AuthChallengeInfo* auth_info, net::URLRequest* request);
 

diff --git a/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.cc b/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.cc
index 01c170d..fac7142 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.cc
@@ -27,7 +27,7 @@ NotificationControllerEfl::NotificationControllerEfl()
 }
 
 NotificationControllerEfl::~NotificationControllerEfl() {
-  //notifications_map_.Clear();
+  // notifications_map_.Clear();
 }
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
 void NotificationControllerEfl::NotificationAdd(uint64_t notification_id,
@@ -51,7 +51,7 @@ bool NotificationControllerEfl::NotificationClosed(uint64_t notification_id,
 }
 #endif
 void NotificationControllerEfl::NotificationCancelled(uint64_t notification_id) {
-  //NotificationClosed(notification_id, false);
+  // NotificationClosed(notification_id, false);
   if (notification_cancel_callback_) {
     notification_cancel_callback_(notification_id, notification_callback_user_data_);
   }

diff --git a/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h b/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h
index 90c2f05..5367265 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h
@@ -22,7 +22,7 @@ namespace content {
 class WebContents;
 
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-//DesktopNotificationDelegate is not defined
+// DesktopNotificationDelegate is not defined
 struct NotificationData {
   const std::string origin_url;
   const base::string16 replace_id;
@@ -41,7 +41,7 @@ class NotificationControllerEfl: public PlatformNotificationService {
   NotificationControllerEfl();
   ~NotificationControllerEfl();
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-//DesktopNotificationDelegate is not defined
+                           // DesktopNotificationDelegate is not defined
   // Adds a new notification received from engine to a list
   void NotificationAdd(uint64_t notification_id, const GURL& origin,
       const base::string16& replace_id,
@@ -51,7 +51,7 @@ class NotificationControllerEfl: public PlatformNotificationService {
 #endif
   void NotificationCancelled(uint64_t notification_id);
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-//DesktopNotificationDelegate is not defined
+                           // DesktopNotificationDelegate is not defined
   // Notify engine when user clicked on the notification
   bool NotificationClicked(uint64_t notification_id);
 
@@ -73,7 +73,7 @@ class NotificationControllerEfl: public PlatformNotificationService {
   void RemovePermissions(Eina_List* origins);
 
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-//DesktopNotificationDelegate is not defined
+                           // DesktopNotificationDelegate is not defined
   // Checks if the notification is already present.
   // If present returns the notification id of the notification else false
   bool IsNotificationPresent(const GURL& origin,
@@ -124,9 +124,8 @@ class NotificationControllerEfl: public PlatformNotificationService {
 
   // Closes the persistent notification identified by
   // |persistent_notification_id|. This method must be called on the UI thread.
-  void ClosePersistentNotification(
-      BrowserContext* browser_context,
-      const std::string& notification_id) override;
+  void ClosePersistentNotification(BrowserContext* browser_context,
+                                   const std::string& notification_id) override;
 
   // FIXME: Removed in upstream
   //
@@ -141,7 +140,8 @@ class NotificationControllerEfl: public PlatformNotificationService {
   blink::mojom::PermissionStatus CheckPermissionForOrigin(
       const GURL &origin) const;
 
-  //IDMap<NotificationData, IDMapOwnPointer> notifications_map_; // This stores the notifications displayed to the user
+  // IDMap<NotificationData, IDMapOwnPointer> notifications_map_; // This stores
+  // the notifications displayed to the user
   std::map<GURL, bool> permissions_map_;
   mutable base::Lock permissions_mutex_;
 

diff --git a/tizen_src/ewk/efl_integration/browser/permission_manager_efl.cc b/tizen_src/ewk/efl_integration/browser/permission_manager_efl.cc
index 36c1b1c..ef15f3f 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/permission_manager_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/permission_manager_efl.cc
@@ -27,14 +27,15 @@ PermissionManagerEfl::PermissionManagerEfl() {
 PermissionManagerEfl::~PermissionManagerEfl() {
 }
 
-int PermissionManagerEfl::RequestPermission(PermissionType permission,
-                       content::RenderFrameHost* render_frame_host,
-                       const GURL& requesting_origin,
-                       bool user_gesture,
-                       const base::Callback<void(PermissionStatus)>& callback) {
+int PermissionManagerEfl::RequestPermission(
+    PermissionType permission,
+    content::RenderFrameHost* render_frame_host,
+    const GURL& requesting_origin,
+    bool user_gesture,
+    const base::Callback<void(PermissionStatus)>& callback) {
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-// [M48_2564] Temporary disabling the codes for switching to new chromium
-//            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15387
+  // [M48_2564] Temporary disabling the codes for switching to new chromium
+  //            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15387
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   content::WebContents* web_contents =
@@ -105,12 +106,12 @@ int PermissionManagerEfl::RequestPermission(PermissionType permission,
 }
 
 int PermissionManagerEfl::RequestPermissions(
-                       const std::vector<PermissionType>& permission,
-                       RenderFrameHost* render_frame_host,
-                       const GURL& requesting_origin,
-                       bool user_gesture,
-                       const base::Callback<void(
-                           const std::vector<PermissionStatus>&)>& callback) {
+    const std::vector<PermissionType>& permission,
+    RenderFrameHost* render_frame_host,
+    const GURL& requesting_origin,
+    bool user_gesture,
+    const base::Callback<void(const std::vector<PermissionStatus>&)>&
+        callback) {
   NOTIMPLEMENTED();
   int request_id = kNoPendingOperation;
   return request_id;

diff --git a/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.cc b/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.cc
index 4200c09..ae8d1db 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.cc
@@ -24,8 +24,8 @@ void QuotaPermissionContextEfl::RequestQuotaPermission(
     return;
   }
 
-  EWebView* web_view =
-      web_contents_utils::WebViewFromFrameId(render_process_id, params.render_frame_id);
+  EWebView* web_view = web_contents_utils::WebViewFromFrameId(
+      render_process_id, params.render_frame_id);
 
   if (!web_view) {
     NOTREACHED();

diff --git a/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc
index f3c34ff..ea8e844 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc
@@ -4,9 +4,9 @@
 
 #include "resource_dispatcher_host_delegate_efl.h"
 
-#include "browser_context_efl.h"
 #include "browser/login_delegate_efl.h"
 #include "browser/mime_override_manager_efl.h"
+#include "browser_context_efl.h"
 #include "common/web_contents_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_request_info.h"

diff --git a/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h
index bdf80da..2d196ea 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h
@@ -42,7 +42,7 @@ class ResourceDispatcherHostDelegateEfl
                         std::vector<std::unique_ptr<content::ResourceThrottle>>*
                             throttles) override;
 
-  // Create login delegate.
+// Create login delegate.
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
   content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
       net::AuthChallengeInfo* auth_info,
@@ -64,6 +64,6 @@ class ResourceDispatcherHostDelegateEfl
                                        int render_view_id);
 };
 
-}  // namespace net
+}  // namespace content
 
 #endif  // RESOURCE_DISPATCHER_HOST_DELEGATE_EFL_H

diff --git a/tizen_src/ewk/efl_integration/browser/resource_throttle_efl.h b/tizen_src/ewk/efl_integration/browser/resource_throttle_efl.h
index 5f41689..dfc2172 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/resource_throttle_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/resource_throttle_efl.h
@@ -7,8 +7,8 @@
 
 #include <cstddef>  //for NULL
 #include "browser/policy_response_delegate_efl.h"
-#include "content/public/browser/resource_throttle.h"
 #include "content/browser/loader/resource_controller.h"
+#include "content/public/browser/resource_throttle.h"
 #include "content/public/common/resource_type.h"
 #include "net/url_request/url_request.h"
 

diff --git a/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item_private.h b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item_private.h
index 5cd0cdd..d63ef62 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item_private.h
+++ b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item_private.h
@@ -5,8 +5,8 @@
 #ifndef popup_menu_item_private_h
 #define popup_menu_item_private_h
 
-#include "popup_menu_item.h"
 #include "content/public/common/menu_item.h"
+#include "popup_menu_item.h"
 #include "third_party/blink/public/web/web_text_direction.h"
 
 #include <string>

diff --git a/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.cc
index db990c7..dbf4a09 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.cc
@@ -64,15 +64,17 @@ SSLHostStateDelegateEfl::SSLHostStateDelegateEfl() {
 SSLHostStateDelegateEfl::~SSLHostStateDelegateEfl() {
 }
 
-void SSLHostStateDelegateEfl::HostRanInsecureContent(const std::string& host,
-                                                     int child_id,
-                                                     InsecureContentType content_type) {
+void SSLHostStateDelegateEfl::HostRanInsecureContent(
+    const std::string& host,
+    int child_id,
+    InsecureContentType content_type) {
   // Intentional no-op for efl WebView.
 }
 
-bool SSLHostStateDelegateEfl::DidHostRunInsecureContent(const std::string& host,
-                                                        int child_id,
-                                                        InsecureContentType content_type) const {
+bool SSLHostStateDelegateEfl::DidHostRunInsecureContent(
+    const std::string& host,
+    int child_id,
+    InsecureContentType content_type) const {
   // Intentional no-op for efl WebView.
   return false;
 }

diff --git a/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h
index b1581b1..c41afa8 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h
@@ -51,7 +51,8 @@ class SSLHostStateDelegateEfl : public content::SSLHostStateDelegate {
                  const net::X509Certificate& cert,
                  net::CertStatus error) override;
 
-  void Clear(const base::Callback<bool(const std::string&)>& host_filter) override;
+  void Clear(
+      const base::Callback<bool(const std::string&)>& host_filter) override;
 
   // Queries whether |cert| is allowed or denied for |host| and |error|.
   content::SSLHostStateDelegate::CertJudgment QueryPolicy(
@@ -66,9 +67,10 @@ class SSLHostStateDelegateEfl : public content::SSLHostStateDelegate {
                               InsecureContentType content_type) override;
 
   // Returns whether the specified host ran insecure content.
-  bool DidHostRunInsecureContent(const std::string& host,
-                                 int child_id,
-                                 InsecureContentType content_type) const override;
+  bool DidHostRunInsecureContent(
+      const std::string& host,
+      int child_id,
+      InsecureContentType content_type) const override;
 
   // Revokes all SSL certificate error allow exceptions made by the user for
   // |host|.

diff --git a/tizen_src/ewk/efl_integration/browser/webdata/web_data_service.cc b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service.cc
index c34fe47..559af0c 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/webdata/web_data_service.cc
+++ b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service.cc
@@ -19,17 +19,18 @@ using base::Bind;
 using base::Time;
 using content::BrowserThread;
 
-
 WebDataService::WebDataService(scoped_refptr<WebDatabaseService> wdbs,
                                const ProfileErrorCallback& callback)
-    : WebDataServiceBase(wdbs, callback,
-          BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)) {
-}
+    : WebDataServiceBase(
+          wdbs,
+          callback,
+          BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)) {}
 
 WebDataService::WebDataService()
-    : WebDataServiceBase(NULL, ProfileErrorCallback(),
-          BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)) {
-}
+    : WebDataServiceBase(
+          NULL,
+          ProfileErrorCallback(),
+          BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)) {}
 
 WebDataService::~WebDataService() {
 }

diff --git a/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc
index df4d0a1..24524a5 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc
+++ b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc
@@ -48,14 +48,12 @@ WebDataServiceWrapper::WebDataServiceWrapper() {
   PathService::Get(PathsEfl::WEB_DATABASE_DIR, &db_path);
   base::FilePath path = db_path.Append(FILE_PATH_LITERAL(".FormData.db"));
 
-  web_database_ =
-    new WebDatabaseService(
-        path,
-        BrowserThread::GetTaskRunnerForThread(BrowserThread::UI),
+  web_database_ = new WebDatabaseService(
+      path, BrowserThread::GetTaskRunnerForThread(BrowserThread::UI),
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-        BrowserThread::GetTaskRunnerForThread(BrowserThread::DB));
+      BrowserThread::GetTaskRunnerForThread(BrowserThread::DB));
 #else
-        BrowserThread::GetTaskRunnerForThread(BrowserThread::UI));
+      BrowserThread::GetTaskRunnerForThread(BrowserThread::UI));
 #endif
 
   // All tables objects that participate in managing the database must
@@ -63,16 +61,14 @@ WebDataServiceWrapper::WebDataServiceWrapper() {
   web_database_->AddTable(make_scoped_ptr(new autofill::AutofillTable));
   web_database_->LoadDatabase();
 
-  autofill_web_data_ =
-    new AutofillWebDataService(
-        web_database_,
-        BrowserThread::GetTaskRunnerForThread(BrowserThread::UI),
+  autofill_web_data_ = new AutofillWebDataService(
+      web_database_, BrowserThread::GetTaskRunnerForThread(BrowserThread::UI),
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-        BrowserThread::GetTaskRunnerForThread(BrowserThread::DB),
+      BrowserThread::GetTaskRunnerForThread(BrowserThread::DB),
 #else
-        BrowserThread::GetTaskRunnerForThread(BrowserThread::DB),
+      BrowserThread::GetTaskRunnerForThread(BrowserThread::DB),
 #endif
-        base::Bind(&ProfileErrorCallback, 0));
+      base::Bind(&ProfileErrorCallback, 0));
   autofill_web_data_->Init();
 
   web_data_ = new WebDataService(

diff --git a/tizen_src/ewk/efl_integration/browser_context_efl.cc b/tizen_src/ewk/efl_integration/browser_context_efl.cc
index 843f749..134549e 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser_context_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser_context_efl.cc
@@ -140,7 +140,8 @@ BrowserContextEfl::BrowserContextEfl(EWebContext* web_context, bool incognito)
   pref_registry->RegisterBooleanPref(kCredentialsEnableService, true);
 
   PrefServiceFactory pref_service_factory;
-  pref_service_factory.set_user_prefs(base::MakeRefCounted<InMemoryPrefStore>());
+  pref_service_factory.set_user_prefs(
+      base::MakeRefCounted<InMemoryPrefStore>());
   pref_service_factory.set_read_error_callback(base::Bind(&HandleReadError));
   user_pref_service_ = std::move(pref_service_factory.Create(pref_registry));
 
@@ -327,7 +328,8 @@ BackgroundFetchDelegate* BrowserContextEfl::GetBackgroundFetchDelegate() {
   return nullptr;
 }
 
-BrowsingDataRemoverDelegate* BrowserContextEfl::GetBrowsingDataRemoverDelegate() {
+BrowsingDataRemoverDelegate*
+BrowserContextEfl::GetBrowsingDataRemoverDelegate() {
   return nullptr;
 }
 }

diff --git a/tizen_src/ewk/efl_integration/common/content_client_efl.cc b/tizen_src/ewk/efl_integration/common/content_client_efl.cc
index 2ad7fff..da63c02 100644 (file)
--- a/tizen_src/ewk/efl_integration/common/content_client_efl.cc
+++ b/tizen_src/ewk/efl_integration/common/content_client_efl.cc
@@ -29,7 +29,7 @@ base::StringPiece ContentClientEfl::GetDataResource(
   // TODO(boliu): Used only by WebKit, so only bundle those resources for
   // Android WebView.
   return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
-    resource_id, scale_factor);
+      resource_id, scale_factor);
 }
 
 bool ContentClientEfl::CanSendWhileSwappedOut(const IPC::Message* message) {

diff --git a/tizen_src/ewk/efl_integration/common/navigation_policy_params.cc b/tizen_src/ewk/efl_integration/common/navigation_policy_params.cc
index b8e5791..0a5bcff 100644 (file)
--- a/tizen_src/ewk/efl_integration/common/navigation_policy_params.cc
+++ b/tizen_src/ewk/efl_integration/common/navigation_policy_params.cc
@@ -7,13 +7,12 @@
 #include "third_party/blink/public/web/web_navigation_policy.h"
 
 NavigationPolicyParams::NavigationPolicyParams()
-    : render_view_id(-1)
-    , policy(blink::kWebNavigationPolicyIgnore)
-    , type(blink::kWebNavigationTypeOther)
-    , should_replace_current_entry(false)
-    , is_main_frame(false)
-    , is_redirect(false) {
-}
+    : render_view_id(-1),
+      policy(blink::kWebNavigationPolicyIgnore),
+      type(blink::kWebNavigationTypeOther),
+      should_replace_current_entry(false),
+      is_main_frame(false),
+      is_redirect(false) {}
 
 NavigationPolicyParams::~NavigationPolicyParams() {
 }

diff --git a/tizen_src/ewk/efl_integration/common/navigation_policy_params.h b/tizen_src/ewk/efl_integration/common/navigation_policy_params.h
index f684d61..2f2154e 100644 (file)
--- a/tizen_src/ewk/efl_integration/common/navigation_policy_params.h
+++ b/tizen_src/ewk/efl_integration/common/navigation_policy_params.h
@@ -6,9 +6,9 @@
 #define POLICY_NAVIGATION_PARAMS_H_
 
 #include "content/public/common/referrer.h"
+#include "third_party/blink/public/platform/web_string.h"
 #include "third_party/blink/public/web/web_navigation_policy.h"
 #include "third_party/blink/public/web/web_navigation_type.h"
-#include "third_party/blink/public/platform/web_string.h"
 #include "url/gurl.h"
 
 struct NavigationPolicyParams {

diff --git a/tizen_src/ewk/efl_integration/common/print_pages_params.cc b/tizen_src/ewk/efl_integration/common/print_pages_params.cc
index 059aaca..aa79276 100644 (file)
--- a/tizen_src/ewk/efl_integration/common/print_pages_params.cc
+++ b/tizen_src/ewk/efl_integration/common/print_pages_params.cc
@@ -5,16 +5,15 @@
 #include "common/print_pages_params.h"
 
 PrintParams::PrintParams()
-  : page_size(),
-    content_size(),
-    printable_area(),
-    dpi(0),
-    desired_dpi(0),
-    is_first_request(true),
-    print_to_pdf(true),
-    print_scaling_option(blink::kWebPrintScalingOptionSourceSize),
-    document_cookie(0) {
-}
+    : page_size(),
+      content_size(),
+      printable_area(),
+      dpi(0),
+      desired_dpi(0),
+      is_first_request(true),
+      print_to_pdf(true),
+      print_scaling_option(blink::kWebPrintScalingOptionSourceSize),
+      document_cookie(0) {}
 
 PrintPagesParams::PrintPagesParams()
   : pages() {

diff --git a/tizen_src/ewk/efl_integration/common/render_messages_ewk.h b/tizen_src/ewk/efl_integration/common/render_messages_ewk.h
index 78fb5ee..6fe5a26 100644 (file)
--- a/tizen_src/ewk/efl_integration/common/render_messages_ewk.h
+++ b/tizen_src/ewk/efl_integration/common/render_messages_ewk.h
@@ -5,13 +5,13 @@
 // Multiply-included file, no traditional include guard.
 
 #include "base/values.h"
-#include "common/print_pages_params.h"
-#include "common/hit_test_params.h"
 #include "common/cache_params_efl.h"
+#include "common/hit_test_params.h"
 #include "common/navigation_policy_params.h"
+#include "common/print_pages_params.h"
 #include "common/web_preferences_efl.h"
-#include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_channel_handle.h"
+#include "ipc/ipc_message_macros.h"
 #include "private/ewk_hit_test_private.h"
 #include "private/ewk_text_style_private.h"
 #include "private/ewk_wrt_private.h"

diff --git a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
index 624583c..1891202 100644 (file)
--- a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
+++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
@@ -50,7 +50,8 @@ namespace content {
 ContentBrowserClientEfl::ContentBrowserClientEfl()
     : browser_main_parts_efl_(nullptr)
 #if defined(ENABLE_NOTIFICATIONS)
-      , notification_controller_(new NotificationControllerEfl)
+      ,
+      notification_controller_(new NotificationControllerEfl)
 #endif
 {
 }
@@ -247,9 +248,9 @@ bool ContentBrowserClientEfl::AllowSetCookie(
   if (!cookie_manager.get())
     return false;
 
-  return cookie_manager->AllowSetCookie(url, first_party, std::string(), context,
-                                        render_process_id, render_frame_id,
-                                        options);
+  return cookie_manager->AllowSetCookie(url, first_party, std::string(),
+                                        context, render_process_id,
+                                        render_frame_id, options);
 }
 
 void ContentBrowserClientEfl::OverrideWebkitPrefs(

diff --git a/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc b/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
index aec62f2..664e669 100644 (file)
--- a/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
+++ b/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
@@ -9,21 +9,21 @@
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
-#include "ui/base/clipboard/clipboard_helper_efl.h"
 #include "common/web_contents_utils.h"
-#include "context_menu_controller_efl.h"
 #include "content/browser/renderer_host/render_widget_host_view_efl.h"
 #include "content/browser/selection/selection_controller_efl.h"
+#include "content/common/paths_efl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/navigation_entry.h"
+#include "context_menu_controller_efl.h"
 #include "eweb_view.h"
 #include "net/base/filename_util.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
-#include "content/common/paths_efl.h"
+#include "private/ewk_context_menu_private.h"
 #include "third_party/blink/public/platform/web_referrer_policy.h"
 #include "ui/base/clipboard/clipboard.h"
-#include "private/ewk_context_menu_private.h"
+#include "ui/base/clipboard/clipboard_helper_efl.h"
 
 #if defined(OS_TIZEN)
 #include <app_control.h>
@@ -44,12 +44,14 @@ bool ContextMenuControllerEfl::_context_menu_resized = false;
 std::vector<ContextMenuItemEfl> ContextMenuControllerEfl::_context_menu_listdata;
 
 ContextMenuControllerEfl::~ContextMenuControllerEfl() {
-  for (std::set<download::DownloadItem*>::iterator it = clipboard_download_items_.begin();
-      it != clipboard_download_items_.end(); ++it) {
+  for (std::set<download::DownloadItem*>::iterator it =
+           clipboard_download_items_.begin();
+       it != clipboard_download_items_.end(); ++it) {
     (*it)->RemoveObserver(this);
   }
-  for (std::set<download::DownloadItem*>::iterator it = disk_download_items_.begin();
-      it != disk_download_items_.end(); ++it) {
+  for (std::set<download::DownloadItem*>::iterator it =
+           disk_download_items_.begin();
+       it != disk_download_items_.end(); ++it) {
     (*it)->RemoveObserver(this);
   }
   _context_menu_listdata.clear();
@@ -183,7 +185,7 @@ void ContextMenuControllerEfl::GetProposedContextMenu() {
 
   RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(web_contents_.GetRenderWidgetHostView());
   if ((params_.media_type != blink::WebContextMenuData::kMediaTypeImage &&
-      !params_.selection_text.empty()) ||
+       !params_.selection_text.empty()) ||
       (params_.is_editable && (rwhv && !rwhv->IsLastAvailableTextEmpty()))) {
     AddItemToProposedList(EWK_CONTEXT_MENU_ITEM_TYPE_ACTION, EWK_CONTEXT_MENU_ITEM_TAG_SELECT_WORD,
         std::string(dgettext("WebKit", "IDS_WEBVIEW_OPT_SELECT_ABB")));
@@ -525,7 +527,8 @@ void ContextMenuControllerEfl::OnDiskDownload(
   disk_download_items_.insert(item);
 }
 
-void ContextMenuControllerEfl::OnDownloadUpdated(download::DownloadItem* download) {
+void ContextMenuControllerEfl::OnDownloadUpdated(
+    download::DownloadItem* download) {
   if(download && download->AllDataSaved()) {
     if (clipboard_download_items_.find(download) != clipboard_download_items_.end()) {
 #if !defined(WAYLAND_BRINGUP)
@@ -551,9 +554,10 @@ void ContextMenuControllerEfl::OnDownloadUpdated(download::DownloadItem* downloa
   }
 }
 
-base::FilePath ContextMenuControllerEfl::DownloadFile(const GURL url,
+base::FilePath ContextMenuControllerEfl::DownloadFile(
+    const GURL url,
     const base::FilePath outputDir,
-    const download::DownloadUrlParameters::OnStartedCallback &callback =
+    const download::DownloadUrlParameters::OnStartedCallback& callback =
         download::DownloadUrlParameters::OnStartedCallback()) {
   LOG(INFO) << "Downloading file: " << url << "to: "<< outputDir.value();
   const GURL referrer = web_contents_.GetVisibleURL();
@@ -591,9 +595,9 @@ base::FilePath ContextMenuControllerEfl::DownloadFile(const GURL url,
   dl_params->set_file_path(fullPath);
   dl_params->set_prompt(true);
   dl_params->set_callback(callback);
-  
-  DownloadManager* dlm = BrowserContext::GetDownloadManager(
-      web_contents_.GetBrowserContext());
+
+  DownloadManager* dlm =
+      BrowserContext::GetDownloadManager(web_contents_.GetBrowserContext());
   dlm->DownloadUrl(std::move(dl_params));
   return fullPath;
 }
@@ -619,14 +623,12 @@ void ContextMenuControllerEfl::OpenURL(
   if (!url.is_valid())
     return;
 
-  content::OpenURLParams params(url,
-                                content::Referrer(
-                                    web_contents_.GetVisibleURL(),
-                                    blink::kWebReferrerPolicyAlways),
-                                -1, /* -1 to indicate the main frame */
-                                disposition,
-                                ui::PAGE_TRANSITION_LINK,
-                                false);
+  content::OpenURLParams params(
+      url,
+      content::Referrer(web_contents_.GetVisibleURL(),
+                        blink::kWebReferrerPolicyAlways),
+      -1, /* -1 to indicate the main frame */
+      disposition, ui::PAGE_TRANSITION_LINK, false);
 
   web_contents_.GetDelegate()->OpenURLFromTab(&web_contents_, params);
 }
@@ -795,11 +797,13 @@ void ContextMenuControllerEfl::MenuItemSelected(ContextMenuItemEfl* menu_item)
   switch(menu_item->GetContextMenuOption())
   {
     case EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK: {
-      OpenURL(GURL(params_.link_url.spec()), WindowOpenDisposition::CURRENT_TAB);
+      OpenURL(GURL(params_.link_url.spec()),
+              WindowOpenDisposition::CURRENT_TAB);
       break;
     }
     case EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK_IN_NEW_WINDOW: {
-      OpenURL(GURL(params_.link_url.spec()), WindowOpenDisposition::NEW_FOREGROUND_TAB);
+      OpenURL(GURL(params_.link_url.spec()),
+              WindowOpenDisposition::NEW_FOREGROUND_TAB);
       break;
     }
     case EWK_CONTEXT_MENU_ITEM_TAG_SHARE_LINK: {
@@ -855,7 +859,8 @@ void ContextMenuControllerEfl::MenuItemSelected(ContextMenuItemEfl* menu_item)
       break;
     }
     case EWK_CONTEXT_MENU_ITEM_TAG_COPY_LINK_DATA: {
-      ClipboardHelperEfl::GetInstance()->SetData(base::UTF16ToUTF8(params_.link_text),
+      ClipboardHelperEfl::GetInstance()->SetData(
+          base::UTF16ToUTF8(params_.link_text),
           ClipboardHelperEfl::CLIPBOARD_DATA_TYPE_URL);
       break;
     }
@@ -897,7 +902,8 @@ void ContextMenuControllerEfl::MenuItemSelected(ContextMenuItemEfl* menu_item)
       break;
     }
     case EWK_CONTEXT_MENU_ITEM_TAG_OPEN_IMAGE_IN_NEW_WINDOW: {
-      OpenURL(GURL(params_.src_url.spec()), WindowOpenDisposition::NEW_FOREGROUND_TAB);
+      OpenURL(GURL(params_.src_url.spec()),
+              WindowOpenDisposition::NEW_FOREGROUND_TAB);
       break;
     }
     case EWK_CONTEXT_MENU_ITEM_TAG_SELECT_WORD: {

diff --git a/tizen_src/ewk/efl_integration/context_menu_controller_efl.h b/tizen_src/ewk/efl_integration/context_menu_controller_efl.h
index edf265c..c7af0c5 100644 (file)
--- a/tizen_src/ewk/efl_integration/context_menu_controller_efl.h
+++ b/tizen_src/ewk/efl_integration/context_menu_controller_efl.h
@@ -10,9 +10,9 @@
 
 #include "base/memory/weak_ptr.h"
 #include "browser/javascript_modal_dialog_efl.h"
-#include "content/public/browser/render_view_host.h"
 #include "components/download/public/common/download_item.h"
 #include "components/download/public/common/download_url_parameters.h"
+#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/context_menu_params.h"
 #include "public/ewk_context_menu.h"
@@ -61,8 +61,7 @@ class ContextMenuItemEfl {
   std::string icon_path_;
 };
 
-class ContextMenuControllerEfl
-    : public download::DownloadItem::Observer {
+class ContextMenuControllerEfl : public download::DownloadItem::Observer {
  public:
   static void ContextMenuCancelCallback(void* data, Evas_Object* obj, void* event_info);
   static void ContextMenuItemSelectedCallback(void* data, Evas_Object* obj, void* event_info);
@@ -110,9 +109,10 @@ class ContextMenuControllerEfl
                            download::DownloadInterruptReason interrupt_reason);
   void OnDiskDownload(download::DownloadItem* item,
                       download::DownloadInterruptReason interrupt_reason);
-  base::FilePath DownloadFile(const GURL url,
-                              const base::FilePath outputDir,
-                              const download::DownloadUrlParameters::OnStartedCallback& callback);
+  base::FilePath DownloadFile(
+      const GURL url,
+      const base::FilePath outputDir,
+      const download::DownloadUrlParameters::OnStartedCallback& callback);
   bool TriggerDownloadCb(const GURL url);
   void OpenURL(const GURL url, const WindowOpenDisposition disposition);
 #if defined(OS_TIZEN)

diff --git a/tizen_src/ewk/efl_integration/cookie_manager.cc b/tizen_src/ewk/efl_integration/cookie_manager.cc
index 7439886..a83590c 100644 (file)
--- a/tizen_src/ewk/efl_integration/cookie_manager.cc
+++ b/tizen_src/ewk/efl_integration/cookie_manager.cc
@@ -295,11 +295,9 @@ static void GetCookieValueOnIOThread(std::unique_ptr<net::CookieStore> cookie_st
 
   if (cookie_store.get()) {
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-    cookie_store->GetCookiesWithOptionsAsync(host,
-                                             options,
-                                             base::Bind(SignalGetCookieValueCompleted,
-                                                        completion,
-                         i                               result));
+    cookie_store->GetCookiesWithOptionsAsync(
+        host, options,
+        base::Bind(SignalGetCookieValueCompleted, completion, i result));
 #endif
   } else {
     DCHECK(completion);

diff --git a/tizen_src/ewk/efl_integration/devtools_delegate_efl.cc b/tizen_src/ewk/efl_integration/devtools_delegate_efl.cc
index 97bae45..1187d24 100644 (file)
--- a/tizen_src/ewk/efl_integration/devtools_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/devtools_delegate_efl.cc
@@ -18,6 +18,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "common/version_info.h"
 #include "content/browser/devtools/devtools_http_handler.h"
+#include "content/browser/devtools/grit/devtools_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_frontend_host.h"
@@ -27,7 +28,6 @@
 #include "content/public/common/url_constants.h"
 #include "content/public/common/user_agent.h"
 #include "content/shell/browser/shell.h"
-#include "content/browser/devtools/grit/devtools_resources.h"
 #include "content/shell/grit/shell_resources.h"
 #include "net/base/net_errors.h"
 #include "net/socket/tcp_server_socket.h"

diff --git a/tizen_src/ewk/efl_integration/eweb_context.cc b/tizen_src/ewk/efl_integration/eweb_context.cc
index 93d5d7b..2a88e74 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_context.cc
+++ b/tizen_src/ewk/efl_integration/eweb_context.cc
@@ -10,22 +10,22 @@
 #include "base/synchronization/waitable_event.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
 //#include "content/browser/memory/memory_pressure_controller_impl.h"
+#include "browser/favicon/favicon_database.h"
+#include "browser/webdata/web_data_service_factory.h"
 #include "content/public/browser/appcache_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/storage_partition.h"
-#include "content/public/browser/render_process_host.h"
-#include "content/public/browser/local_storage_usage_info.h"
 #include "content/public/browser/dom_storage_context.h"
-#include "browser/favicon/favicon_database.h"
-#include "browser/webdata/web_data_service_factory.h"
-#include "ui/gl/gl_shared_context_efl.h"
+#include "content/public/browser/local_storage_usage_info.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/storage_partition.h"
 #include "net/http/http_cache.h"
 #include "net/proxy_resolution/proxy_config_service_fixed.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
 #include "storage/browser/database/database_quota_client.h"
 #include "storage/browser/fileapi/file_system_quota_client.h"
 #include "storage/browser/quota/quota_manager.h"
+#include "ui/gl/gl_shared_context_efl.h"
 
 #if defined(ENABLE_PLUGINS)
 #include "content/common/plugin_list.h"
@@ -92,13 +92,14 @@ void SetProxyConfigCallbackOnIOThread(
     net::URLRequestContextGetter* url_request_context_getter,
     const net::ProxyConfig& proxy_config) {
   net::ProxyResolutionService* proxy_resolution_service =
-      url_request_context_getter->GetURLRequestContext()->proxy_resolution_service();
+      url_request_context_getter->GetURLRequestContext()
+          ->proxy_resolution_service();
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
   proxy_resolution_service->ResetConfigService(
       base::WrapUnique(new net::ProxyConfigServiceFixed(proxy_config)));
 #else
-  proxy_resolution_service->ResetConfigService(
-      base::WrapUnique(new net::ProxyConfigServiceFixed(net::ProxyConfigWithAnnotation())));
+  proxy_resolution_service->ResetConfigService(base::WrapUnique(
+      new net::ProxyConfigServiceFixed(net::ProxyConfigWithAnnotation())));
 #endif
   done->Signal();
 }
@@ -111,7 +112,8 @@ void OnOriginsWithApplicationCacheObtained(
   Eina_List* origins = 0;
   if (collection.get()) {
     for (const auto& app_origin : collection->infos_by_origin) {
-      _Ewk_Security_Origin* origin = new _Ewk_Security_Origin(app_origin.first.GetURL());
+      _Ewk_Security_Origin* origin =
+          new _Ewk_Security_Origin(app_origin.first.GetURL());
       origins = eina_list_append(origins, origin);
     }
   }
@@ -472,7 +474,8 @@ void EWebContext::GetApplicationCacheUsage(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &storage::QuotaManager::GetUsageAndQuota,
-          partition->GetQuotaManager(), url, blink::mojom::StorageType::kTemporary, 
+          partition->GetQuotaManager(), url,
+          blink::mojom::StorageType::kTemporary,
           base::Bind(&OnTemporaryUsageAndQuotaObtained, callback, user_data)));
 }
 
@@ -498,7 +501,8 @@ void EWebContext::WebStorageDeleteForOrigin(const GURL& origin) {
   content::StoragePartition* partition =
       BrowserContext::GetStoragePartition(browser_context_.get(), NULL);
 
-  partition->GetDOMStorageContext()->DeleteLocalStorage(origin, base::DoNothing());
+  partition->GetDOMStorageContext()->DeleteLocalStorage(origin,
+                                                        base::DoNothing());
 }
 
 void EWebContext::WebStorageOriginsAllGet(

diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc
index d8f91ff..e610639 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.cc
+++ b/tizen_src/ewk/efl_integration/eweb_view.cc
@@ -4,7 +4,11 @@
 
 #include "eweb_view.h"
 
+#include "base/command_line.h"
+#include "base/files/file_path.h"
+#include "base/logging.h"
 #include "base/pickle.h"
+#include "base/strings/utf_string_conversions.h"
 #include "browser/navigation_policy_handler_efl.h"
 #include "browser/quota_permission_context_efl.h"
 #include "browser/web_view_browser_message_filter.h"
@@ -14,48 +18,44 @@
 #include "common/web_contents_utils.h"
 #include "components/sessions/content/content_serialized_navigation_builder.h"
 #include "components/sessions/core/serialized_navigation_entry.h"
-#include "private/ewk_back_forward_list_private.h"
-#include "private/ewk_context_private.h"
-#include "private/ewk_frame_private.h"
-#include "private/ewk_policy_decision_private.h"
-#include "private/ewk_quota_permission_request_private.h"
-#include "private/ewk_settings_private.h"
-#include "private/ewk_text_style_private.h"
-#include "private/webview_delegate_ewk.h"
-#include "web_contents_delegate_efl.h"
-#include "public/ewk_hit_test.h"
-#include "base/command_line.h"
-#include "base/files/file_path.h"
-#include "base/logging.h"
-#include "base/strings/utf_string_conversions.h"
-#include "content/common/content_client_export.h"
-#include "content/common/view_messages.h"
-#include "content/common/frame_messages.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_efl.h"
-#include "content/browser/renderer_host/web_event_factory_efl.h"
 #include "content/browser/renderer_host/ui_events_helper.h"
-#include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/browser/renderer_host/web_event_factory_efl.h"
 #include "content/browser/web_contents/web_contents_impl_efl.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/browser/web_contents/web_contents_view_efl.h"
+#include "content/common/content_client_export.h"
+#include "content/common/frame_messages.h"
+#include "content/common/view_messages.h"
 #include "content/public/browser/browser_message_filter.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/user_agent.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/host_zoom_map.h"
+#include "permission_popup_manager.cc"
+#include "private/ewk_back_forward_list_private.h"
+#include "private/ewk_context_private.h"
+#include "private/ewk_frame_private.h"
+#include "private/ewk_policy_decision_private.h"
+#include "private/ewk_quota_permission_request_private.h"
+#include "private/ewk_settings_private.h"
+#include "private/ewk_text_style_private.h"
+#include "private/webview_delegate_ewk.h"
+#include "public/ewk_hit_test.h"
 #include "services/network/public/cpp/resource_request_body.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/blink/public/platform/web_string.h"
 #include "third_party/blink/public/web/web_find_options.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/display/screen.h"
 #include "ui/events/event_switches.h"
+#include "web_contents_delegate_efl.h"
 #include "web_contents_efl_delegate_ewk.h"
 #include "web_contents_view_efl_delegate_ewk.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/display/screen.h"
-#include "permission_popup_manager.cc"
 
 #include "browser/web_view_evas_handler.h"
 
@@ -335,7 +335,8 @@ void EWebView::Reload() {
 }
 
 void EWebView::ReloadBypassingCache() {
-  web_contents_->GetController().Reload(content::ReloadType::BYPASSING_CACHE, true);
+  web_contents_->GetController().Reload(content::ReloadType::BYPASSING_CACHE,
+                                        true);
 }
 
 Eina_Bool EWebView::CanGoBack() {
@@ -717,7 +718,8 @@ bool EWebView::SetUserAgent(const char* userAgent) {
   for (int i = 0; i < controller.GetEntryCount(); ++i)
     controller.GetEntryAtIndex(i)->SetIsOverridingUserAgent(override);
   // TODO: Check if override_in_new_tabs has to be true.
-  web_contents_->SetUserAgentOverride(override ? userAgent : std::string(), false /* override_in_new_tabs */);
+  web_contents_->SetUserAgentOverride(override ? userAgent : std::string(),
+                                      false /* override_in_new_tabs */);
   return true;
 }
 
@@ -1307,8 +1309,9 @@ Eina_Bool EWebView::AsyncRequestHitTestDataAt(
   int view_x, view_y;
   EvasToBlinkCords(x, y, &view_x, &view_y);
   return AsyncRequestHitTestDataAtBlinkCords(
-      view_x, view_y, mode, new WebViewAsyncRequestHitTestDataUserCallback(
-                                x, y, mode, callback, user_data));
+      view_x, view_y, mode,
+      new WebViewAsyncRequestHitTestDataUserCallback(x, y, mode, callback,
+                                                     user_data));
 }
 
 Eina_Bool EWebView::AsyncRequestHitTestDataAtBlinkCords(
@@ -1318,8 +1321,9 @@ Eina_Bool EWebView::AsyncRequestHitTestDataAtBlinkCords(
     Ewk_View_Hit_Test_Request_Callback callback,
     void* user_data) {
   return AsyncRequestHitTestDataAtBlinkCords(
-      x, y, mode, new WebViewAsyncRequestHitTestDataUserCallback(
-                      x, y, mode, callback, user_data));
+      x, y, mode,
+      new WebViewAsyncRequestHitTestDataUserCallback(x, y, mode, callback,
+                                                     user_data));
 }
 
 Eina_Bool EWebView::AsyncRequestHitTestDataAtBlinkCords(
@@ -1431,7 +1435,7 @@ void EWebView::RenderViewCreated(RenderViewHost* render_view_host) {
 }
 
 void EWebView::SetOverrideEncoding(const std::string& encoding) {
-  // EWK_BRINGUP definition should be removed.
+// EWK_BRINGUP definition should be removed.
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
   web_contents_->SetOverrideEncoding(encoding);
 #endif  // !defined(EWK_BRINGUP)

diff --git a/tizen_src/ewk/efl_integration/eweb_view.h b/tizen_src/ewk/efl_integration/eweb_view.h
index b7aeb43..637dd50 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.h
+++ b/tizen_src/ewk/efl_integration/eweb_view.h
@@ -24,15 +24,15 @@
 #include "base/synchronization/waitable_event.h"
 #include "browser/inputpicker/InputPicker.h"
 #include "browser/selectpicker/popup_picker.h"
-#include "content/public/common/context_menu_params.h"
-#include "content/public/common/file_chooser_params.h"
 #include "content/browser/renderer_host/event_with_latency_info.h"
 #include "content/browser/selection/selection_controller_efl.h"
-#include "content/public/common/input_event_ack_state.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/quota_permission_context.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_efl_delegate.h"
+#include "content/public/common/context_menu_params.h"
+#include "content/public/common/file_chooser_params.h"
+#include "content/public/common/input_event_ack_state.h"
 #include "content/public/common/menu_item.h"
 #include "context_menu_controller_efl.h"
 #include "eweb_context.h"
@@ -41,10 +41,10 @@
 #include "file_chooser_controller_efl.h"
 #include "permission_popup_manager.h"
 #include "popup_controller_efl.h"
-#include "private/ewk_history_private.h"
-#include "private/ewk_hit_test_private.h"
 #include "private/ewk_auth_challenge_private.h"
 #include "private/ewk_back_forward_list_private.h"
+#include "private/ewk_history_private.h"
+#include "private/ewk_hit_test_private.h"
 #include "private/ewk_settings_private.h"
 #include "private/ewk_web_application_icon_data_private.h"
 #include "public/ewk_hit_test.h"

diff --git a/tizen_src/ewk/efl_integration/ewk_global_data.cc b/tizen_src/ewk/efl_integration/ewk_global_data.cc
index 1512c33..50df8f8 100644 (file)
--- a/tizen_src/ewk/efl_integration/ewk_global_data.cc
+++ b/tizen_src/ewk/efl_integration/ewk_global_data.cc
@@ -6,21 +6,21 @@
 
 #include "base/cpu.h"
 #include "base/logging.h"
-#include "base/path_service.h"
 #include "base/message_loop/message_loop.h"
+#include "base/path_service.h"
 #include "browser/autofill/personal_data_manager_factory.h"
 #include "content/browser/gpu/gpu_process_host.h"
+#include "content/browser/renderer_host/render_process_host_impl.h"
+#include "content/browser/utility_process_host.h"
 #include "content/gpu/in_process_gpu_thread.h"
+#include "content/public/app/content_main.h"
 #include "content/public/app/content_main_runner.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
-#include "content/browser/utility_process_host.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/app/content_main.h"
 #include "content/renderer/in_process_renderer_thread.h"
 #include "content/utility/in_process_utility_thread.h"
-#include "content/browser/renderer_host/render_process_host_impl.h"
 #include "efl/window_factory.h"
 #include "eweb_view.h"
 #include "ui/base/resource/resource_bundle.h"

diff --git a/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc b/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc
index 079b933..066cd2e 100644 (file)
--- a/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc
+++ b/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc
@@ -4,9 +4,9 @@
 
 #include "message_pump_for_ui_efl.h"
 
-#include "base/run_loop.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
 #include "base/time/time.h"
 #include "cc/base/switches.h"
 #include "common/content_switches_efl.h"

diff --git a/tizen_src/ewk/efl_integration/network_delegate_efl.cc b/tizen_src/ewk/efl_integration/network_delegate_efl.cc
index 3d79355..9551cb6 100644 (file)
--- a/tizen_src/ewk/efl_integration/network_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/network_delegate_efl.cc
@@ -35,7 +35,7 @@ bool NetworkDelegateEfl::OnCanSetCookie(const URLRequest& request,
                                         CookieOptions* options) {
   if (!cookie_manager_.get())
     return false;
-  return cookie_manager_->OnCanSetCookie(request,std::string(), options);
+  return cookie_manager_->OnCanSetCookie(request, std::string(), options);
 }
 
 bool NetworkDelegateEfl::OnCanAccessFile(

diff --git a/tizen_src/ewk/efl_integration/private/ewk_back_forward_list_private.h b/tizen_src/ewk/efl_integration/private/ewk_back_forward_list_private.h
index 445e213..80eb1d2 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_back_forward_list_private.h
+++ b/tizen_src/ewk/efl_integration/private/ewk_back_forward_list_private.h
@@ -48,7 +48,7 @@ class _Ewk_Back_Forward_List : public back_forward_list::List,
                                public content::NotificationObserver {
  public:
   typedef std::map<const content::NavigationEntry*,
-                   scoped_refptr<_Ewk_Back_Forward_List_Item> >
+                   scoped_refptr<_Ewk_Back_Forward_List_Item>>
       CacheMap;
 
   _Ewk_Back_Forward_List(content::NavigationController& controller);

diff --git a/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.cc b/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.cc
index 293cb28..ead2b27 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.cc
+++ b/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.cc
@@ -45,8 +45,8 @@ _Ewk_Hit_Test::Hit_Test_Node_Data::~Hit_Test_Node_Data() {
 _Ewk_Hit_Test::Hit_Test_Image_Buffer::Hit_Test_Image_Buffer(const Hit_Test_Params::Image_Data& data):
   fileNameExtension(data.fileNameExtension) {
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-// FIXME: [M63_3239]
-// error: ‘const class SkBitmap’ has no member named ‘deepCopyTo’
+                           // FIXME: [M63_3239]
+  // error: ‘const class SkBitmap’ has no member named ‘deepCopyTo’
   data.imageBitmap.deepCopyTo(&(imageBitmap));
 #endif
 }

diff --git a/tizen_src/ewk/efl_integration/private/ewk_notification_private.h b/tizen_src/ewk/efl_integration/private/ewk_notification_private.h
index e2f4808..6c064cd 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_notification_private.h
+++ b/tizen_src/ewk/efl_integration/private/ewk_notification_private.h
@@ -11,8 +11,8 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "private/ewk_security_origin_private.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/blink/public/platform/modules/permissions/permission_status.mojom.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 class GURL;
 

diff --git a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
index ed9feba..9145bbe 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
@@ -13,31 +13,31 @@
 #include "base/strings/string_number_conversions.h"
 #include "common/content_switches_efl.h"
 #include "common/render_messages_ewk.h"
+#include "components/visitedlink/renderer/visitedlink_slave.h"
 #include "content/common/paths_efl.h"
 #include "content/public/common/url_loader_throttle.h"
+#include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
-#include "content/renderer/render_view_impl.h"
 #include "content/renderer/loader/request_extra_data.h"
+#include "content/renderer/render_view_impl.h"
 #include "renderer/editorclient_agent.h"
 #include "renderer/plugins/plugin_placeholder_efl.h"
 #include "renderer/render_frame_observer_efl.h"
 #include "renderer/render_view_observer_efl.h"
-#include "components/visitedlink/renderer/visitedlink_slave.h"
-#include "content/public/renderer/content_renderer_client.h"
 #include "third_party/blink/public/platform/url_conversion.h"
 #include "third_party/blink/public/platform/web_url_error.h"
 #include "third_party/blink/public/platform/web_url_request.h"
+#include "third_party/blink/public/platform/web_viewport_style.h"
 #include "third_party/blink/public/web/web_document.h"
 #include "third_party/blink/public/web/web_document_loader.h"
 #include "third_party/blink/public/web/web_element.h"
 #include "third_party/blink/public/web/web_element_collection.h"
-#include "third_party/blink/public/web/web_frame.h"
 #include "third_party/blink/public/web/web_form_element.h"
+#include "third_party/blink/public/web/web_frame.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/public/web/web_settings.h"
 #include "third_party/blink/public/web/web_view.h"
-#include "third_party/blink/public/platform/web_viewport_style.h"
 #include "url/gurl.h"
 
 #if defined(OS_TIZEN)
@@ -168,12 +168,13 @@ bool ContentRendererClientEfl::OverrideCreatePlugin(
   return true;
 }
 
-void ContentRendererClientEfl::WillSendRequest(blink::WebLocalFrame* frame,
-                               ui::PageTransition transition_type,
-                               const blink::WebURL& url,
-                               const url::Origin* initiator_origin,
-                               GURL* new_url,
-                               bool* attach_same_site_cookies) {
+void ContentRendererClientEfl::WillSendRequest(
+    blink::WebLocalFrame* frame,
+    ui::PageTransition transition_type,
+    const blink::WebURL& url,
+    const url::Origin* initiator_origin,
+    GURL* new_url,
+    bool* attach_same_site_cookies) {
   if (wrt_widget_) {
     wrt_widget_->ParseUrl(url, *new_url);
   } else {
@@ -185,10 +186,11 @@ void ContentRendererClientEfl::DidCreateScriptContext(
     blink::WebFrame* frame,
     v8::Handle<v8::Context> context,
     int world_id) {
-  const content::RenderView* render_view = content::RenderView::FromWebView(
-      frame->View());
+  const content::RenderView* render_view =
+      content::RenderView::FromWebView(frame->View());
   if (wrt_widget_)
-    wrt_widget_->StartSession(context, render_view->GetRoutingID(),
+    wrt_widget_->StartSession(
+        context, render_view->GetRoutingID(),
         frame->ToWebLocalFrame()->GetDocument().BaseURL().GetString().Utf8());
 }
 
@@ -200,43 +202,50 @@ void ContentRendererClientEfl::WillReleaseScriptContext(
     wrt_widget_->StopSession(context);
 }
 
-bool ContentRendererClientEfl::HandleNavigation(content::RenderFrame* render_frame,
-                                bool is_content_initiated,
-                                bool render_view_was_created_by_renderer,
-                                blink::WebFrame* frame,
-                                const blink::WebURLRequest& request,
-                                blink::WebNavigationType type,
-                                blink::WebNavigationPolicy default_policy,
-                                bool is_redirect) {
-   const content::RenderView* render_view =
-       content::RenderView::FromWebView(frame->View());
-   bool result = false;
-   GURL referrer_url(blink::WebStringToGURL(
-       request.HttpHeaderField(blink::WebString::FromUTF8("Referer"))));
-   blink::WebReferrerPolicy referrer_policy =
-       request.IsNull() ? frame->ToWebLocalFrame()->GetDocument().GetReferrerPolicy() : request.GetReferrerPolicy();
-   int render_view_id = render_view->GetRoutingID();
-
-   NavigationPolicyParams params;
-   params.render_view_id = render_view_id;
-   params.url = request.Url();
-   params.httpMethod = request.HttpMethod().Utf8();
-   params.referrer = content::Referrer(referrer_url, referrer_policy);
-   params.auth = request.HttpHeaderField(blink::WebString::FromUTF8("Authorization"));
-   params.policy = default_policy;
-   params.is_main_frame = (frame->View()->MainFrame() == frame);
-   params.type = type;
-   params.is_redirect = is_redirect;
-   params.cookie = request.HttpHeaderField(blink::WebString::FromUTF8("Cookie")).Utf8();
-
-   blink::WebDocumentLoader* docLoader = frame->ToWebLocalFrame()->GetProvisionalDocumentLoader();
-   params.should_replace_current_entry = (docLoader ? docLoader->ReplacesCurrentHistoryItem() : false);
-
-   // Sync message, renderer is blocked here.
-   content::RenderThread::Get()->Send(new EwkHostMsg_DecideNavigationPolicy(
-       params, &result));
-
-   return result;
+bool ContentRendererClientEfl::HandleNavigation(
+    content::RenderFrame* render_frame,
+    bool is_content_initiated,
+    bool render_view_was_created_by_renderer,
+    blink::WebFrame* frame,
+    const blink::WebURLRequest& request,
+    blink::WebNavigationType type,
+    blink::WebNavigationPolicy default_policy,
+    bool is_redirect) {
+  const content::RenderView* render_view =
+      content::RenderView::FromWebView(frame->View());
+  bool result = false;
+  GURL referrer_url(blink::WebStringToGURL(
+      request.HttpHeaderField(blink::WebString::FromUTF8("Referer"))));
+  blink::WebReferrerPolicy referrer_policy =
+      request.IsNull()
+          ? frame->ToWebLocalFrame()->GetDocument().GetReferrerPolicy()
+          : request.GetReferrerPolicy();
+  int render_view_id = render_view->GetRoutingID();
+
+  NavigationPolicyParams params;
+  params.render_view_id = render_view_id;
+  params.url = request.Url();
+  params.httpMethod = request.HttpMethod().Utf8();
+  params.referrer = content::Referrer(referrer_url, referrer_policy);
+  params.auth =
+      request.HttpHeaderField(blink::WebString::FromUTF8("Authorization"));
+  params.policy = default_policy;
+  params.is_main_frame = (frame->View()->MainFrame() == frame);
+  params.type = type;
+  params.is_redirect = is_redirect;
+  params.cookie =
+      request.HttpHeaderField(blink::WebString::FromUTF8("Cookie")).Utf8();
+
+  blink::WebDocumentLoader* docLoader =
+      frame->ToWebLocalFrame()->GetProvisionalDocumentLoader();
+  params.should_replace_current_entry =
+      (docLoader ? docLoader->ReplacesCurrentHistoryItem() : false);
+
+  // Sync message, renderer is blocked here.
+  content::RenderThread::Get()->Send(
+      new EwkHostMsg_DecideNavigationPolicy(params, &result));
+
+  return result;
 }
 
 unsigned long long ContentRendererClientEfl::VisitedLinkHash(const char* canonical_url,
@@ -311,8 +320,9 @@ void ContentRendererClientEfl::GetNavigationErrorStrings(
 }
 #endif
 
-std::unique_ptr<blink::WebSpeechSynthesizer> ContentRendererClientEfl::OverrideSpeechSynthesizer(
-      blink::WebSpeechSynthesizerClient* client) {
+std::unique_ptr<blink::WebSpeechSynthesizer>
+ContentRendererClientEfl::OverrideSpeechSynthesizer(
+    blink::WebSpeechSynthesizerClient* client) {
 #if defined(OS_TIZEN)
   return base::MakeUnique<TtsDispatcher>(new content::TtsDispatcherEfl(client));
 #else

diff --git a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h
index fe218b6..890bb46 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h
+++ b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h
@@ -59,20 +59,20 @@ class ContentRendererClientEfl : public content::ContentRendererClient
   void SetAllowPopup(bool value) { javascript_can_open_windows_ = value; }
 
   bool HandleNavigation(content::RenderFrame* render_frame,
-                                bool is_content_initiated,
-                                bool render_view_was_created_by_renderer,
-                                blink::WebFrame* frame,
-                                const blink::WebURLRequest& request,
-                                blink::WebNavigationType type,
-                                blink::WebNavigationPolicy default_policy,
-                                bool is_redirect) override;
+                        bool is_content_initiated,
+                        bool render_view_was_created_by_renderer,
+                        blink::WebFrame* frame,
+                        const blink::WebURLRequest& request,
+                        blink::WebNavigationType type,
+                        blink::WebNavigationPolicy default_policy,
+                        bool is_redirect) override;
 
   void WillSendRequest(blink::WebLocalFrame* frame,
-                               ui::PageTransition transition_type,
-                               const blink::WebURL& url,
-                               const url::Origin* initiator_origin,
-                               GURL* new_url,
-                               bool* attach_same_site_cookies) override;
+                       ui::PageTransition transition_type,
+                       const blink::WebURL& url,
+                       const url::Origin* initiator_origin,
+                       GURL* new_url,
+                       bool* attach_same_site_cookies) override;
 
   void DidCreateScriptContext(
       blink::WebFrame* frame,

diff --git a/tizen_src/ewk/efl_integration/renderer/editorclient_agent.cc b/tizen_src/ewk/efl_integration/renderer/editorclient_agent.cc
index f8a6b09..b1cfcbf 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/editorclient_agent.cc
+++ b/tizen_src/ewk/efl_integration/renderer/editorclient_agent.cc
@@ -4,8 +4,8 @@
 
 #include "renderer/editorclient_agent.h"
 
-#include "content/public/renderer/render_view.h"
 #include "common/editing_messages.h"
+#include "content/public/renderer/render_view.h"
 #include "third_party/blink/public/web/web_view.h"
 
 namespace editing {

diff --git a/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.cc b/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.cc
index 7be4f4b..55b05fc 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.cc
@@ -11,13 +11,10 @@
 
 gin::WrapperInfo PluginPlaceholderEfl::kWrapperInfo = {gin::kEmbedderNativeGin};
 
-PluginPlaceholderEfl::PluginPlaceholderEfl(
-    content::RenderFrame* render_frame,
-    const blink::WebPluginParams& params,
-    const std::string& html_data)
-    : plugins::LoadablePluginPlaceholder(
-          render_frame, params, html_data) {
-}
+PluginPlaceholderEfl::PluginPlaceholderEfl(content::RenderFrame* render_frame,
+                                           const blink::WebPluginParams& params,
+                                           const std::string& html_data)
+    : plugins::LoadablePluginPlaceholder(render_frame, params, html_data) {}
 
 PluginPlaceholderEfl::~PluginPlaceholderEfl() {
 }
@@ -29,7 +26,8 @@ PluginPlaceholderEfl* PluginPlaceholderEfl::CreateMissingPlugin(
 
   // |missing_plugin| will destroy itself when its WebViewPlugin is going away.
   PluginPlaceholderEfl* missing_plugin = new PluginPlaceholderEfl(
-      render_frame, params, dgettext("WebKit", "IDS_WEBVIEW_BODY_PLUG_IN_MISSING"));
+      render_frame, params,
+      dgettext("WebKit", "IDS_WEBVIEW_BODY_PLUG_IN_MISSING"));
   missing_plugin->AllowLoading();
   return missing_plugin;
 }

diff --git a/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.h b/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.h
index 80a8cfc..cace601 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.h
+++ b/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.h
@@ -16,9 +16,8 @@ class PluginPlaceholderEfl : public plugins::LoadablePluginPlaceholder,
   static PluginPlaceholderEfl* CreateMissingPlugin(
       content::RenderFrame* render_frame,
       const blink::WebPluginParams& params);
-  void OnBlockedContent(
-      content::RenderFrame::PeripheralContentStatus status,
-      bool is_same_origin) override;
+  void OnBlockedContent(content::RenderFrame::PeripheralContentStatus status,
+                        bool is_same_origin) override;
 
  private:
   PluginPlaceholderEfl(content::RenderFrame* render_frame,

diff --git a/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc b/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc
index e5fdedf..4157e31 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc
@@ -4,20 +4,20 @@
 
 #include "renderer/print_web_view_helper_efl.h"
 
+#include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "common/render_messages_ewk.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
-#include "common/render_messages_ewk.h"
 #include "printing/metafile_skia_wrapper.h"
 #include "printing/pdf_metafile_skia.h"
 #include "printing/units.h"
-#include "base/compiler_specific.h"
 #include "skia/ext/platform_canvas.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkRect.h"
 #include "third_party/blink/public/web/web_frame.h"
 #include "third_party/blink/public/web/web_print_params.h"
 #include "third_party/blink/public/web/web_view.h"
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkRect.h"
 
 namespace skia {
   typedef SkCanvas VectorCanvas;
@@ -202,7 +202,8 @@ bool PrintWebViewHelperEfl::PrintPageInternal(
   double scale_factor = 1.0f;
   gfx::Rect canvas_area(canvas_size);
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  // FIXME: cannot convert ‘cc::PaintCanvas*’ to ‘skia::VectorCanvas* {aka SkCanvas*}’ in initialization
+  // FIXME: cannot convert ‘cc::PaintCanvas*’ to ‘skia::VectorCanvas* {aka
+  // SkCanvas*}’ in initialization
   skia::VectorCanvas* canvas = metafile->GetVectorCanvasForNewPage(
       params.params.page_size, canvas_area, scale_factor);
   if (!canvas)

diff --git a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
index 5b11ac1..fa34a3e 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
@@ -18,8 +18,8 @@
 #define private public
 #include "content/renderer/render_frame_impl.h"
 #undef private
-#include "content/renderer/external_popup_menu.h"
 #include "common/render_messages_ewk.h"
+#include "content/renderer/external_popup_menu.h"
 #include "renderer/content_renderer_client_efl.h"
 #include "third_party/blink/public/platform/url_conversion.h"
 #include "third_party/blink/public/platform/web_url_error.h"
@@ -120,10 +120,8 @@ void RenderFrameObserverEfl::OnLoadNotFoundErrorPage(std::string errorUrl) {
   GetContentClientExport()->renderer()->GetNavigationErrorStrings(
       render_frame(), failed_request, error, &error_html, NULL);
 
-  frame->LoadHTMLString(error_html,
-                       GURL(kUnreachableWebDataURL),
-                       error.unreachable_url,
-                       replace);
+  frame->LoadHTMLString(error_html, GURL(kUnreachableWebDataURL),
+                        error.unreachable_url, replace);
 #endif
 }
 
@@ -149,13 +147,14 @@ void RenderFrameObserverEfl::OnRequestSelectCollectionInformation() {
 
   WebDocument document = focused_frame->GetDocument();
   if (document.IsNull())
-      return;
+    return;
 
-  WebElementCollection select_elements = document.GetElementsByHTMLTagName("select");
+  WebElementCollection select_elements =
+      document.GetElementsByHTMLTagName("select");
   int count = 0;
   int index = 0;
-  for (WebElement e = select_elements.FirstItem();
-      !e.IsNull(); e = select_elements.NextItem()) {
+  for (WebElement e = select_elements.FirstItem(); !e.IsNull();
+       e = select_elements.NextItem()) {
     // take only visible elements into account
     if (e.HasNonEmptyLayoutSize()) {
       if (e == focused_element)
@@ -210,12 +209,13 @@ void RenderFrameObserverEfl::WillSubmitForm(
 }
 
 void RenderFrameObserverEfl::DidCreateScriptContext(
-    v8::Local<v8::Context> context, int world_id) {
+    v8::Local<v8::Context> context,
+    int world_id) {
   ContentRendererClientEfl* client = static_cast<ContentRendererClientEfl*>(
       GetContentClientExport()->renderer());
 
-  client->DidCreateScriptContext(
-      render_frame()->GetWebFrame(), context, world_id);
+  client->DidCreateScriptContext(render_frame()->GetWebFrame(), context,
+                                 world_id);
 }
 
 void RenderFrameObserverEfl::WillReleaseScriptContext(

diff --git a/tizen_src/ewk/efl_integration/renderer/render_thread_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_thread_observer_efl.cc
index 69aeea9..aef91b4 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/render_thread_observer_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/render_thread_observer_efl.cc
@@ -9,10 +9,10 @@
 #include "common/content_switches_efl.h"
 #include "common/render_messages_ewk.h"
 #include "content/public/renderer/render_thread.h"
+#include "renderer/content_renderer_client_efl.h"
 #include "third_party/blink/public/platform/web_cache.h"
 #include "third_party/sqlite/sqlite3.h"
 #include "v8/include/v8.h"
-#include "renderer/content_renderer_client_efl.h"
 
 #include "third_party/blink/public/platform/web_runtime_features.h"
 // XXX:  config.h needs to be included before internal blink headers.
@@ -28,7 +28,8 @@ RenderThreadObserverEfl::RenderThreadObserverEfl(
     : content_client_(content_client) {
   const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  // FIXME: ‘EnableCSSViewModeMediaFeature’ is not a member of ‘blink::WebRuntimeFeatures’
+  // FIXME: ‘EnableCSSViewModeMediaFeature’ is not a member of
+  // ‘blink::WebRuntimeFeatures’
   if (command_line.HasSwitch(switches::kEnableViewMode))
     WebRuntimeFeatures::EnableCSSViewModeMediaFeature(true);
 #endif

diff --git a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc
index 8ae2609..2ddb044 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc
@@ -29,12 +29,12 @@
 #include "third_party/blink/public/web/web_document.h"
 #include "third_party/blink/public/web/web_form_element.h"
 #include "third_party/blink/public/web/web_frame.h"
+#include "third_party/blink/public/web/web_frame_content_dumper.h"
 #include "third_party/blink/public/web/web_frame_widget.h"
 #include "third_party/blink/public/web/web_hit_test_result.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/public/web/web_settings.h"
 #include "third_party/blink/public/web/web_view.h"
-#include "third_party/blink/public/web/web_frame_content_dumper.h"
 
 // XXX: config.h needs to be included before internal blink headers.
 //      It'd be great if we did not include not internal blibk headers.
@@ -51,10 +51,10 @@ static_assert(
     static_cast<int>(SecurityPolicyType::kWebContentSecurityPolicyTypeReport) ==
         static_cast<int>(EWK_REPORT_ONLY),
     "mismatching enums : EWK_REPORT_ONLY");
-static_assert(
-    static_cast<int>(SecurityPolicyType::kWebContentSecurityPolicyTypeEnforce) ==
-        static_cast<int>(EWK_ENFORCE_POLICY),
-    "mismatching enums : EWK_ENFORCE_POLICY");
+static_assert(static_cast<int>(
+                  SecurityPolicyType::kWebContentSecurityPolicyTypeEnforce) ==
+                  static_cast<int>(EWK_ENFORCE_POLICY),
+              "mismatching enums : EWK_ENFORCE_POLICY");
 
 SecurityPolicyType ToSecurityPolicyType(Ewk_CSP_Header_Type type) {
   return static_cast<SecurityPolicyType>(type);
@@ -123,11 +123,13 @@ void PopulateEwkHitTestData(const blink::WebHitTestResult& web_hit_test, Hit_Tes
 
   if ((params->mode & EWK_HIT_TEST_MODE_IMAGE_DATA) &&
       (params->context & EWK_HIT_TEST_RESULT_CONTEXT_IMAGE)) {
-    blink::WebElement hit_element = web_hit_test.GetNode().ToConst<blink::WebElement>();
+    blink::WebElement hit_element =
+        web_hit_test.GetNode().ToConst<blink::WebElement>();
 
     params->imageData.imageBitmap = hit_element.ImageContents().GetSkBitmap();
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-    params->imageData.fileNameExtension = hit_element.imageFilenameExtension().Utf8();
+    params->imageData.fileNameExtension =
+        hit_element.imageFilenameExtension().Utf8();
 #endif
   }
 }
@@ -140,10 +142,12 @@ void PopulateNodeAttributesMapFromHitTest(const blink::WebHitTestResult& web_hit
   if (!web_hit_test.GetNode().IsElementNode())
     return;
 
-  blink::WebElement hit_element = web_hit_test.GetNode().ToConst<blink::WebElement>();
+  blink::WebElement hit_element =
+      web_hit_test.GetNode().ToConst<blink::WebElement>();
   for (unsigned int i = 0; i < hit_element.AttributeCount(); i++) {
     params->nodeData.attributes.insert(std::pair<std::string, std::string>(
-        hit_element.AttributeLocalName(i).Utf8(), hit_element.AttributeValue(i).Utf8()));
+        hit_element.AttributeLocalName(i).Utf8(),
+        hit_element.AttributeValue(i).Utf8()));
   }
 }
 
@@ -204,8 +208,8 @@ void RenderViewObserverEfl::OnSetContentSecurityPolicy(const std::string& policy
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
   blink::WebDocument document = view->FocusedFrame()->GetDocument();
 
-  document.setContentSecurityPolicyUsingHeader(blink::WebString::FromUTF8(policy),
-      ToSecurityPolicyType(header_type));
+  document.setContentSecurityPolicyUsingHeader(
+      blink::WebString::FromUTF8(policy), ToSecurityPolicyType(header_type));
 #endif
 }
 
@@ -242,7 +246,9 @@ void RenderViewObserverEfl::OnPlainTextGet(int plain_text_get_callback_id)
   // WebFrameContentDumper should only be used for testing purposes. See http://crbug.com/585164.
   blink::WebString content = blink::WebFrameContentDumper::DumpWebViewAsText(
       render_view()->GetWebView(), INT_MAX);
-  Send(new EwkHostMsg_PlainTextGetContents(render_view()->GetRoutingID(), content.Utf8(), plain_text_get_callback_id));
+  Send(new EwkHostMsg_PlainTextGetContents(render_view()->GetRoutingID(),
+                                           content.Utf8(),
+                                           plain_text_get_callback_id));
 }
 
 void RenderViewObserverEfl::OnGetSelectionStyle()
@@ -257,21 +263,35 @@ void RenderViewObserverEfl::OnGetSelectionStyle()
 
   SelectionStylePrams params;
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  params.underline_state = frame->commandState(blink::WebString::FromUTF8("underline"));
-  params.italic_state = frame->commandState(blink::WebString::FromUTF8("italic"));
+  params.underline_state =
+      frame->commandState(blink::WebString::FromUTF8("underline"));
+  params.italic_state =
+      frame->commandState(blink::WebString::FromUTF8("italic"));
   params.bold_state = frame->commandState(blink::WebString::FromUTF8("bold"));
-  blink::WebString bg_color = frame->commandValue(blink::WebString::FromUTF8("BackColor"));
-  GetGRBAValuesFromString(std::string(bg_color.Utf8()), &params.bg_color.r, &params.bg_color.g, &params.bg_color.b, &params.bg_color.a);
-  blink::WebString color = frame->commandValue(blink::WebString::FromUTF8("ForeColor"));
-  GetGRBAValuesFromString(std::string(color.Utf8()), &params.color.r, &params.color.g, &params.color.b, &params.color.a);
-  blink::WebString font_size = frame->commandValue(blink::WebString::FromUTF8("FontSize"));
+  blink::WebString bg_color =
+      frame->commandValue(blink::WebString::FromUTF8("BackColor"));
+  GetGRBAValuesFromString(std::string(bg_color.Utf8()), &params.bg_color.r,
+                          &params.bg_color.g, &params.bg_color.b,
+                          &params.bg_color.a);
+  blink::WebString color =
+      frame->commandValue(blink::WebString::FromUTF8("ForeColor"));
+  GetGRBAValuesFromString(std::string(color.Utf8()), &params.color.r,
+                          &params.color.g, &params.color.b, &params.color.a);
+  blink::WebString font_size =
+      frame->commandValue(blink::WebString::FromUTF8("FontSize"));
   params.font_size = font_size.Utf8();
-  params.order_list_state = frame->commandState(blink::WebString::FromUTF8("InsertOrderedList"));
-  params.un_order_list_state = frame->commandState(blink::WebString::FromUTF8("InsertUnorderedList"));
-  params.text_align_center_state = frame->commandState(blink::WebString::FromUTF8("JustifyCenter"));
-  params.text_align_left_state = frame->commandState(blink::WebString::FromUTF8("JustifyLeft"));
-  params.text_align_right_state = frame->commandState(blink::WebString::FromUTF8("JustifyRight"));
-  params.text_align_full_state = frame->commandState(blink::WebString::FromUTF8("JustifyFull"));
+  params.order_list_state =
+      frame->commandState(blink::WebString::FromUTF8("InsertOrderedList"));
+  params.un_order_list_state =
+      frame->commandState(blink::WebString::FromUTF8("InsertUnorderedList"));
+  params.text_align_center_state =
+      frame->commandState(blink::WebString::FromUTF8("JustifyCenter"));
+  params.text_align_left_state =
+      frame->commandState(blink::WebString::FromUTF8("JustifyLeft"));
+  params.text_align_right_state =
+      frame->commandState(blink::WebString::FromUTF8("JustifyRight"));
+  params.text_align_full_state =
+      frame->commandState(blink::WebString::FromUTF8("JustifyFull"));
 #endif
   params.has_composition = frame->HasMarkedText();
   Send(new EwkViewMsg_SelectionTextStyleState(render_view()->GetRoutingID(), params));
@@ -350,7 +370,8 @@ void RenderViewObserverEfl::DidChangePageScaleFactor()
   if (!view)
     return;
 
-  Send(new EwkHostMsg_DidChangePageScaleFactor(render_view()->GetRoutingID(), view->PageScaleFactor()));
+  Send(new EwkHostMsg_DidChangePageScaleFactor(render_view()->GetRoutingID(),
+                                               view->PageScaleFactor()));
 }
 #endif
 
@@ -371,7 +392,8 @@ void RenderViewObserverEfl::CheckContentsSize()
   if (!view || !view->MainFrame())
     return;
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  gfx::Size contents_size = view->MainFrame()->ToWebLocalFrame()->ContentsSize();
+  gfx::Size contents_size =
+      view->MainFrame()->ToWebLocalFrame()->ContentsSize();
 #else
   gfx::Size contents_size;
 #endif
@@ -406,7 +428,7 @@ void RenderViewObserverEfl::OnSetDrawsTransparentBackground(bool draws_transpare
 
 void RenderViewObserverEfl::OnWebAppIconUrlGet(int callback_id)
 {
-  blink::WebFrame *frame = render_view()->GetWebView()->MainFrame();
+  blink::WebFrame* frame = render_view()->GetWebView()->MainFrame();
   if (!frame) {
     return;
   }
@@ -434,17 +456,19 @@ void RenderViewObserverEfl::OnWebAppIconUrlGet(int callback_id)
     std::string rel = elem.GetAttribute("rel").Utf8();
     if (base::LowerCaseEqualsASCII(rel, "apple-touch-icon") ||              // Apple's way
         base::LowerCaseEqualsASCII(rel, "apple-touch-icon-precomposed")) {
-      appleIconUrl = document.CompleteURL(elem.GetAttribute("href")).GetString().Utf8();
+      appleIconUrl =
+          document.CompleteURL(elem.GetAttribute("href")).GetString().Utf8();
       break;
     } else if (base::LowerCaseEqualsASCII(rel, "icon")) {                   // Google's way
-      iconUrl = document.CompleteURL(elem.GetAttribute("href")).GetString().Utf8();
+      iconUrl =
+          document.CompleteURL(elem.GetAttribute("href")).GetString().Utf8();
     }
   }
   Send(new EwkHostMsg_WebAppIconUrlGet(render_view()->GetRoutingID(), appleIconUrl.empty() ? iconUrl : appleIconUrl, callback_id));
 }
 
 void RenderViewObserverEfl::OnWebAppIconUrlsGet(int callback_id) {
-  blink::WebFrame *frame = render_view()->GetWebView()->MainFrame();
+  blink::WebFrame* frame = render_view()->GetWebView()->MainFrame();
   if (!frame) {
     return;
   }
@@ -470,7 +494,8 @@ void RenderViewObserverEfl::OnWebAppIconUrlsGet(int callback_id) {
         base::LowerCaseEqualsASCII(rel, "apple-touch-icon-precomposed") ||  // same here
         base::LowerCaseEqualsASCII(rel, "icon")) {                          // Google's way
       std::string iconSize = elem.GetAttribute("sizes").Utf8();
-      std::string iconUrl = document.CompleteURL(elem.GetAttribute("href")).GetString().Utf8();
+      std::string iconUrl =
+          document.CompleteURL(elem.GetAttribute("href")).GetString().Utf8();
 
       iconUrls[iconSize] = iconUrl;
     }
@@ -479,7 +504,7 @@ void RenderViewObserverEfl::OnWebAppIconUrlsGet(int callback_id) {
 }
 
 void RenderViewObserverEfl::OnWebAppCapableGet(int callback_id) {
-  blink::WebFrame *frame = render_view()->GetWebView()->MainFrame();
+  blink::WebFrame* frame = render_view()->GetWebView()->MainFrame();
   if (!frame)
     return;
 
@@ -562,9 +587,11 @@ void RenderViewObserverEfl::OnUpdateWebKitPreferencesEfl(const WebPreferencesEfl
   blink::WebView* view = render_view()->GetWebView();
   if (view && view->GetSettings()) {
     blink::WebSettings* settings = view->GetSettings();
-    settings->SetShrinksViewportContentToFit(web_preferences_efl.shrinks_viewport_content_to_fit);
+    settings->SetShrinksViewportContentToFit(
+        web_preferences_efl.shrinks_viewport_content_to_fit);
     // Allows resetting the scale factor when "auto fitting" gets disabled.
-    settings->SetLoadWithOverviewMode(web_preferences_efl.shrinks_viewport_content_to_fit);
+    settings->SetLoadWithOverviewMode(
+        web_preferences_efl.shrinks_viewport_content_to_fit);
     // and more if they exist in web_preferences_efl.
   }
 

diff --git a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h
index f5f68e0..ebbfd2b 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h
+++ b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h
@@ -10,13 +10,11 @@
 #include "base/timer/timer.h"
 #include "common/web_preferences_efl.h"
 #include "content/public/renderer/render_view_observer.h"
-#include "content/public/renderer/render_view_observer.h"
-#include "renderer/content_renderer_client_efl.h"
-#include "renderer/print_web_view_helper_efl.h"
-#include "content/public/renderer/render_view_observer.h"
 #include "private/ewk_hit_test_private.h"
 #include "public/ewk_hit_test.h"
 #include "public/ewk_view.h"
+#include "renderer/content_renderer_client_efl.h"
+#include "renderer/print_web_view_helper_efl.h"
 #include "third_party/blink/public/platform/web_size.h"
 //#include "third_party/blink/public/web/WebViewModeEnums.h"
 

diff --git a/tizen_src/ewk/efl_integration/resource/BUILD.gn b/tizen_src/ewk/efl_integration/resource/BUILD.gn
index fa6f35f..ed22cfe 100644 (file)
--- a/tizen_src/ewk/efl_integration/resource/BUILD.gn
+++ b/tizen_src/ewk/efl_integration/resource/BUILD.gn
@@ -9,7 +9,9 @@ template("edje_res_ewk") {
   action_foreach(edje_target_name) {
     script = "//tizen_src/build/cmd_execution.py"
     sources = invoker.sources
-    outputs = [ "$root_out_dir/resources/{{source_name_part}}.edj" ]
+    outputs = [
+      "$root_out_dir/resources/{{source_name_part}}.edj",
+    ]
     args = [
       "$edje_compiler",
       "-id",
@@ -20,7 +22,9 @@ template("edje_res_ewk") {
   }
 
   source_set(target_name) {
-    data = [ ":$edje_target_name" ]
+    data = [
+      ":$edje_target_name",
+    ]
   }
 }
 

diff --git a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc
index d607675..f0603d7 100644 (file)
--- a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc
+++ b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc
@@ -6,11 +6,12 @@
 #include "url_request_context_getter_efl.h"
 
 #include "base/command_line.h"
-#include "base/task_scheduler/post_task.h"
 #include "base/files/file_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/task_scheduler/post_task.h"
 //#include "base/threading/sequenced_worker_pool.h"
+#include "components/network_session_configurator/common/network_switches.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
@@ -35,7 +36,6 @@
 #include "net/url_request/url_request_intercepting_job_factory.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "network_delegate_efl.h"
-#include "components/network_session_configurator/common/network_switches.h"
 
 using net::SQLitePersistentCookieStore;
 
@@ -80,7 +80,8 @@ URLRequestContextGetterEfl::URLRequestContextGetterEfl(
     std::swap(protocol_handlers_, *protocol_handlers);
 
   proxy_config_service_ =
-      net::ProxyResolutionService::CreateSystemProxyConfigService(io_task_runner);
+      net::ProxyResolutionService::CreateSystemProxyConfigService(
+          io_task_runner);
 }
 
 URLRequestContextGetterEfl::~URLRequestContextGetterEfl() {}
@@ -324,8 +325,8 @@ void URLRequestContextGetterEfl::CreatePersistentCookieStore(
   cookie_store_path_ = path;
 
   CookieStoreConfig config(
-      cookie_store_path_.Append(FILE_PATH_LITERAL("Cookies")),
-      false, false, nullptr);
+      cookie_store_path_.Append(FILE_PATH_LITERAL("Cookies")), false, false,
+      nullptr);
   cookie_store_ = CreateCookieStore(config);
   net::CookieMonster* cookie_monster =
       static_cast<net::CookieMonster*>(cookie_store_.get());

diff --git a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h
index 66fcd82..d744205 100644 (file)
--- a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h
+++ b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h
@@ -26,13 +26,18 @@ namespace content {
 
 class URLRequestContextGetterEfl : public net::URLRequestContextGetter {
  public:
-  URLRequestContextGetterEfl(std::unique_ptr<net::NetworkDelegate> network_delegate = std::unique_ptr<net::NetworkDelegate>(),
+  URLRequestContextGetterEfl(
+      std::unique_ptr<net::NetworkDelegate> network_delegate =
+          std::unique_ptr<net::NetworkDelegate>(),
       bool ignore_certificate_errors = false,
       const base::FilePath& base_path = base::FilePath(),
-      const scoped_refptr<base::SingleThreadTaskRunner> &io_task_runner = BrowserThread::GetTaskRunnerForThread(BrowserThread::IO),
-      const scoped_refptr<base::SingleThreadTaskRunner> &file_task_runner = BrowserThread::GetTaskRunnerForThread(BrowserThread::UI),
+      const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner =
+          BrowserThread::GetTaskRunnerForThread(BrowserThread::IO),
+      const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner =
+          BrowserThread::GetTaskRunnerForThread(BrowserThread::UI),
       ProtocolHandlerMap* protocol_handlers = NULL,
-      URLRequestInterceptorScopedVector request_interceptors = URLRequestInterceptorScopedVector(),
+      URLRequestInterceptorScopedVector request_interceptors =
+          URLRequestInterceptorScopedVector(),
       net::NetLog* net_log = NULL);
 
   // net::URLRequestContextGetter implementation.

diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
index d10b003..90d2a72 100644 (file)
--- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
@@ -497,18 +497,19 @@ bool WebContentsDelegateEfl::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebContentsDelegateEfl, message)
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  // FIXME: WebContentsObserver is IPC:: listener only cannot send
-  IPC_MESSAGE_HANDLER_DELAY_REPLY(EwkHostMsg_GetContentSecurityPolicy,
-                                  OnGetContentSecurityPolicy)
+    // FIXME: WebContentsObserver is IPC:: listener only cannot send
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(EwkHostMsg_GetContentSecurityPolicy,
+                                    OnGetContentSecurityPolicy)
 #endif
-  IPC_MESSAGE_HANDLER(EwkHostMsg_DidPrintPagesToPdf, OnPrintedMetafileReceived)
-  IPC_MESSAGE_HANDLER(EwkHostMsg_WrtMessage, OnWrtPluginMessage)
+    IPC_MESSAGE_HANDLER(EwkHostMsg_DidPrintPagesToPdf,
+                        OnPrintedMetafileReceived)
+    IPC_MESSAGE_HANDLER(EwkHostMsg_WrtMessage, OnWrtPluginMessage)
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  // FIXME: WebContentsObserver is IPC:: listener only cannot send
-  IPC_MESSAGE_HANDLER_DELAY_REPLY(EwkHostMsg_WrtSyncMessage,
-                                  OnWrtPluginSyncMessage)
+    // FIXME: WebContentsObserver is IPC:: listener only cannot send
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(EwkHostMsg_WrtSyncMessage,
+                                    OnWrtPluginSyncMessage)
 #endif
-  IPC_MESSAGE_UNHANDLED(handled = false)
+    IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
@@ -628,8 +629,8 @@ bool WebContentsDelegateEfl::DidAddMessageToConsole(WebContents* source,
                                                     int32_t line_no,
                                                     const string16& source_id) {
   std::unique_ptr<_Ewk_Console_Message> console_message(
-      new _Ewk_Console_Message(level, base::UTF16ToUTF8(message).c_str(), line_no,
-                               base::UTF16ToUTF8(source_id).c_str()));
+      new _Ewk_Console_Message(level, base::UTF16ToUTF8(message).c_str(),
+                               line_no, base::UTF16ToUTF8(source_id).c_str()));
   web_view_->SmartCallback<EWebViewCallbacks::ConsoleMessage>().call(
       console_message.get());
   return true;

diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h
index be14902..d06f26b 100644 (file)
--- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h
+++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h
@@ -129,14 +129,14 @@ class WebContentsDelegateEfl : public WebContentsDelegate,
   ColorChooser* OpenColorChooser(
       WebContents* web_contents,
       SkColor color,
-      const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions) override;
-  void OpenDateTimeDialog(
-      ui::TextInputType dialog_type,
-      double dialog_value,
-      double min,
-      double max,
-      double step,
-      const std::vector<DateTimeSuggestion>& suggestions);
+      const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions)
+      override;
+  void OpenDateTimeDialog(ui::TextInputType dialog_type,
+                          double dialog_value,
+                          double min,
+                          double max,
+                          double step,
+                          const std::vector<DateTimeSuggestion>& suggestions);
   bool PreHandleGestureEvent(WebContents* source,
                              const blink::WebGestureEvent& event) override;
 
@@ -154,9 +154,9 @@ class WebContentsDelegateEfl : public WebContentsDelegate,
                      const GURL& validated_url);
 
   void DidStartProvisionalLoadForFrame(RenderFrameHost* render_frame_host,
-                                               const GURL& validated_url,
-                                               bool is_error_page,
-                                               bool is_iframe_srcdoc);
+                                       const GURL& validated_url,
+                                       bool is_error_page,
+                                       bool is_iframe_srcdoc);
 
   void DidUpdateFaviconURL(const std::vector<FaviconURL>& candidates);
 

diff --git a/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.cc b/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.cc
index a975987..662e360 100644 (file)
--- a/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.cc
+++ b/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.cc
@@ -97,7 +97,8 @@ net::URLRequestJob* WrtFileProtocolHandler::MaybeCreateJob(
   const bool is_file = net::FileURLToFilePath(request->url(), &file_path);
 
   // Check file access permissions.
-  // FIXME: The third parameter of net::URLRequestErrorJob sould be absolute_path.
+  // FIXME: The third parameter of net::URLRequestErrorJob sould be
+  // absolute_path.
   if (!network_delegate ||
       !network_delegate->CanAccessFile(*request, file_path, file_path)) {
     return new net::URLRequestErrorJob(request, network_delegate, net::ERR_ACCESS_DENIED);

diff --git a/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc
index 67edee3..79e041f 100644 (file)
--- a/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc
+++ b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc
@@ -67,7 +67,9 @@ WrtWidgetHost* WrtWidgetHost::Get() {
   // TODO(z.kostrzewa) LazyInstance is thread-safe but creating
   // WrtWidgetHost is not - make it thread-safe.
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  // FIXME: ‘New’ is not a member of ‘base::internal::ErrorMustSelectLazyOrDestructorAtExitForLazyInstance<std::unique_ptr<WrtWidgetHost> >’
+  // FIXME: ‘New’ is not a member of
+  // ‘base::internal::ErrorMustSelectLazyOrDestructorAtExitForLazyInstance<std::unique_ptr<WrtWidgetHost>
+  // >’
   if (!g_wrt_widget_host.Get().get())
     g_wrt_widget_host.Get().reset(new WrtWidgetHost);
   return g_wrt_widget_host.Get().get();

diff --git a/tizen_src/ewk/efl_webview_app/BUILD.gn b/tizen_src/ewk/efl_webview_app/BUILD.gn
index 7b413ac..a5a93ab 100644 (file)
--- a/tizen_src/ewk/efl_webview_app/BUILD.gn
+++ b/tizen_src/ewk/efl_webview_app/BUILD.gn
@@ -5,8 +5,12 @@
 import("//tizen_src/build/config/tizen_features.gni")
 
 copy("efl_webview_app_script") {
-  sources = [ "efl_webview_app.sh" ]
-  outputs = [ "$root_out_dir/{{source_file_part}}" ]
+  sources = [
+    "efl_webview_app.sh",
+  ]
+  outputs = [
+    "$root_out_dir/{{source_file_part}}",
+  ]
 }
 
 executable("efl_webview_app") {
@@ -37,7 +41,7 @@ executable("efl_webview_app") {
     # will be excluded in chromium side (src/build/common.gypi), and GYP
     # processes pattern lists after exclusion lists.
     # (ref: https://gyp.gsrc.io/docs/InputFormatReference.md#Processing-Order)
-    "-Werror"
+    "-Werror",
   ]
   if (!use_wayland) {
     configs += [ "//tizen_src/build:ecore-x" ]
@@ -49,8 +53,11 @@ executable("efl_webview_app") {
     public_configs += [ "//tizen_src/build:ecore-wayland-public" ]
   }
   include_dirs = [ "../efl_integration" ]
-  sources = [ "app.c" ]
+  sources = [
+    "app.c",
+  ]
   ldflags = [ "-Llib" ]
+
   #libs = [ "libchromium-ewk" ]
 }
 
@@ -61,18 +68,18 @@ executable("mini_browser") {
     # will be excluded in chromium side (src/build/common.gypi), and GYP
     # processes pattern lists after exclusion lists.
     # (ref: https://gyp.gsrc.io/docs/InputFormatReference.md#Processing-Order)
-    "-Werror"
+    "-Werror",
   ]
   sources = []
   include_dirs = []
   ldflags = []
   libs = []
   deps = []
-  if (building_for_tizen) { # FIXME: mini_browser shouldn't depend on dlog and appcore-efl without OS(TIZEN) checks
+  if (building_for_tizen) {  # FIXME: mini_browser shouldn't depend on dlog and appcore-efl without OS(TIZEN) checks
     sources += [
-      "mini_browser.c",
       "browser-object.h",
       "browser-string.h",
+      "mini_browser.c",
     ]
     include_dirs += [ "../efl_integration" ]
     configs += [ "//tizen_src/build:capi-system-device" ]

diff --git a/tizen_src/ewk/po_tizen/BUILD.gn b/tizen_src/ewk/po_tizen/BUILD.gn
index a1c4940..c310fb6 100644 (file)
--- a/tizen_src/ewk/po_tizen/BUILD.gn
+++ b/tizen_src/ewk/po_tizen/BUILD.gn
@@ -11,17 +11,22 @@ template("po_translations") {
   action_foreach(po_target_name) {
     script = "//tizen_src/build/cmd_execution.py"
     sources = invoker.sources
-    outputs = [ "$root_out_dir/locale/{{source_name_part}}/LC_MESSAGES/WebKit.mo" ]
+    outputs = [
+      "$root_out_dir/locale/{{source_name_part}}/LC_MESSAGES/WebKit.mo",
+    ]
     args = [
       "$msgfmt",
       "-o",
-      rebase_path("$root_out_dir/locale/{{source_name_part}}/LC_MESSAGES/WebKit.mo"),
+      rebase_path(
+          "$root_out_dir/locale/{{source_name_part}}/LC_MESSAGES/WebKit.mo"),
       rebase_path("{{source_file_part}}"),
     ]
   }
 
   source_set(target_name) {
-    deps = [ ":$po_target_name" ]
+    deps = [
+      ":$po_target_name",
+    ]
   }
 }
 
@@ -36,8 +41,8 @@ po_translations("locale_efl") {
     "da.po",
     "de_DE.po",
     "el_GR.po",
-    "en_PH.po",
     "en.po",
+    "en_PH.po",
     "en_US.po",
     "es_ES.po",
     "es_MX.po",
@@ -63,9 +68,9 @@ po_translations("locale_efl") {
     "lt.po",
     "lv.po",
     "mk.po",
+    "ml.po",
     "nb.po",
     "nl_NL.po",
-    "ml.po",
     "pl.po",
     "pt_BR.po",
     "pt_PT.po",

diff --git a/tizen_src/ewk/tizen_version_defines_for_apps.gni b/tizen_src/ewk/tizen_version_defines_for_apps.gni
index 650e1b9..d605580 100644 (file)
--- a/tizen_src/ewk/tizen_version_defines_for_apps.gni
+++ b/tizen_src/ewk/tizen_version_defines_for_apps.gni
@@ -7,13 +7,13 @@ import("//tizen_src/build/config/tizen_features.gni")
 defines = []
 
 if (building_for_tizen) {
-    if (chromium_efl_tizen_version == 30) {
-      defines += ["TIZEN_V_3_0=true"]
-    }
-    if (chromium_efl_tizen_version == 24) {
-      defines += ["TIZEN_V_2_4=true"]
-    }
-    if (chromium_efl_tizen_version == 23) {
-      defines += ["TIZEN_V_2_3=true"]
-    }
+  if (chromium_efl_tizen_version == 30) {
+    defines += [ "TIZEN_V_3_0=true" ]
+  }
+  if (chromium_efl_tizen_version == 24) {
+    defines += [ "TIZEN_V_2_4=true" ]
+  }
+  if (chromium_efl_tizen_version == 23) {
+    defines += [ "TIZEN_V_2_3=true" ]
+  }
 }

diff --git a/tizen_src/ewk/ubrowser/BUILD.gn b/tizen_src/ewk/ubrowser/BUILD.gn
index fb1404a..78ba787 100644 (file)
--- a/tizen_src/ewk/ubrowser/BUILD.gn
+++ b/tizen_src/ewk/ubrowser/BUILD.gn
@@ -5,8 +5,12 @@
 import("//tizen_src/build/config/tizen_features.gni")
 
 copy("ubrowser_script") {
-  sources = [ "ubrowser.sh" ]
-  outputs = [ "$root_out_dir/{{source_file_part}}" ]
+  sources = [
+    "ubrowser.sh",
+  ]
+  outputs = [
+    "$root_out_dir/{{source_file_part}}",
+  ]
 }
 
 executable("ubrowser") {
@@ -48,8 +52,8 @@ executable("ubrowser") {
     "main.cc",
     "window.cc",
     "window.h",
-    "window_ui.h",
     "window_ui.cc",
+    "window_ui.h",
   ]
   deps += [ ":ubrowser_script" ]
   cflags = [
@@ -58,7 +62,7 @@ executable("ubrowser") {
     # will be excluded in chromium side (src/build/common.gypi), and GYP
     # processes pattern lists after exclusion lists.
     # (ref: https://gyp.gsrc.io/docs/InputFormatReference.md#Processing-Order)
-    "-Werror"
+    "-Werror",
   ]
   ldflags = []
   libs = []

diff --git a/tizen_src/ewk/unittest/BUILD.gn b/tizen_src/ewk/unittest/BUILD.gn
index bd92e7b..90a3df3 100644 (file)
--- a/tizen_src/ewk/unittest/BUILD.gn
+++ b/tizen_src/ewk/unittest/BUILD.gn
@@ -6,8 +6,12 @@ import("//testing/test.gni")
 import("//tizen_src/build/config/tizen_features.gni")
 
 shared_library("bundle_sample") {
-  sources = [ "resources/ewk_context/injected_bundle/chromium/bundle_sample.cc" ]
-  deps = [ "//v8:v8" ]
+  sources = [
+    "resources/ewk_context/injected_bundle/chromium/bundle_sample.cc",
+  ]
+  deps = [
+    "//v8:v8",
+  ]
   include_dirs = [
     ".",
     "//v8/include/",
@@ -34,13 +38,11 @@ test("ewk_unittests") {
   configs += [ "//tizen_src/build:libelementary" ]
   public_configs += [ "//tizen_src/build:elementary-public" ]
   deps = [
-    "//tizen_src/ewk/efl_integration:chromium-ewk",
-    "//testing/gtest",
     ":bundle_sample",
+    "//testing/gtest",
+    "//tizen_src/ewk/efl_integration:chromium-ewk",
   ]
-  include_dirs = [
-    "../efl_integration/public",
-  ]
+  include_dirs = [ "../efl_integration/public" ]
   sources = [
     "execute_utc_blink.cpp",
     "utc_blink_cb_contextmenu_allowed.cpp",
@@ -234,10 +236,10 @@ test("ewk_unittests") {
     "utc_blink_ewk_security_origin_host_get_func.cpp",
     "utc_blink_ewk_security_origin_port_get_func.cpp",
     "utc_blink_ewk_security_origin_protocol_get_func.cpp",
-    "utc_blink_ewk_settings_autofill_password_form_enabled_get_func.cpp",
-    "utc_blink_ewk_settings_autofill_password_form_enabled_set_func.cpp",
     "utc_blink_ewk_settings_auto_fitting_get_func.cpp",
     "utc_blink_ewk_settings_auto_fitting_set_func.cpp",
+    "utc_blink_ewk_settings_autofill_password_form_enabled_get_func.cpp",
+    "utc_blink_ewk_settings_autofill_password_form_enabled_set_func.cpp",
     "utc_blink_ewk_settings_clear_text_selection_automatically_set_func.cpp",
     "utc_blink_ewk_settings_current_legacy_font_size_mode_set_func.cpp",
     "utc_blink_ewk_settings_default_encoding_set_func.cpp",
@@ -260,12 +262,12 @@ test("ewk_unittests") {
     "utc_blink_ewk_settings_link_effect_enabled_set_func.cpp",
     "utc_blink_ewk_settings_link_magnifier_enabled_get_func.cpp",
     "utc_blink_ewk_settings_link_magnifier_enabled_set_func.cpp",
-    "utc_blink_ewk_settings_private_browsing_enabled_get_func.cpp",
-    "utc_blink_ewk_settings_private_browsing_enabled_set_func.cpp",
     "utc_blink_ewk_settings_load_remote_images_set_func.cpp",
     "utc_blink_ewk_settings_loads_images_automatically_set_func.cpp",
     "utc_blink_ewk_settings_paste_image_uri_mode_set_func.cpp",
     "utc_blink_ewk_settings_plugins_enabled_set_func.cpp",
+    "utc_blink_ewk_settings_private_browsing_enabled_get_func.cpp",
+    "utc_blink_ewk_settings_private_browsing_enabled_set_func.cpp",
     "utc_blink_ewk_settings_scripts_can_open_windows_get_func.cpp",
     "utc_blink_ewk_settings_scripts_can_open_windows_set_func.cpp",
     "utc_blink_ewk_settings_scripts_window_open_get_func.cpp",
@@ -364,9 +366,9 @@ test("ewk_unittests") {
     "utc_blink_ewk_view_url_get_func.cpp",
     "utc_blink_ewk_view_url_request_set_func.cpp",
     "utc_blink_ewk_view_url_set_func.cpp",
+    "utc_blink_ewk_view_use_settings_font_func.cpp",
     "utc_blink_ewk_view_user_agent_get_func.cpp",
     "utc_blink_ewk_view_user_agent_set_func.cpp",
-    "utc_blink_ewk_view_use_settings_font_func.cpp",
     "utc_blink_ewk_view_visibility_set_func.cpp",
     "utc_blink_ewk_view_web_application_capable_get_func.cpp",
     "utc_blink_ewk_view_web_application_icon_url_get_func.cpp",
@@ -376,9 +378,10 @@ test("ewk_unittests") {
   cflags = [ "-glib-2.0" ]
   ldflags = [ "-glib-2.0" ]
   libs = [ "glib-2.0" ]
+
   #TODO : Uncomment it.
   #deps += [ ":libbundle" ]
-  if (building_for_tizen && building_strategy=="ewk") {
+  if (building_for_tizen && building_strategy == "ewk") {
     cflags += [ "-scim" ]
     ldflags += [ "-scim" ]
     libs += [ "scim" ]

diff --git a/tools/perf/BUILD.gn b/tools/perf/BUILD.gn
index bdf043b..7359623 100644 (file)
--- a/tools/perf/BUILD.gn
+++ b/tools/perf/BUILD.gn
@@ -2,37 +2,37 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-if(!is_tizen) {
-group("perf") {
-  testonly = true
-  deps = [
-    "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
-  ]
+if (!is_tizen) {
+  group("perf") {
+    testonly = true
+    deps = [
+      "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
+    ]
 
-  data = [
-    "//tools/perf/",
+    data = [
+      "//tools/perf/",
 
-    # Field trial config
-    "//tools/variations/",
-    "//testing/variations/",
+      # Field trial config
+      "//tools/variations/",
+      "//testing/variations/",
 
-    # Field trial dependencies
-    "//tools/json_comment_eater/",
-    "//tools/json_to_struct/",
+      # Field trial dependencies
+      "//tools/json_comment_eater/",
+      "//tools/json_to_struct/",
 
-    # For blink_perf benchmarks.
-    "//third_party/WebKit/PerformanceTests/",
+      # For blink_perf benchmarks.
+      "//third_party/WebKit/PerformanceTests/",
 
-    # For smoothness.tough_canvas_cases
-    "//chrome/test/data/perf/",
+      # For smoothness.tough_canvas_cases
+      "//chrome/test/data/perf/",
 
-    # For image_decoding.measurement
-    "//chrome/test/data/image_decoding/",
+      # For image_decoding.measurement
+      "//chrome/test/data/image_decoding/",
 
-    # For Pylib used by VR tests
-    "//build/android/pylib/",
-  ]
-}
+      # For Pylib used by VR tests
+      "//build/android/pylib/",
+    ]
+  }
 }
 
 if (is_android) {

diff --git a/tools/perf/chrome_telemetry_build/BUILD.gn b/tools/perf/chrome_telemetry_build/BUILD.gn
index 7b645a2..630a0a9 100644 (file)
--- a/tools/perf/chrome_telemetry_build/BUILD.gn
+++ b/tools/perf/chrome_telemetry_build/BUILD.gn
@@ -8,133 +8,133 @@ if (is_android) {
 }
 
 if (!is_tizen) {
-group("telemetry_chrome_test") {
-  testonly = true
+  group("telemetry_chrome_test") {
+    testonly = true
 
-  if (is_android) {
-    data_deps = [
-      "//chrome/android:chrome_public_apk",
-    ]
+    if (is_android) {
+      data_deps = [
+        "//chrome/android:chrome_public_apk",
+      ]
 
-    if (public_android_sdk) {
-      data_deps += [
-        "//android_webview:system_webview_apk",
-        "//android_webview/tools/system_webview_shell:system_webview_shell_apk",
+      if (public_android_sdk) {
+        data_deps += [
+          "//android_webview:system_webview_apk",
+          "//android_webview/tools/system_webview_shell:system_webview_shell_apk",
+        ]
+      }
+    } else {
+      data_deps = [
+        "//third_party/catapult/telemetry:bitmaptools",
       ]
+
+      data_deps += [ "//chrome" ]
     }
-  } else {
-    data_deps = [
-      "//third_party/catapult/telemetry:bitmaptools",
+
+    data = [
+      "//tools/perf/core/",  # chrome_telemetry_build/ depends on core/
+      "//tools/perf/chrome_telemetry_build/",
+      "//third_party/catapult/",
+      "//components/crash/content/tools/generate_breakpad_symbols.py",
     ]
 
-    data_deps += [ "//chrome" ]
-  }
+    if (is_win) {
+      data_deps += [ "//chrome:reorder_imports" ]
+    }
 
-  data = [
-    "//tools/perf/core/",  # chrome_telemetry_build/ depends on core/
-    "//tools/perf/chrome_telemetry_build/",
-    "//third_party/catapult/",
-    "//components/crash/content/tools/generate_breakpad_symbols.py",
-  ]
+    if (is_linux) {
+      data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
+    }
 
-  if (is_win) {
-    data_deps += [ "//chrome:reorder_imports" ]
-  }
+    if (is_mac) {
+      data_deps += [
+        "//chrome:chrome_framework",
+        "//chrome:chrome_helper_app",
+        "//third_party/breakpad:dump_syms",
+        "//third_party/crashpad/crashpad/tools:crashpad_database_util",
+      ]
+    }
 
-  if (is_linux) {
-    data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
-  }
+    if (is_win && (symbol_level == 1 || symbol_level == 2)) {
+      data_deps += [
+        "//build/win:copy_cdb_to_output",
+        "//third_party/crashpad/crashpad/tools:crashpad_database_util",
+      ]
 
-  if (is_mac) {
-    data_deps += [
-      "//chrome:chrome_framework",
-      "//chrome:chrome_helper_app",
-      "//third_party/breakpad:dump_syms",
-      "//third_party/crashpad/crashpad/tools:crashpad_database_util",
-    ]
+      # TODO(GYP): These should be provided automatically through data_deps.
+      data += [ "$root_out_dir/chrome.exe.pdb" ]
+      if (is_component_build) {
+        data += [
+          "$root_out_dir/base.dll.pdb",
+          "$root_out_dir/blink_platform.dll.pdb",
+          "$root_out_dir/content.dll.pdb",
+        ]
+      } else {
+        data += [ "$root_out_dir/chrome_child.dll.pdb" ]
+      }
+    }
   }
 
-  if (is_win && (symbol_level == 1 || symbol_level == 2)) {
-    data_deps += [
-      "//build/win:copy_cdb_to_output",
-      "//third_party/crashpad/crashpad/tools:crashpad_database_util",
-    ]
+  group("telemetry_chrome_test_experimental") {
+    testonly = true
 
-    # TODO(GYP): These should be provided automatically through data_deps.
-    data += [ "$root_out_dir/chrome.exe.pdb" ]
-    if (is_component_build) {
-      data += [
-        "$root_out_dir/base.dll.pdb",
-        "$root_out_dir/blink_platform.dll.pdb",
-        "$root_out_dir/content.dll.pdb",
+    if (is_android) {
+      data_deps = [
+        "//chrome/android:chrome_public_apk",
       ]
+
+      if (public_android_sdk) {
+        data_deps += [
+          "//android_webview:system_webview_apk",
+          "//android_webview/tools/system_webview_shell:system_webview_shell_apk",
+        ]
+      }
     } else {
-      data += [ "$root_out_dir/chrome_child.dll.pdb" ]
+      data_deps = [
+        "//third_party/catapult/telemetry:bitmaptools",
+      ]
     }
-  }
-}
-
-group("telemetry_chrome_test_experimental") {
-  testonly = true
 
-  if (is_android) {
-    data_deps = [
-      "//chrome/android:chrome_public_apk",
+    data = [
+      "//tools/perf/core/",  # chrome_telemetry_build/ depends on core/
+      "//tools/perf/chrome_telemetry_build/",
+      "//third_party/catapult/",
+      "//components/crash/content/tools/generate_breakpad_symbols.py",
     ]
 
-    if (public_android_sdk) {
-      data_deps += [
-        "//android_webview:system_webview_apk",
-        "//android_webview/tools/system_webview_shell:system_webview_shell_apk",
-      ]
+    if (is_win) {
+      data_deps += [ "//chrome:reorder_imports" ]
     }
-  } else {
-    data_deps = [
-      "//third_party/catapult/telemetry:bitmaptools",
-    ]
-  }
-
-  data = [
-    "//tools/perf/core/",  # chrome_telemetry_build/ depends on core/
-    "//tools/perf/chrome_telemetry_build/",
-    "//third_party/catapult/",
-    "//components/crash/content/tools/generate_breakpad_symbols.py",
-  ]
-
-  if (is_win) {
-    data_deps += [ "//chrome:reorder_imports" ]
-  }
-
-  if (is_linux) {
-    data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
-  }
 
-  if (is_mac) {
-    data_deps += [
-      "//chrome:chrome_framework",
-      "//chrome:chrome_helper_app",
-      "//third_party/breakpad:dump_syms",
-      "//third_party/crashpad/crashpad/tools:crashpad_database_util",
-    ]
-  }
+    if (is_linux) {
+      data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
+    }
 
-  if (is_win && (symbol_level == 1 || symbol_level == 2)) {
-    data_deps += [
-      "//build/win:copy_cdb_to_output",
-      "//third_party/crashpad/crashpad/tools:crashpad_database_util",
-    ]
+    if (is_mac) {
+      data_deps += [
+        "//chrome:chrome_framework",
+        "//chrome:chrome_helper_app",
+        "//third_party/breakpad:dump_syms",
+        "//third_party/crashpad/crashpad/tools:crashpad_database_util",
+      ]
+    }
 
-    # TODO(GYP): These should be provided automatically through data_deps.
-    data += [ "$root_out_dir/chrome.exe.pdb" ]
-    if (is_component_build) {
-      data += [
-        "$root_out_dir/base.dll.pdb",
-        "$root_out_dir/blink_platform.dll.pdb",
-        "$root_out_dir/content.dll.pdb",
+    if (is_win && (symbol_level == 1 || symbol_level == 2)) {
+      data_deps += [
+        "//build/win:copy_cdb_to_output",
+        "//third_party/crashpad/crashpad/tools:crashpad_database_util",
       ]
-    } else {
-      data += [ "$root_out_dir/chrome_child.dll.pdb" ]
+
+      # TODO(GYP): These should be provided automatically through data_deps.
+      data += [ "$root_out_dir/chrome.exe.pdb" ]
+      if (is_component_build) {
+        data += [
+          "$root_out_dir/base.dll.pdb",
+          "$root_out_dir/blink_platform.dll.pdb",
+          "$root_out_dir/content.dll.pdb",
+        ]
+      } else {
+        data += [ "$root_out_dir/chrome_child.dll.pdb" ]
+      }
     }
   }
 }
-}

diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 52b43f1..7e0bd2c 100644 (file)
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -1031,7 +1031,7 @@ test("ui_base_unittests") {
     ]
   }
 
-  if (is_android || is_linux || is_mac || is_win || is_fuchsia  || is_tizen) {
+  if (is_android || is_linux || is_mac || is_win || is_fuchsia || is_tizen) {
     # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak
     # instead of depending directly on the non-test .pak files, but depending
     # on ui_test_pak seems to have no effect.

diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h
index e554c7b..5467366 100644 (file)
--- a/ui/base/clipboard/clipboard.h
+++ b/ui/base/clipboard/clipboard.h
@@ -70,7 +70,8 @@ class UI_BASE_EXPORT Clipboard : public base::ThreadChecker {
 
 #if defined(OS_WIN)
     const FORMATETC& ToFormatEtc() const { return data_; }
-#elif defined(USE_AURA) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(USE_EFL)
+#elif defined(USE_AURA) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
+    defined(USE_EFL)
     const std::string& ToString() const { return data_; }
 #elif defined(OS_MACOSX)
     NSString* ToNSString() const { return data_; }
@@ -96,7 +97,8 @@ class UI_BASE_EXPORT Clipboard : public base::ThreadChecker {
     explicit FormatType(UINT native_format);
     FormatType(UINT native_format, LONG index);
     FORMATETC data_;
-#elif defined(USE_AURA) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(USE_EFL)
+#elif defined(USE_AURA) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
+    defined(USE_EFL)
     explicit FormatType(const std::string& native_format);
     std::string data_;
 #elif defined(OS_MACOSX)

diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
index 191a42b..4471e0a 100644 (file)
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -406,9 +406,9 @@ jumbo_component("gfx") {
   if (is_tizen) {
     set_sources_assignment_filter([])
     sources += [
-      "platform_font_linux.cc",
       "font_fallback_linux.cc",
       "font_render_params_linux.cc",
+      "platform_font_linux.cc",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
   }

diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
index 90c0fa1..8ca3d69 100644 (file)
--- a/ui/gl/BUILD.gn
+++ b/ui/gl/BUILD.gn
@@ -236,7 +236,8 @@ component("gl") {
   }
 
   # TODO(camurcu): Windows/Ozone uses OSMesa for now. Will be updated.
-  if (is_android || is_linux || is_fuchsia || (is_win && use_ozone) || is_tizen) {
+  if (is_android || is_linux || is_fuchsia || (is_win && use_ozone) ||
+      is_tizen) {
     sources += [
       "gl_implementation_osmesa.cc",
       "gl_implementation_osmesa.h",

diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index deb77b3..2b7ec96 100644 (file)
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -496,7 +496,7 @@ jumbo_component("views") {
   if (use_x11) {
     deps += [ "//ui/display/util" ]
   }
-  if (is_linux && !is_chromeos || is_tizen) {
+  if ((is_linux && !is_chromeos) || is_tizen) {
     sources -= [ "window/window_button_order_provider.cc" ]
     deps += [ "//ui/shell_dialogs" ]
   } else {