Clean up deprecated sources assignment filter in //chrome/browser

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

Bug: 1018739
Change-Id: I3fd2472d406d5feda55646c3a119014db8912b19
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445615
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814311}

chrome/browser/apps/platform_apps/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)
 
 source_set("platform_apps") {
@@ -29,8 +22,6 @@ source_set("platform_apps") {
     "browser_context_keyed_service_factories.h",
     "chrome_apps_browser_api_provider.cc",
     "chrome_apps_browser_api_provider.h",
-    "extension_app_shim_manager_delegate_mac.cc",
-    "extension_app_shim_manager_delegate_mac.h",
     "install_chrome_app.cc",
     "install_chrome_app.h",
     "platform_app_launch.cc",
@@ -43,6 +34,13 @@ source_set("platform_apps") {
     "shortcut_manager_factory.h",
   ]
 
+  if (is_mac) {
+    sources += [
+      "extension_app_shim_manager_delegate_mac.cc",
+      "extension_app_shim_manager_delegate_mac.h",
+    ]
+  }
+
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
   public_deps = [

chrome/browser/apps/platform_apps/api/music_manager_private/BUILD.gn

@@ -6,23 +6,12 @@ import("//build/config/features.gni")
 import("//extensions/buildflags/buildflags.gni")
 import("//rlz/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)
 
 source_set("music_manager_private") {
   sources = [
     "device_id.cc",
     "device_id.h",
-    "device_id_chromeos.cc",
-    "device_id_linux.cc",
-    "device_id_mac.cc",
-    "device_id_win.cc",
     "music_manager_private_api.cc",
     "music_manager_private_api.h",
   ]
@@ -42,8 +31,16 @@ source_set("music_manager_private") {
   }
 
   if (is_chromeos) {
-    sources -= [ "device_id_linux.cc" ]
+    sources += [ "device_id_chromeos.cc" ]
+  } else if (is_linux) {
+    sources += [ "device_id_linux.cc" ]
+  } else if (is_mac) {
+    sources += [ "device_id_mac.cc" ]
+  } else if (is_win) {
+    sources += [ "device_id_win.cc" ]
+  }
 
+  if (is_chromeos) {
     deps += [ "//chromeos/cryptohome" ]
   }
 

chrome/browser/media/router/BUILD.gn

@@ -7,13 +7,6 @@ import("//extensions/buildflags/buildflags.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.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)
-
 static_library("router") {
   deps = [
     "//base",
@@ -75,8 +68,6 @@ static_library("router") {
       "event_page_request_manager.h",
       "event_page_request_manager_factory.cc",
       "event_page_request_manager_factory.h",
-      "mojo/media_route_provider_util_win.cc",
-      "mojo/media_route_provider_util_win.h",
       "mojo/media_router_desktop.cc",
       "mojo/media_router_desktop.h",
       "mojo/media_router_mojo_impl.cc",
@@ -134,6 +125,13 @@ static_library("router") {
       "providers/wired_display/wired_display_presentation_receiver_factory.h",
     ]
 
+    if (is_win) {
+      sources += [
+        "mojo/media_route_provider_util_win.cc",
+        "mojo/media_route_provider_util_win.h",
+      ]
+    }
+
     if (enable_openscreen) {
       sources += [
         "providers/openscreen/discovery/open_screen_listener.cc",

chrome/browser/policy/BUILD.gn

@@ -4,20 +4,16 @@
 
 import("//build/config/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)
-
 source_set("path_parser") {
-  sources = [
-    "policy_path_parser.h",
-    "policy_path_parser_linux.cc",
-    "policy_path_parser_mac.mm",
-    "policy_path_parser_win.cc",
-  ]
+  sources = [ "policy_path_parser.h" ]
+
+  if (is_chromeos || is_linux) {
+    sources += [ "policy_path_parser_linux.cc" ]
+  } else if (is_mac) {
+    sources += [ "policy_path_parser_mac.mm" ]
+  } else if (is_win) {
+    sources += [ "policy_path_parser_win.cc" ]
+  }
 
   deps = [
     "//base",
@@ -25,13 +21,13 @@ source_set("path_parser") {
     "//components/policy:generated",
   ]
 
-  if (is_win) {
+  if (is_mac) {
+    deps += [ "//build:branding_buildflags" ]
+  } else if (is_win) {
     deps += [ "//chrome/install_static:install_static_util" ]
-
-    libs = [ "wtsapi32.lib" ]
   }
 
-  if (is_mac) {
-    deps += [ "//build:branding_buildflags" ]
+  if (is_win) {
+    libs = [ "wtsapi32.lib" ]
   }
 }

chrome/browser/safe_browsing/BUILD.gn

@@ -5,13 +5,6 @@
 import("//components/safe_browsing/buildflags.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)
-
 static_library("safe_browsing") {
   sources = [
     "chrome_controller_client.cc",
@@ -66,9 +59,13 @@ static_library("safe_browsing") {
       "settings_reset_prompt/settings_reset_prompt_model.h",
       "settings_reset_prompt/settings_reset_prompt_prefs_manager.cc",
       "settings_reset_prompt/settings_reset_prompt_prefs_manager.h",
-      "settings_reset_prompt/settings_reset_prompt_util_win.cc",
-      "settings_reset_prompt/settings_reset_prompt_util_win.h",
     ]
+    if (is_win) {
+      sources += [
+        "settings_reset_prompt/settings_reset_prompt_util_win.cc",
+        "settings_reset_prompt/settings_reset_prompt_util_win.h",
+      ]
+    }
     deps += [ "//extensions/browser" ]
   }
 
@@ -198,10 +195,6 @@ static_library("safe_browsing") {
         "download_protection/two_phase_uploader.h",
         "incident_reporting/binary_integrity_analyzer.cc",
         "incident_reporting/binary_integrity_analyzer.h",
-        "incident_reporting/binary_integrity_analyzer_mac.cc",
-        "incident_reporting/binary_integrity_analyzer_mac.h",
-        "incident_reporting/binary_integrity_analyzer_win.cc",
-        "incident_reporting/binary_integrity_analyzer_win.h",
         "incident_reporting/binary_integrity_incident.cc",
         "incident_reporting/binary_integrity_incident.h",
         "incident_reporting/delayed_analysis_callback.h",
@@ -211,8 +204,6 @@ static_library("safe_browsing") {
         "incident_reporting/download_metadata_manager.h",
         "incident_reporting/environment_data_collection.cc",
         "incident_reporting/environment_data_collection.h",
-        "incident_reporting/environment_data_collection_win.cc",
-        "incident_reporting/environment_data_collection_win.h",
         "incident_reporting/extension_data_collection.cc",
         "incident_reporting/extension_data_collection.h",
         "incident_reporting/incident.cc",
@@ -228,11 +219,8 @@ static_library("safe_browsing") {
         "incident_reporting/incident_reporting_service.h",
         "incident_reporting/last_download_finder.cc",
         "incident_reporting/last_download_finder.h",
-        "incident_reporting/module_integrity_verifier_win.cc",
-        "incident_reporting/module_integrity_verifier_win.h",
         "incident_reporting/platform_state_store.cc",
         "incident_reporting/platform_state_store.h",
-        "incident_reporting/platform_state_store_win.cc",
         "incident_reporting/preference_validation_delegate.cc",
         "incident_reporting/preference_validation_delegate.h",
         "incident_reporting/resource_request_detector.cc",
@@ -245,9 +233,25 @@ static_library("safe_browsing") {
         "incident_reporting/tracked_preference_incident.h",
         "services_delegate_desktop.cc",
         "services_delegate_desktop.h",
-        "signature_evaluator_mac.h",
-        "signature_evaluator_mac.mm",
       ]
+      if (is_mac) {
+        sources += [
+          "incident_reporting/binary_integrity_analyzer_mac.cc",
+          "incident_reporting/binary_integrity_analyzer_mac.h",
+          "signature_evaluator_mac.h",
+          "signature_evaluator_mac.mm",
+        ]
+      } else if (is_win) {
+        sources += [
+          "incident_reporting/binary_integrity_analyzer_win.cc",
+          "incident_reporting/binary_integrity_analyzer_win.h",
+          "incident_reporting/environment_data_collection_win.cc",
+          "incident_reporting/environment_data_collection_win.h",
+          "incident_reporting/module_integrity_verifier_win.cc",
+          "incident_reporting/module_integrity_verifier_win.h",
+          "incident_reporting/platform_state_store_win.cc",
+        ]
+      }
       public_deps += [
         ":chrome_enterprise_url_lookup_service",
         ":chrome_enterprise_url_lookup_service_factory",
@@ -274,12 +278,14 @@ static_library("safe_browsing") {
         deps += [ "//chrome/browser/safe_browsing/incident_reporting:state_store_data_proto" ]
       }
     } else if (safe_browsing_mode == 2) {
-      sources += [
-        "android/services_delegate_android.cc",
-        "android/services_delegate_android.h",
-        "telemetry/android/android_telemetry_service.cc",
-        "telemetry/android/android_telemetry_service.h",
-      ]
+      if (is_android) {
+        sources += [
+          "android/services_delegate_android.cc",
+          "android/services_delegate_android.h",
+          "telemetry/android/android_telemetry_service.cc",
+          "telemetry/android/android_telemetry_service.h",
+        ]
+      }
       deps += [
         "//chrome/browser/safe_browsing/android",
         "//components/safe_browsing:buildflags",

chrome/browser/web_applications/extensions/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)
 
 source_set("extensions") {
@@ -34,9 +27,13 @@ source_set("extensions") {
     "extension_status_utils.cc",
     "web_app_extension_shortcut.cc",
     "web_app_extension_shortcut.h",
-    "web_app_extension_shortcut_mac.h",
-    "web_app_extension_shortcut_mac.mm",
   ]
+  if (is_mac) {
+    sources += [
+      "web_app_extension_shortcut_mac.h",
+      "web_app_extension_shortcut_mac.mm",
+    ]
+  }
 
   deps = [
     "//base",