Merge duplicate conditionals in chrome/browser/BUILD.gn.

chrome/browser/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/split_static_library.gni")
 import("//chrome/common/features.gni")
@@ skipping 60 matching lines @@
     "autocomplete/in_memory_url_index_factory.cc",
     "autocomplete/in_memory_url_index_factory.h",
     "autocomplete/shortcuts_backend_factory.cc",
     "autocomplete/shortcuts_backend_factory.h",
     "autocomplete/shortcuts_extensions_manager.cc",
     "autocomplete/shortcuts_extensions_manager.h",
     "autofill/personal_data_manager_factory.cc",
     "autofill/personal_data_manager_factory.h",
     "autofill/risk_util.cc",
     "autofill/risk_util.h",
-    "autofill/validation_rules_storage_factory.cc",
-    "autofill/validation_rules_storage_factory.h",
     "background_sync/background_sync_controller_factory.cc",
     "background_sync/background_sync_controller_factory.h",
     "background_sync/background_sync_controller_impl.cc",
     "background_sync/background_sync_controller_impl.h",
     "background_sync/background_sync_permission_context.cc",
     "background_sync/background_sync_permission_context.h",
     "bad_message.cc",
     "bad_message.h",
     "banners/app_banner_manager.cc",
     "banners/app_banner_manager.h",
@@ skipping 285 matching lines @@
     "geolocation/geolocation_permission_context_android.cc",
     "geolocation/geolocation_permission_context_android.h",
     "geolocation/geolocation_permission_context_extensions.cc",
     "geolocation/geolocation_permission_context_extensions.h",
     "geolocation/geolocation_prefs.cc",
     "geolocation/geolocation_prefs.h",
     "global_keyboard_shortcuts_mac.h",
     "global_keyboard_shortcuts_mac.mm",
     "google/chrome_google_url_tracker_client.cc",
     "google/chrome_google_url_tracker_client.h",
+    "google/did_run_updater_win.cc",
+    "google/did_run_updater_win.h",
     "google/google_brand.cc",
     "google/google_brand.h",
     "google/google_brand_chromeos.cc",
     "google/google_brand_chromeos.h",
     "google/google_update_settings_posix.cc",
     "google/google_update_win.cc",
     "google/google_update_win.h",
     "google/google_url_tracker_factory.cc",
     "google/google_url_tracker_factory.h",
+    "gpu/gpu_driver_info_manager_android.cc",
+    "gpu/gpu_driver_info_manager_android.h",
     "gpu/gpu_feature_checker.cc",
     "gpu/gpu_feature_checker.h",
     "gpu/gpu_mode_manager.cc",
     "gpu/gpu_mode_manager.h",
     "gpu/gpu_profile_cache.h",
     "gpu/three_d_api_observer.cc",
     "gpu/three_d_api_observer.h",
+    "hang_monitor/hang_crash_dump_win.cc",
+    "hang_monitor/hang_crash_dump_win.h",
     "history/chrome_history_backend_client.cc",
     "history/chrome_history_backend_client.h",
     "history/chrome_history_client.cc",
     "history/chrome_history_client.h",
     "history/history_service_factory.cc",
     "history/history_service_factory.h",
     "history/history_tab_helper.cc",
     "history/history_tab_helper.h",
     "history/history_utils.cc",
     "history/history_utils.h",
@@ skipping 101 matching lines @@
     "media/webrtc/media_stream_device_permission_context.cc",
     "media/webrtc/media_stream_device_permission_context.h",
     "media/webrtc/media_stream_device_permissions.cc",
     "media/webrtc/media_stream_device_permissions.h",
     "media/webrtc/media_stream_devices_controller.cc",
     "media/webrtc/media_stream_devices_controller.h",
     "media/webrtc/native_desktop_media_list.cc",
     "media/webrtc/native_desktop_media_list.h",
     "media/webrtc/permission_bubble_media_access_handler.cc",
     "media/webrtc/permission_bubble_media_access_handler.h",
+
+    # TODO(brettw) should this go with the webrtc sources?
+    "media/webrtc/webrtc_log_list.cc",
+    "media/webrtc/webrtc_log_list.h",
     "media/webrtc/window_icon_util.h",
+    "media/webrtc/window_icon_util_chromeos.cc",
+    "media/webrtc/window_icon_util_mac.mm",
+    "media/webrtc/window_icon_util_win.cc",
     "memory_details.cc",
     "memory_details.h",
     "memory_details_android.cc",
     "memory_details_linux.cc",
     "memory_details_mac.cc",
     "memory_details_win.cc",
+    "metrics/antivirus_metrics_provider_win.cc",
+    "metrics/antivirus_metrics_provider_win.h",
     "metrics/chrome_browser_main_extra_parts_metrics.cc",
     "metrics/chrome_browser_main_extra_parts_metrics.h",
     "metrics/chrome_browser_main_extra_parts_metrics_mac.mm",
     "metrics/chrome_metrics_service_accessor.cc",
     "metrics/chrome_metrics_service_accessor.h",
     "metrics/chrome_metrics_service_client.cc",
     "metrics/chrome_metrics_service_client.h",
     "metrics/chrome_metrics_services_manager_client.cc",
     "metrics/chrome_metrics_services_manager_client.h",
     "metrics/chrome_stability_metrics_provider.cc",
@@ skipping 140 matching lines @@
     "page_load_metrics/page_load_metrics_initialize.cc",
     "page_load_metrics/page_load_metrics_initialize.h",
     "page_load_metrics/page_load_metrics_observer.cc",
     "page_load_metrics/page_load_metrics_observer.h",
     "page_load_metrics/page_load_metrics_util.cc",
     "page_load_metrics/page_load_metrics_util.h",
     "password_manager/chrome_password_manager_client.cc",
     "password_manager/chrome_password_manager_client.h",
     "password_manager/password_manager_setting_migrator_service_factory.cc",
     "password_manager/password_manager_setting_migrator_service_factory.h",
+    "password_manager/password_manager_util_mac.h",
+    "password_manager/password_manager_util_mac.mm",
+    "password_manager/password_manager_util_win.cc",
+    "password_manager/password_manager_util_win.h",
     "password_manager/password_store_factory.cc",
     "password_manager/password_store_factory.h",
     "password_manager/password_store_mac.cc",
     "password_manager/password_store_mac.h",
     "password_manager/password_store_mac_internal.h",
     "password_manager/password_store_proxy_mac.cc",
     "password_manager/password_store_proxy_mac.h",
     "password_manager/password_store_win.cc",
     "password_manager/password_store_win.h",
-    "password_manager/password_store_x.cc",
-    "password_manager/password_store_x.h",
     "password_manager/simple_password_store_mac.cc",
     "password_manager/simple_password_store_mac.h",
     "performance_monitor/performance_monitor.cc",
     "performance_monitor/performance_monitor.h",
     "performance_monitor/process_metrics_history.cc",
     "performance_monitor/process_metrics_history.h",
     "permissions/chooser_context_base.cc",
     "permissions/chooser_context_base.h",
     "permissions/delegation_tracker.cc",
     "permissions/delegation_tracker.h",
@@ skipping 312 matching lines @@
     "signin/account_reconcilor_factory.cc",
     "signin/account_reconcilor_factory.h",
     "signin/account_tracker_service_factory.cc",
     "signin/account_tracker_service_factory.h",
     "signin/chrome_signin_client.cc",
     "signin/chrome_signin_client.h",
     "signin/chrome_signin_client_factory.cc",
     "signin/chrome_signin_client_factory.h",
     "signin/chrome_signin_helper.cc",
     "signin/chrome_signin_helper.h",
-    "signin/chrome_signin_status_metrics_provider_delegate.cc",
-    "signin/chrome_signin_status_metrics_provider_delegate.h",
     "signin/gaia_cookie_manager_service_factory.cc",
     "signin/gaia_cookie_manager_service_factory.h",
     "signin/investigator_dependency_provider.cc",
     "signin/investigator_dependency_provider.h",
     "signin/local_auth.cc",
     "signin/local_auth.h",
     "signin/mutable_profile_oauth2_token_service_delegate.cc",
     "signin/mutable_profile_oauth2_token_service_delegate.h",
     "signin/profile_oauth2_token_service_factory.cc",
     "signin/profile_oauth2_token_service_factory.h",
@@ skipping 76 matching lines @@
     "tab_contents/navigation_metrics_recorder.h",
     "tab_contents/origins_seen_service_factory.cc",
     "tab_contents/origins_seen_service_factory.h",
     "tab_contents/retargeting_details.h",
     "tab_contents/tab_util.cc",
     "tab_contents/tab_util.h",
     "task_manager/web_contents_tags.cc",
     "task_manager/web_contents_tags.h",
     "task_profiler/task_profiler_data_serializer.cc",
     "task_profiler/task_profiler_data_serializer.h",
+    "themes/theme_service_win.cc",
+    "themes/theme_service_win.h",
     "thumbnails/content_analysis.cc",
     "thumbnails/content_analysis.h",
     "thumbnails/content_based_thumbnailing_algorithm.cc",
     "thumbnails/content_based_thumbnailing_algorithm.h",
     "thumbnails/simple_thumbnail_crop.cc",
     "thumbnails/simple_thumbnail_crop.h",
     "thumbnails/thumbnail_list_source.cc",
     "thumbnails/thumbnail_list_source.h",
     "thumbnails/thumbnail_service.h",
     "thumbnails/thumbnail_service_factory.cc",
@@ skipping 28 matching lines @@
     "usb/usb_chooser_context_factory.cc",
     "usb/usb_chooser_context_factory.h",
     "usb/usb_tab_helper.cc",
     "usb/usb_tab_helper.h",
     "usb/web_usb_histograms.cc",
     "usb/web_usb_histograms.h",
     "usb/web_usb_permission_provider.cc",
     "usb/web_usb_permission_provider.h",
     "web_data_service_factory.cc",
     "web_data_service_factory.h",
-
-    # TODO(brettw) should this go with the webrtc sources?
-    "media/webrtc/webrtc_log_list.cc",
-    "media/webrtc/webrtc_log_list.h",
     "win/app_icon.cc",
     "win/app_icon.h",
     "win/browser_util.cc",
     "win/browser_util.h",
     "win/chrome_elf_init.cc",
     "win/chrome_elf_init.h",
     "win/chrome_select_file_dialog_factory.cc",
     "win/chrome_select_file_dialog_factory.h",
     "win/enumerate_modules_model.cc",
     "win/enumerate_modules_model.h",
@@ skipping 227 matching lines @@
     "//ui/surface",
     "//ui/web_dialogs",
     "//v8",
   ]
   data_deps = []
 
   if (is_chromeos && use_cras) {
     defines += [ "USE_CRAS" ]
   }
 
-  if (android_java_ui) {
-    sources += [
-      "history/android/android_history_provider_service.cc",
-      "history/android/android_history_provider_service.h",
-      "history/android/android_provider_backend.cc",
-      "history/android/android_provider_backend.h",
-      "history/android/bookmark_model_sql_handler.cc",
-      "history/android/bookmark_model_sql_handler.h",
-      "history/android/sqlite_cursor.cc",
-      "history/android/sqlite_cursor.h",
-      "permissions/grouped_permission_infobar_delegate.cc",
-      "permissions/grouped_permission_infobar_delegate.h",
-      "permissions/permission_update_infobar_delegate_android.cc",
-      "permissions/permission_update_infobar_delegate_android.h",
-      "search_engines/template_url_service_android.cc",
-      "search_engines/template_url_service_android.h",
-      "ssl/security_state_model_android.cc",
-      "ssl/security_state_model_android.h",
-      "sync/glue/synced_tab_delegate_android.cc",
-      "sync/glue/synced_tab_delegate_android.h",
-      "sync/glue/synced_window_delegate_android.cc",
-      "sync/glue/synced_window_delegate_android.h",
-      "sync/glue/synced_window_delegates_getter_android.cc",
-      "sync/glue/synced_window_delegates_getter_android.h",
-      "sync/profile_sync_service_android.cc",
-      "sync/profile_sync_service_android.h",
-      "sync/sync_sessions_metrics_android.cc",
-      "sync/sync_sessions_metrics_android.h",
-    ]
-    if (enable_supervised_users) {
-      sources += [
-        "supervised_user/child_accounts/child_account_feedback_reporter_android.cc",
-        "supervised_user/child_accounts/child_account_feedback_reporter_android.h",
-        "supervised_user/child_accounts/child_account_service_android.cc",
-        "supervised_user/child_accounts/child_account_service_android.h",
-      ]
-    }
-  }
-
   if (toolkit_views) {
     deps += [ "//ui/views" ]
   }
 
   if (is_win || is_mac) {
     # Sources (generally "desktop OS importers") used only on Mac & Windows.
     sources += [
       "crash_upload_list/crash_upload_list_crashpad.cc",
       "crash_upload_list/crash_upload_list_crashpad.h",
       "media_galleries/fileapi/file_path_watcher_util.cc",
@@ skipping 14 matching lines @@
       "media_galleries/fileapi/safe_itunes_pref_parser_win.h",
       "media_galleries/fileapi/safe_picasa_album_table_reader.cc",
       "media_galleries/fileapi/safe_picasa_album_table_reader.h",
       "media_galleries/fileapi/safe_picasa_albums_indexer.cc",
       "media_galleries/fileapi/safe_picasa_albums_indexer.h",
       "recovery/recovery_install_global_error.cc",
       "recovery/recovery_install_global_error.h",
       "recovery/recovery_install_global_error_factory.cc",
       "recovery/recovery_install_global_error_factory.h",
     ]
-  }
-  if (!is_win && !is_mac) {
+  } else {
     sources += [ "net/net_error_diagnostics_dialog_generic.cc" ]
   }
-  if (!is_android && !is_chromeos) {
-    sources += [
-      "net/disk_cache_dir_policy_handler.cc",
-      "net/disk_cache_dir_policy_handler.h",
-    ]
-  }
-  if (is_mac) {
-    sources += [
-      "media/webrtc/window_icon_util_mac.mm",
-      "password_manager/password_manager_util_mac.h",
-      "password_manager/password_manager_util_mac.mm",
-    ]
-    deps += [
-      "//chrome/app_shim",
-      "//chrome/browser/apps/app_shim",
-    ]
-  }
+
   if (enable_extensions) {
     sources += [
       "accessibility/accessibility_extension_api.cc",
       "accessibility/accessibility_extension_api.h",
       "accessibility/animation_policy_prefs.cc",
       "accessibility/animation_policy_prefs.h",
       "autocomplete/keyword_extensions_delegate_impl.cc",
       "autocomplete/keyword_extensions_delegate_impl.h",
       "browsing_data/hosted_apps_counter.cc",
       "browsing_data/hosted_apps_counter.h",
@@ skipping 577 matching lines @@
   }
 
   if (is_chromeos) {
     sources += [
       "download/notification/download_item_notification.cc",
       "download/notification/download_item_notification.h",
       "download/notification/download_notification.cc",
       "download/notification/download_notification.h",
       "download/notification/download_notification_manager.cc",
       "download/notification/download_notification_manager.h",
-      "media/protected_media_identifier_permission_context.cc",
-      "media/protected_media_identifier_permission_context.h",
-      "media/webrtc/window_icon_util_chromeos.cc",
       "metrics/chromeos_metrics_provider.cc",
       "metrics/chromeos_metrics_provider.h",
+      "metrics/leak_detector/leak_detector_controller.cc",
+      "metrics/leak_detector/leak_detector_controller.h",
+      "metrics/leak_detector/leak_detector_remote_controller.cc",
+      "metrics/leak_detector/leak_detector_remote_controller.h",
       "metrics/perf/cpu_identity.cc",
       "metrics/perf/cpu_identity.h",
       "metrics/perf/perf_output.cc",
       "metrics/perf/perf_output.h",
       "metrics/perf/random_selector.cc",
       "metrics/perf/random_selector.h",
       "metrics/perf/windowed_incognito_observer.cc",
       "metrics/perf/windowed_incognito_observer.h",
       "policy/default_geolocation_policy_handler.cc",
       "policy/default_geolocation_policy_handler.h",
 
       # This is technically also dependent on enable_plugins but we don"t
       # support ChromeOS with enable_plugins==0.
       "renderer_host/pepper/pepper_platform_verification_message_filter.cc",
       "renderer_host/pepper/pepper_platform_verification_message_filter.h",
     ]
     deps += [ "//chrome/browser/chromeos" ]
+    public_deps += [
+      "//components/metrics/leak_detector:interfaces",
+      "//components/metrics/leak_detector:leak_detector",
+    ]
   } else {  # Non-ChromeOS.
     sources += [
       "policy/cloud/user_cloud_policy_manager_factory.cc",
       "policy/cloud/user_cloud_policy_manager_factory.h",
       "policy/cloud/user_policy_signin_service_base.cc",
       "policy/cloud/user_policy_signin_service_base.h",
       "policy/cloud/user_policy_signin_service_factory.cc",
       "policy/cloud/user_policy_signin_service_factory.h",
-    ]
-  }
-
-  if (is_chromeos) {
-    sources -= [
       "signin/chrome_signin_status_metrics_provider_delegate.cc",
       "signin/chrome_signin_status_metrics_provider_delegate.h",
     ]
   }
 
-  if (is_chromeos) {
-    sources += [
-      "metrics/leak_detector/leak_detector_controller.cc",
-      "metrics/leak_detector/leak_detector_controller.h",
-      "metrics/leak_detector/leak_detector_remote_controller.cc",
-      "metrics/leak_detector/leak_detector_remote_controller.h",
-    ]
-    public_deps += [
-      "//components/metrics/leak_detector:interfaces",
-      "//components/metrics/leak_detector:leak_detector",
-    ]
-  }
-
   if (use_cups) {
     configs += [ "//printing:cups" ]
   }
+
   if (use_gnome_keyring) {
     sources += [
       "password_manager/native_backend_gnome_x.cc",
       "password_manager/native_backend_gnome_x.h",
     ]
     configs += [ "//components/os_crypt:gnome_keyring" ]
   }
-  if (is_desktop_linux) {
-    sources += [
-      "password_manager/native_backend_libsecret.cc",
-      "password_manager/native_backend_libsecret.h",
-    ]
-    defines += [ "USE_LIBSECRET" ]
-    deps += [ "//third_party/libsecret" ]
-  }
+
   if (use_aura) {
     # Cross-platform Aura files.
     sources += [
       # This file is called _views but has Aura calls in it.
       "download/drag_download_item_views.cc",
       "lifetime/application_lifetime_aura.cc",
       "platform_util_aura.cc",
     ]
 
     # These files are only built in a GN build because they bring in
@@ skipping 33 matching lines @@
       "sync/sync_error_notifier_factory_ash.cc",
       "sync/sync_error_notifier_factory_ash.h",
     ]
     deps += [ "//ash" ]
   }
 
   if (use_x11) {
     sources += [
       "chrome_browser_main_extra_parts_x11.cc",
       "chrome_browser_main_extra_parts_x11.h",
+      "password_manager/password_store_x.cc",
+      "password_manager/password_store_x.h",
     ]
-  } else {
-    sources -= [ "password_manager/password_store_x.cc" ]
   }
   if (use_aura && !use_ozone && is_desktop_linux) {
     deps += [ "//chrome/browser/ui/libgtk2ui" ]
     allow_circular_includes_from += [ "//chrome/browser/ui/libgtk2ui" ]
   }
   if (is_posix && !is_mac) {
     sources += [
       "//chrome/app/chrome_crash_reporter_client.cc",
       "//chrome/app/chrome_crash_reporter_client.h",
     ]
@@ skipping 241 matching lines @@
   if (!is_android && !is_chromeos) {
     sources += [
       "metrics/desktop_engagement/audible_contents_tracker.cc",
       "metrics/desktop_engagement/audible_contents_tracker.h",
       "metrics/desktop_engagement/chrome_visibility_observer.cc",
       "metrics/desktop_engagement/chrome_visibility_observer.h",
       "metrics/desktop_engagement/desktop_engagement_observer.cc",
       "metrics/desktop_engagement/desktop_engagement_observer.h",
       "metrics/desktop_engagement/desktop_engagement_service.cc",
       "metrics/desktop_engagement/desktop_engagement_service.h",
+      "net/disk_cache_dir_policy_handler.cc",
+      "net/disk_cache_dir_policy_handler.h",
       "platform_util.cc",
       "policy/cloud/user_policy_signin_service.cc",
       "policy/cloud/user_policy_signin_service.h",
       "profiles/avatar_menu_actions_desktop.cc",
       "profiles/avatar_menu_actions_desktop.h",
       "profiles/avatar_menu_desktop.cc",
       "profiles/avatar_menu_observer.h",
       "profiles/profile_list_desktop.cc",
       "profiles/profile_list_desktop.h",
       "profiles/profile_statistics.cc",
@@ skipping 12 matching lines @@
       "signin/signin_global_error.h",
       "signin/signin_global_error_factory.cc",
       "signin/signin_global_error_factory.h",
       "sync/sync_global_error.cc",
       "sync/sync_global_error.h",
       "sync/sync_global_error_factory.cc",
       "sync/sync_global_error_factory.h",
       "upgrade_detector_impl.cc",
       "upgrade_detector_impl.h",
     ]
+  } else {
+    sources += [
+      "media/protected_media_identifier_permission_context.cc",
+      "media/protected_media_identifier_permission_context.h",
+    ]
   }
 
   if (is_android) {
     sources += [
       "chrome_browser_field_trials_mobile.cc",
       "chrome_browser_field_trials_mobile.h",
       "policy/cloud/user_policy_signin_service_mobile.cc",
       "policy/cloud/user_policy_signin_service_mobile.h",
     ]
+    deps += [
+      "//components/cdm/browser",
+      "//components/resources:components_resources",
+      "//third_party/android_opengl/etc1",
+      "//third_party/android_tools:cpu_features",
+      "//third_party/libaddressinput:util",
+    ]
+
+    deps -= [
+      "//components/storage_monitor",
+      "//third_party/libaddressinput",
+    ]
+    if (use_seccomp_bpf) {
+      defines += [ "USE_SECCOMP_BPF" ]
+      deps += [ "//sandbox/linux:seccomp_bpf" ]
+    }
   } else {
     # Non-Android.
     sources += [
       "accessibility/invert_bubble_prefs.cc",
       "accessibility/invert_bubble_prefs.h",
+      "autofill/validation_rules_storage_factory.cc",
+      "autofill/validation_rules_storage_factory.h",
       "background/background_contents.cc",
       "background/background_contents.h",
       "banners/app_banner_infobar_delegate_desktop.cc",
       "banners/app_banner_infobar_delegate_desktop.h",
       "banners/app_banner_manager_desktop.cc",
       "banners/app_banner_manager_desktop.h",
       "bookmarks/bookmark_html_writer.cc",
       "bookmarks/bookmark_html_writer.h",
       "certificate_viewer.cc",
       "certificate_viewer.h",
@@ skipping 283 matching lines @@
     ]
   }
 
   if (!is_chrome_branded) {
     sources += [
       "search/local_files_ntp_source.cc",
       "search/local_files_ntp_source.h",
     ]
   }
 
-  if (is_android) {
-    sources += [
-      "gpu/gpu_driver_info_manager_android.cc",
-      "gpu/gpu_driver_info_manager_android.h",
-      "media/protected_media_identifier_permission_context.cc",
-      "media/protected_media_identifier_permission_context.h",
-    ]
-  }
-
   if (android_java_ui) {
     sources += [
       "after_startup_task_utils_android.cc",
       "after_startup_task_utils_android.h",
       "android/accessibility/font_size_prefs_android.cc",
       "android/accessibility/font_size_prefs_android.h",
       "android/accessibility_util.cc",
       "android/accessibility_util.h",
       "android/activity_type_ids.cc",
       "android/activity_type_ids.h",
@@ skipping 355 matching lines @@
       "autofill/android/personal_data_manager_android.cc",
       "autofill/android/personal_data_manager_android.h",
       "dom_distiller/dom_distiller_service_factory_android.cc",
       "dom_distiller/dom_distiller_service_factory_android.h",
       "dom_distiller/tab_utils_android.cc",
       "dom_distiller/tab_utils_android.h",
       "download/download_request_infobar_delegate_android.cc",
       "download/download_request_infobar_delegate_android.h",
       "geolocation/geolocation_infobar_delegate_android.cc",
       "geolocation/geolocation_infobar_delegate_android.h",
+      "history/android/android_history_provider_service.cc",
+      "history/android/android_history_provider_service.h",
+      "history/android/android_provider_backend.cc",
+      "history/android/android_provider_backend.h",
+      "history/android/bookmark_model_sql_handler.cc",
+      "history/android/bookmark_model_sql_handler.h",
+      "history/android/sqlite_cursor.cc",
+      "history/android/sqlite_cursor.h",
       "invalidation/invalidation_service_factory_android.cc",
       "invalidation/invalidation_service_factory_android.h",
       "lifetime/application_lifetime_android.cc",
       "lifetime/application_lifetime_android.h",
       "media/android/cdm/media_drm_credential_manager.cc",
       "media/android/cdm/media_drm_credential_manager.h",
       "media/android/remote/record_cast_action.cc",
       "media/android/remote/record_cast_action.h",
       "media/android/remote/remote_media_player_bridge.cc",
       "media/android/remote/remote_media_player_bridge.h",
@@ skipping 26 matching lines @@
       "password_manager/credential_android.cc",
       "password_manager/credential_android.h",
       "password_manager/generated_password_saved_infobar_delegate_android.cc",
       "password_manager/generated_password_saved_infobar_delegate_android.h",
       "password_manager/password_manager_infobar_delegate_android.cc",
       "password_manager/password_manager_infobar_delegate_android.h",
       "password_manager/save_password_infobar_delegate_android.cc",
       "password_manager/save_password_infobar_delegate_android.h",
       "password_manager/update_password_infobar_delegate_android.cc",
       "password_manager/update_password_infobar_delegate_android.h",
+      "permissions/grouped_permission_infobar_delegate.cc",
+      "permissions/grouped_permission_infobar_delegate.h",
       "permissions/permission_queue_controller.cc",
       "permissions/permission_queue_controller.h",
+      "permissions/permission_update_infobar_delegate_android.cc",
+      "permissions/permission_update_infobar_delegate_android.h",
       "platform_util_android.cc",
       "precache/precache_manager_factory.cc",
       "precache/precache_manager_factory.h",
       "precache/precache_util.cc",
       "precache/precache_util.h",
       "prerender/external_prerender_handler_android.cc",
       "prerender/external_prerender_handler_android.h",
       "profiles/profile_android.cc",
       "profiles/profile_android.h",
       "search/contextual_search_policy_handler_android.cc",
       "search/contextual_search_policy_handler_android.h",
+      "search_engines/template_url_service_android.cc",
+      "search_engines/template_url_service_android.h",
       "signin/oauth2_token_service_delegate_android.cc",
       "signin/oauth2_token_service_delegate_android.h",
+      "ssl/security_state_model_android.cc",
+      "ssl/security_state_model_android.h",
       "ssl/ssl_add_certificate_android.cc",
+      "sync/glue/synced_tab_delegate_android.cc",
+      "sync/glue/synced_tab_delegate_android.h",
+      "sync/glue/synced_window_delegate_android.cc",
+      "sync/glue/synced_window_delegate_android.h",
+      "sync/glue/synced_window_delegates_getter_android.cc",
+      "sync/glue/synced_window_delegates_getter_android.h",
+      "sync/profile_sync_service_android.cc",
+      "sync/profile_sync_service_android.h",
+      "sync/sync_sessions_metrics_android.cc",
+      "sync/sync_sessions_metrics_android.h",
     ]
     deps += [
       ":client_discourse_context_proto",
       ":delta_file_proto",
       ":jni_headers",
       "//blimp/client/public",
       "//chrome/browser/android/webapk:proto",
       "//components/data_usage/android",
       "//components/precache/content",
       "//components/precache/core",
       "//components/resources:components_resources",
       "//components/toolbar",
       "//components/web_contents_delegate_android",
       "//third_party/smhasher:murmurhash2",
     ]
+    if (enable_supervised_users) {
+      sources += [
+        "supervised_user/child_accounts/child_account_feedback_reporter_android.cc",
+        "supervised_user/child_accounts/child_account_feedback_reporter_android.h",
+        "supervised_user/child_accounts/child_account_service_android.cc",
+        "supervised_user/child_accounts/child_account_service_android.h",
+      ]
+    }
   }
 
   if (enable_vr_shell && android_java_ui) {
     defines += [ "ENABLE_VR_SHELL" ]
     deps += [ "android/vr_shell:vr_shell" ]
     configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
   }
 
-  if (is_android) {
-    deps += [
-      "//components/cdm/browser",
-      "//components/resources:components_resources",
-      "//third_party/android_opengl/etc1",
-      "//third_party/android_tools:cpu_features",
-      "//third_party/libaddressinput:util",
-    ]
-
-    deps -= [
-      "//components/storage_monitor",
-      "//third_party/libaddressinput",
-    ]
-
-    if (use_seccomp_bpf) {
-      defines += [ "USE_SECCOMP_BPF" ]
-      deps += [ "//sandbox/linux:seccomp_bpf" ]
-    }
-  }
-
   if (is_mac) {
     deps += [
+      "//chrome/app_shim",
+      "//chrome/browser/apps/app_shim",
       "//third_party/google_toolbox_for_mac",
       "//third_party/mozilla",
     ]
     libs += [
       "Accelerate.framework",
       "AddressBook.framework",
       "AudioUnit.framework",
       "DiskArbitration.framework",
       "IOKit.framework",
       "ImageCaptureCore.framework",
       "OpenGL.framework",
       "QuartzCore.framework",
       "SecurityInterface.framework",
     ]
   }
 
   if (enable_rlz) {
     deps += [ ":rlz" ]
   }
 
   if (is_win) {
     sources += [
       "downgrade/user_data_downgrade.cc",
       "downgrade/user_data_downgrade.h",
       "first_run/try_chrome_dialog_view.cc",
       "first_run/try_chrome_dialog_view.h",
       "first_run/upgrade_util.cc",
-      "google/did_run_updater_win.cc",
-      "google/did_run_updater_win.h",
-      "hang_monitor/hang_crash_dump_win.cc",
-      "hang_monitor/hang_crash_dump_win.h",
-      "media/webrtc/window_icon_util_win.cc",
-      "metrics/antivirus_metrics_provider_win.cc",
-      "metrics/antivirus_metrics_provider_win.h",
-      "password_manager/password_manager_util_win.cc",
-      "password_manager/password_manager_util_win.h",
-      "themes/theme_service_win.cc",
-      "themes/theme_service_win.h",
     ]
     public_deps += [
       "//ui/views",
       "//ui/views/controls/webview",
     ]
     deps += [
       ":chrome_process_finder",
       "//chrome:file_pre_reader",
       "//chrome/chrome_watcher:client",
       "//chrome/common:metrics_constants_util_win",
@@ skipping 58 matching lines @@
     # Desktop linux, doesn"t count ChromeOS.
     sources += [
       "first_run/upgrade_util.cc",
       "first_run/upgrade_util_linux.cc",
       "first_run/upgrade_util_linux.h",
       "fullscreen_aurax11.cc",
       "icon_loader_auralinux.cc",
       "media/webrtc/window_icon_util_x11.cc",
       "password_manager/native_backend_kwallet_x.cc",
       "password_manager/native_backend_kwallet_x.h",
+      "password_manager/native_backend_libsecret.cc",
+      "password_manager/native_backend_libsecret.h",
       "platform_util_linux.cc",
       "shell_integration_linux.cc",
       "shell_integration_linux.h",
       "speech/tts_linux.cc",
       "themes/theme_service_aurax11.cc",
       "themes/theme_service_aurax11.h",
       "web_applications/web_app_linux.cc",
     ]
+    defines += [ "USE_LIBSECRET" ]
+    deps += [ "//third_party/libsecret" ]
   }
+
   if (enable_plugin_installation) {
     sources += [
       "plugins/plugin_installer.cc",
       "plugins/plugin_installer.h",
       "plugins/plugin_installer_observer.cc",
       "plugins/plugin_installer_observer.h",
       "plugins/plugins_resource_service.cc",
       "plugins/plugins_resource_service.h",
     ]
   }
+
   if (enable_app_list) {
     deps += [ "//ui/app_list" ]
   }
+
   if (enable_supervised_users) {
     sources += [
       "content_settings/content_settings_supervised_provider.cc",
       "content_settings/content_settings_supervised_provider.h",
       "supervised_user/child_accounts/child_account_service.cc",
       "supervised_user/child_accounts/child_account_service.h",
       "supervised_user/child_accounts/child_account_service_factory.cc",
       "supervised_user/child_accounts/child_account_service_factory.h",
       "supervised_user/child_accounts/family_info_fetcher.cc",
       "supervised_user/child_accounts/family_info_fetcher.h",
@@ skipping 156 matching lines @@
   if (enable_mdns) {
     sources += [
       "local_discovery/service_discovery_client_impl.cc",
       "local_discovery/service_discovery_client_impl.h",
       "local_discovery/service_discovery_client_mdns.cc",
       "local_discovery/service_discovery_client_mdns.h",
       "printing/cloud_print/privet_traffic_detector.cc",
       "printing/cloud_print/privet_traffic_detector.h",
     ]
   }
-  if (is_android) {
-    sources -= [
-      "autofill/validation_rules_storage_factory.cc",
-      "autofill/validation_rules_storage_factory.h",
-    ]
-  }
+
   if (enable_media_router) {
     deps += [ "//chrome/browser/media/router" ]
   }
 
   if (enable_mojo_media) {
     configs += [ "//media/mojo/services:mojo_media_config" ]
     sources += [
       "media/output_protection_impl.cc",
       "media/output_protection_impl.h",
     ]
@@ skipping 575 matching lines @@
   # linking all of the test support.
   static_library("pepper_cdm_test_constants") {
     testonly = true
     visibility = [ "//chrome/*" ]
     sources = [
       "media/pepper_cdm_test_constants.cc",
       "media/pepper_cdm_test_constants.h",
     ]
   }
 }