Clean up deprecated sources assignment filter in //content/common

Remove deprecated_default_sources_assignment_filter and replace
it with explicit is_win, is_mac, etc. sections.

Bug: 1018739
Change-Id: If858a8ff19c757b7fbae59e86005608f5dfa687c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445870Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813740}

content/common/BUILD.gn

@@ -17,13 +17,6 @@ if (is_mac) {
   import("//content/public/app/mac_helpers.gni")
 }
 
-# This file depends on the legacy global sources assignment filter. It should
-# be converted to check target platform before assigning source files to the
-# sources variable. Remove this import and set_sources_assignment_filter call
-# when the file has been converted. See https://crbug.com/1018739 for details.
-import("//build/config/deprecated_default_sources_assignment_filter.gni")
-set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
-
 # For feature flags internal to content. See content/public/common:features
 # for feature flags that clients of contents need to know about.
 buildflag_header("buildflags") {
@@ -48,21 +41,6 @@ source_set("common") {
 
   sources = [
     "all_messages.h",
-    "android/cpu_affinity.cc",
-    "android/cpu_affinity.h",
-    "android/cpu_time_metrics.cc",
-    "android/cpu_time_metrics.h",
-    "android/gin_java_bridge_errors.cc",
-    "android/gin_java_bridge_errors.h",
-    "android/gin_java_bridge_value.cc",
-    "android/gin_java_bridge_value.h",
-    "android/hash_set.cc",
-    "android/hash_set.h",
-    "android/surface_wrapper.cc",
-    "android/surface_wrapper.h",
-    "android/sync_compositor_statics.cc",
-    "android/sync_compositor_statics.h",
-    "android/use_zoom_for_dsf_policy_android.cc",
     "appcache_interfaces.cc",
     "appcache_interfaces.h",
     "ax_serialization_utils.cc",
@@ -74,7 +52,6 @@ source_set("common") {
     "common_param_traits.cc",
     "common_param_traits.h",
     "common_param_traits_macros.h",
-    "common_sandbox_support_linux.cc",
     "content_constants_internal.cc",
     "content_constants_internal.h",
     "content_export.h",
@@ -91,23 +68,17 @@ source_set("common") {
     "content_switches_internal.h",
     "cursors/webcursor.cc",
     "cursors/webcursor.h",
-    "cursors/webcursor_android.cc",
     "cursors/webcursor_aura.cc",
     "cursors/webcursor_aurawin.cc",
-    "cursors/webcursor_mac.mm",
     "cursors/webcursor_ozone.cc",
     "drag_messages.h",
     "fetch/fetch_api_request_proto.cc",
     "fetch/fetch_api_request_proto.h",
     "fetch/fetch_request_type_converters.cc",
     "fetch/fetch_request_type_converters.h",
-    "font_cache_dispatcher_win.cc",
     "font_list.cc",
     "font_list.h",
-    "font_list_android.cc",
     "font_list_fontconfig.cc",
-    "font_list_mac.mm",
-    "font_list_win.cc",
     "frame_delete_intention.h",
     "frame_messages.h",
     "frame_messages_forward.h",
@@ -145,10 +116,6 @@ source_set("common") {
     "input_messages.h",
     "inter_process_time_ticks_converter.cc",
     "inter_process_time_ticks_converter.h",
-    "mac/attributed_string_type_converters.h",
-    "mac/attributed_string_type_converters.mm",
-    "mac/font_loader.h",
-    "mac/font_loader.mm",
     "media/cdm_info.cc",
     "media/media_player_delegate_messages.h",
     "mojo_core_library_support.cc",
@@ -170,9 +137,6 @@ source_set("common") {
     "pepper_renderer_instance_data.h",
     "process_type.cc",
     "resource_messages.h",
-    "sandbox_init_linux.cc",
-    "sandbox_init_mac.cc",
-    "sandbox_init_win.cc",
     "service_manager/service_manager_connection_impl.cc",
     "service_manager/service_manager_connection_impl.h",
     "service_worker/service_worker_loader_helpers.cc",
@@ -303,22 +267,59 @@ source_set("common") {
     "//content/public/common:interfaces",
   ]
 
-  if (is_android && use_seccomp_bpf) {
-    set_sources_assignment_filter([])
+  if (is_android) {
     sources += [
-      "//sandbox/policy/linux/bpf_base_policy_linux.cc",
-      "//sandbox/policy/linux/bpf_base_policy_linux.h",
+      "android/cpu_affinity.cc",
+      "android/cpu_affinity.h",
+      "android/cpu_time_metrics.cc",
+      "android/cpu_time_metrics.h",
+      "android/gin_java_bridge_errors.cc",
+      "android/gin_java_bridge_errors.h",
+      "android/gin_java_bridge_value.cc",
+      "android/gin_java_bridge_value.h",
+      "android/hash_set.cc",
+      "android/hash_set.h",
+      "android/surface_wrapper.cc",
+      "android/surface_wrapper.h",
+      "android/sync_compositor_statics.cc",
+      "android/sync_compositor_statics.h",
+      "android/use_zoom_for_dsf_policy_android.cc",
+      "cursors/webcursor_android.cc",
+      "font_list_android.cc",
     ]
-    set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
+
+    if (use_seccomp_bpf) {
+      sources += [
+        "//sandbox/policy/linux/bpf_base_policy_linux.cc",
+        "//sandbox/policy/linux/bpf_base_policy_linux.h",
+      ]
+    }
   }
 
   if (is_mac) {
+    sources += [
+      "cursors/webcursor_mac.mm",
+      "font_list_mac.mm",
+      "mac/attributed_string_type_converters.h",
+      "mac/attributed_string_type_converters.mm",
+      "mac/font_loader.h",
+      "mac/font_loader.mm",
+      "sandbox_init_mac.cc",
+    ]
     deps += [
       ":mac_helpers",
       "//sandbox/mac:seatbelt",
     ]
   }
 
+  if (is_win) {
+    sources += [
+      "font_cache_dispatcher_win.cc",
+      "font_list_win.cc",
+      "sandbox_init_win.cc",
+    ]
+  }
+
   if (is_android) {
     deps += [
       "//content/public/android:common_aidl",
@@ -347,6 +348,8 @@ source_set("common") {
 
   if (is_linux || is_chromeos) {
     sources += [
+      "common_sandbox_support_linux.cc",
+      "sandbox_init_linux.cc",
       "zygote/sandbox_support_linux.cc",
       "zygote/send_zygote_child_ping_linux.cc",
       "zygote/zygote_commands_linux.h",