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

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

Bug: 1018739
Change-Id: Icfb9b5aa57f7a5232fbf41534f25c4ea1d54034c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445473Reviewed-by: Nasko Oskov <nasko@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814162}

content/public/app/BUILD.gn

@@ -26,22 +26,18 @@ import("//chromeos/assistant/assistant.gni")
 import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
 import("//ui/base/ui_features.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)
-
 public_app_shared_sources = [
   "content_jni_onload.h",
   "content_main.h",
   "content_main_delegate.cc",
   "content_main_delegate.h",
   "content_main_runner.h",
-  "sandbox_helper_win.h",
 ]
 
+if (is_win) {
+  public_app_shared_sources += [ "sandbox_helper_win.h" ]
+}
+
 public_app_shared_deps = [
   "//base",
   "//base:i18n",

content/public/browser/BUILD.gn

@@ -12,13 +12,6 @@ if (is_android) {
   import("//build/config/android/rules.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)
-
 # See //content/BUILD.gn for how this works.
 group("browser") {
   if (is_component_build) {
@@ -35,20 +28,6 @@ source_set("browser_sources") {
     "accessibility_tree_formatter.h",
     "allow_service_worker_result.cc",
     "allow_service_worker_result.h",
-    "android/android_overlay_provider.h",
-    "android/app_web_message_port.h",
-    "android/child_process_importance.h",
-    "android/compositor.h",
-    "android/compositor_client.h",
-    "android/devtools_auth.h",
-    "android/gpu_video_accelerator_factories_provider.h",
-    "android/java_interfaces.h",
-    "android/media_url_interceptor_register.cc",
-    "android/media_url_interceptor_register.h",
-    "android/motion_event_action.h",
-    "android/synchronous_compositor.cc",
-    "android/synchronous_compositor.h",
-    "android/synchronous_compositor_client.h",
     "appcache_service.cc",
     "appcache_service.h",
     "audio_loopback_stream_creator.cc",
@@ -226,9 +205,6 @@ source_set("browser_sources") {
     "mhtml_extra_parts.h",
     "mhtml_generation_result.cc",
     "mhtml_generation_result.h",
-    "native_event_processor_mac.h",
-    "native_event_processor_observer_mac.h",
-    "native_event_processor_observer_mac.mm",
     "native_file_system_entry_factory.h",
     "native_file_system_permission_context.h",
     "native_file_system_permission_grant.cc",
@@ -508,7 +484,23 @@ source_set("browser_sources") {
 
   if (is_android) {
     deps += [ "//ui/android" ]
-    sources += [ "tts_environment_android.h" ]
+    sources += [
+      "android/android_overlay_provider.h",
+      "android/app_web_message_port.h",
+      "android/child_process_importance.h",
+      "android/compositor.h",
+      "android/compositor_client.h",
+      "android/devtools_auth.h",
+      "android/gpu_video_accelerator_factories_provider.h",
+      "android/java_interfaces.h",
+      "android/media_url_interceptor_register.cc",
+      "android/media_url_interceptor_register.h",
+      "android/motion_event_action.h",
+      "android/synchronous_compositor.cc",
+      "android/synchronous_compositor.h",
+      "android/synchronous_compositor_client.h",
+      "tts_environment_android.h",
+    ]
   }
 
   if (use_aura || is_mac) {
@@ -516,7 +508,12 @@ source_set("browser_sources") {
   }
 
   if (is_mac) {
-    sources += [ "remote_cocoa.h" ]
+    sources += [
+      "native_event_processor_mac.h",
+      "native_event_processor_observer_mac.h",
+      "native_event_processor_observer_mac.mm",
+      "remote_cocoa.h",
+    ]
   }
 
   if (is_linux || is_chromeos) {

content/public/child/BUILD.gn

@@ -4,13 +4,6 @@
 
 import("//ppapi/buildflags/buildflags.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)
-
 # See //content/BUILD.gn for how this works.
 group("child") {
   if (is_component_build) {
@@ -32,10 +25,13 @@ source_set("child_sources") {
 
   sources = [
     "child_thread.h",
-    "dwrite_font_proxy_init_win.h",
     "image_decoder_utils.h",
   ]
 
+  if (is_win) {
+    sources += [ "dwrite_font_proxy_init_win.h" ]
+  }
+
   configs += [
     "//build/config/compiler:wexit_time_destructors",
     "//content:content_implementation",

content/public/common/BUILD.gn

@@ -12,13 +12,6 @@ import("//mojo/public/tools/bindings/mojom.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//third_party/webrtc/webrtc.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)
-
 # See //content/BUILD.gn for how this works.
 group("common") {
   if (is_component_build) {
@@ -102,7 +95,6 @@ source_set("common_sources") {
     "common_param_traits.cc",
     "common_param_traits.h",
     "common_param_traits_macros.h",
-    "common_sandbox_support_linux.h",
     "console_message_level.h",
     "content_client.cc",
     "content_client.h",
@@ -119,13 +111,10 @@ source_set("common_sources") {
     "content_switches.h",
     "drop_data.cc",
     "drop_data.h",
-    "font_cache_dispatcher_win.h",
     "frame_navigate_params.cc",
     "frame_navigate_params.h",
     "impression.cc",
     "impression.h",
-    "injection_test_mac.h",
-    "injection_test_win.h",
     "input_event_ack_state.h",
     "isolated_world_ids.h",
     "javascript_dialog_type.h",
@@ -155,8 +144,6 @@ source_set("common_sources") {
     "referrer_type_converters.cc",
     "referrer_type_converters.h",
     "resource_intercept_policy.h",
-    "resource_request_body_android.cc",
-    "resource_request_body_android.h",
     "resource_usage_reporter_type_converters.cc",
     "resource_usage_reporter_type_converters.h",
     "result_codes.h",
@@ -183,6 +170,28 @@ source_set("common_sources") {
     "widget_type.h",
   ]
 
+  if (is_win) {
+    sources += [
+      "font_cache_dispatcher_win.h",
+      "injection_test_win.h",
+    ]
+  }
+
+  if (is_android) {
+    sources += [
+      "resource_request_body_android.cc",
+      "resource_request_body_android.h",
+    ]
+  }
+
+  if (is_linux || is_chromeos) {
+    sources += [ "common_sandbox_support_linux.h" ]
+  }
+
+  if (is_mac) {
+    sources += [ "injection_test_mac.h" ]
+  }
+
   configs += [
     "//build/config:precompiled_headers",
     "//content:content_implementation",

content/public/renderer/BUILD.gn

@@ -6,13 +6,6 @@ import("//build/config/features.gni")
 import("//media/media_options.gni")
 import("//ppapi/buildflags/buildflags.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)
-
 # See //content/BUILD.gn for how this works.
 group("renderer") {
   if (is_component_build) {
@@ -61,7 +54,6 @@ target(link_target_type, "renderer_sources") {
     "renderer_ppapi_host.h",
     "request_peer.h",
     "resource_dispatcher_delegate.h",
-    "seccomp_sandbox_status_android.h",
     "url_loader_throttle_provider.h",
     "v8_value_converter.h",
     "video_encode_accelerator.cc",
@@ -104,6 +96,8 @@ target(link_target_type, "renderer_sources") {
   ]
 
   if (is_android) {
+    sources += [ "seccomp_sandbox_status_android.h" ]
+
     # For seccomp_sandbox_status_android.h.
     deps += [ "//sandbox" ]
   }