Clean up deprecated sources assignment filter in //third_party/blink/renderer/core

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

Bug: 1018739
Change-Id: If211f5339a4d621243704a946f06b884bd7e6a70
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2442832Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813155}

third_party/blink/renderer/core/editing/BUILD.gn

@@ -4,13 +4,6 @@
 
 import("//third_party/blink/renderer/core/core.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)
-
 blink_core_sources("editing") {
   sources = [
     "bidi_adjustment.cc",
@@ -316,8 +309,6 @@ blink_core_sources("editing") {
     "state_machines/state_machine_util.h",
     "state_machines/text_segmentation_machine_state.cc",
     "state_machines/text_segmentation_machine_state.h",
-    "substring_util.h",
-    "substring_util.mm",
     "suggestion/text_suggestion_backend_impl.cc",
     "suggestion/text_suggestion_backend_impl.h",
     "suggestion/text_suggestion_controller.cc",
@@ -348,6 +339,8 @@ blink_core_sources("editing") {
     sources += [
       "commands/smart_replace_cf.cc",
       "kill_ring_mac.mm",
+      "substring_util.h",
+      "substring_util.mm",
     ]
   } else {
     sources += [ "kill_ring_none.cc" ]
@@ -435,7 +428,6 @@ source_set("unit_tests") {
     "state_machines/state_machine_test_util.cc",
     "state_machines/state_machine_test_util.h",
     "state_machines/state_machine_util_test.cc",
-    "substring_util_test.mm",
     "suggestion/text_suggestion_controller_test.cc",
     "surrounding_text_test.cc",
     "testing/editing_test_base.cc",
@@ -454,6 +446,10 @@ source_set("unit_tests") {
     "visible_units_word_test.cc",
   ]
 
+  if (is_mac) {
+    sources += [ "substring_util_test.mm" ]
+  }
+
   configs += [
     "//third_party/blink/renderer/core:blink_core_pch",
     "//third_party/blink/renderer:config",

third_party/blink/renderer/core/layout/BUILD.gn

@@ -4,13 +4,6 @@
 
 import("//third_party/blink/renderer/core/core.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)
-
 blink_core_sources("layout") {
   sources = [
     "api/hit_test_action.h",
@@ -228,8 +221,6 @@ blink_core_sources("layout") {
     "layout_theme_default.h",
     "layout_theme_font_provider.cc",
     "layout_theme_font_provider.h",
-    "layout_theme_mac.h",
-    "layout_theme_mac.mm",
     "layout_theme_mobile.cc",
     "layout_theme_mobile.h",
     "layout_tree_as_text.cc",
@@ -637,6 +628,13 @@ blink_core_sources("layout") {
     "view_fragmentation_context.h",
   ]
 
+  if (is_mac) {
+    sources += [
+      "layout_theme_mac.h",
+      "layout_theme_mac.mm",
+    ]
+  }
+
   if (is_win) {
     sources += [
       "layout_theme_font_provider_win.cc",

third_party/blink/renderer/core/scroll/BUILD.gn

@@ -4,13 +4,6 @@
 
 import("//third_party/blink/renderer/core/core.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)
-
 blink_core_sources("scroll") {
   sources = [
     "ns_scroller_imp_details.h",
@@ -18,14 +11,10 @@ blink_core_sources("scroll") {
     "programmatic_scroll_animator.h",
     "scroll_alignment.cc",
     "scroll_alignment.h",
-    "scroll_animator.cc",
-    "scroll_animator.h",
     "scroll_animator_base.cc",
     "scroll_animator_base.h",
     "scroll_animator_compositor_coordinator.cc",
     "scroll_animator_compositor_coordinator.h",
-    "scroll_animator_mac.h",
-    "scroll_animator_mac.mm",
     "scroll_customization.cc",
     "scroll_customization.h",
     "scroll_state_data.h",
@@ -39,9 +28,6 @@ blink_core_sources("scroll") {
     "scrollbar_test_suite.h",
     "scrollbar_theme.cc",
     "scrollbar_theme.h",
-    "scrollbar_theme_android.cc",
-    "scrollbar_theme_mac.h",
-    "scrollbar_theme_mac.mm",
     "scrollbar_theme_overlay.cc",
     "scrollbar_theme_overlay.h",
     "scrollbar_theme_overlay_mobile.cc",
@@ -51,12 +37,23 @@ blink_core_sources("scroll") {
     "smooth_scroll_sequencer.h",
   ]
 
+  if (is_android) {
+    sources += [ "scrollbar_theme_android.cc" ]
+  }
+
   if (is_mac) {
-    sources -= [
+    sources += [
+      "scroll_animator_mac.h",
+      "scroll_animator_mac.mm",
+      "scrollbar_theme_mac.h",
+      "scrollbar_theme_mac.mm",
+      "web_scrollbar_theme.mm",
+    ]
+  } else {
+    sources += [
       "scroll_animator.cc",
       "scroll_animator.h",
     ]
-    sources += [ "web_scrollbar_theme.mm" ]
   }
 
   if (use_aura) {