Clean up deprecated sources assignment filter in //extensions

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

Bug: 1018739
Change-Id: I574d638fc2c32556fc53cf3d7d00258247cc97b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2443013Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813158}

extensions/browser/BUILD.gn

@@ -5,13 +5,6 @@
 import("//build/config/features.gni")
 import("//extensions/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)
-
 assert(enable_extensions)
 
 group("browser") {
@@ -638,8 +631,6 @@ source_set("unit_tests") {
     "api/file_handlers/directory_util_unittest.cc",
     "api/file_handlers/mime_util_unittest.cc",
     "api/idle/idle_api_unittest.cc",
-    "api/networking_config/networking_config_service_chromeos_unittest.cc",
-    "api/networking_private/networking_private_chromeos_unittest.cc",
     "api/power/power_api_unittest.cc",
     "api/runtime/restart_after_delay_api_unittest.cc",
     "api/socket/mojo_data_pump_unittest.cc",
@@ -768,6 +759,8 @@ source_set("unit_tests") {
       "api/lock_screen_data/lock_screen_value_store_migrator_impl_unittest.cc",
       "api/media_perception_private/conversion_utils_unittest.cc",
       "api/media_perception_private/media_perception_api_manager_unittest.cc",
+      "api/networking_config/networking_config_service_chromeos_unittest.cc",
+      "api/networking_private/networking_private_chromeos_unittest.cc",
       "api/system_power_source/system_power_source_api_unittest.cc",
       "api/virtual_keyboard_private/virtual_keyboard_private_api_unittest.cc",
       "api/webcam_private/visca_webcam_unittest.cc",

extensions/browser/api/system_cpu/BUILD.gn

@@ -4,13 +4,6 @@
 
 import("//extensions/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)
-
 assert(enable_extensions,
        "Cannot depend on extensions because enable_extensions=false.")
 
@@ -18,15 +11,24 @@ source_set("system_cpu") {
   sources = [
     "cpu_info_provider.cc",
     "cpu_info_provider.h",
-    "cpu_info_provider_linux.cc",
-    "cpu_info_provider_mac.cc",
-    "cpu_info_provider_win.cc",
     "system_cpu_api.cc",
     "system_cpu_api.h",
   ]
 
   deps = [ "//extensions/common/api" ]
 
+  if (is_mac) {
+    sources += [ "cpu_info_provider_mac.cc" ]
+  }
+
+  if (is_linux || is_chromeos) {
+    sources += [ "cpu_info_provider_linux.cc" ]
+  }
+
+  if (is_win) {
+    sources += [ "cpu_info_provider_win.cc" ]
+  }
+
   if (is_chromeos) {
     deps += [ "//chromeos/system" ]
   }

extensions/shell/BUILD.gn

@@ -16,13 +16,6 @@ if (is_linux || is_chromeos) {
   import("//build/linux/extract_symbols.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)
-
 assert(enable_extensions)
 
 grit("resources") {
@@ -93,7 +86,6 @@ source_set("app_shell_lib") {
   sources = [
     "app/shell_main_delegate.cc",
     "app/shell_main_delegate.h",
-    "app/shell_main_delegate_mac.mm",
     "browser/api/feedback_private/shell_feedback_private_delegate.cc",
     "browser/api/feedback_private/shell_feedback_private_delegate.h",
     "browser/api/identity/identity_api.cc",
@@ -112,9 +104,6 @@ source_set("app_shell_lib") {
     "browser/shell_app_view_guest_delegate.h",
     "browser/shell_app_window_client.cc",
     "browser/shell_app_window_client.h",
-    "browser/shell_app_window_client_mac.mm",
-    "browser/shell_audio_controller_chromeos.cc",
-    "browser/shell_audio_controller_chromeos.h",
     "browser/shell_browser_context.cc",
     "browser/shell_browser_context.h",
     "browser/shell_browser_context_keyed_service_factories.cc",
@@ -124,8 +113,6 @@ source_set("app_shell_lib") {
     "browser/shell_browser_main_parts.h",
     "browser/shell_content_browser_client.cc",
     "browser/shell_content_browser_client.h",
-    "browser/shell_desktop_controller_mac.h",
-    "browser/shell_desktop_controller_mac.mm",
     "browser/shell_display_info_provider.cc",
     "browser/shell_display_info_provider.h",
     "browser/shell_extension_host_delegate.cc",
@@ -148,12 +135,8 @@ source_set("app_shell_lib") {
     "browser/shell_keep_alive_requester.h",
     "browser/shell_native_app_window.cc",
     "browser/shell_native_app_window.h",
-    "browser/shell_native_app_window_mac.h",
-    "browser/shell_native_app_window_mac.mm",
     "browser/shell_navigation_ui_data.cc",
     "browser/shell_navigation_ui_data.h",
-    "browser/shell_network_controller_chromeos.cc",
-    "browser/shell_network_controller_chromeos.h",
     "browser/shell_prefs.cc",
     "browser/shell_prefs.h",
     "browser/shell_special_storage_policy.cc",
@@ -180,6 +163,26 @@ source_set("app_shell_lib") {
     "renderer/shell_extensions_renderer_client.h",
   ]
 
+  if (is_mac) {
+    sources += [
+      "app/shell_main_delegate_mac.mm",
+      "browser/shell_app_window_client_mac.mm",
+      "browser/shell_desktop_controller_mac.h",
+      "browser/shell_desktop_controller_mac.mm",
+      "browser/shell_native_app_window_mac.h",
+      "browser/shell_native_app_window_mac.mm",
+    ]
+  }
+
+  if (is_chromeos) {
+    sources += [
+      "browser/shell_audio_controller_chromeos.cc",
+      "browser/shell_audio_controller_chromeos.h",
+      "browser/shell_network_controller_chromeos.cc",
+      "browser/shell_network_controller_chromeos.h",
+    ]
+  }
+
   if (use_aura) {
     sources += [
       "browser/root_window_controller.cc",