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

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

Bug: 1018739
Change-Id: Iac07646307622eaf3e6378e3a04205c5086127c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445497
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814430}

chrome/browser/safe_browsing/BUILD.gn

@@ -260,7 +260,6 @@ static_library("safe_browsing") {
         ":advanced_protection",
         "//chrome/common/safe_browsing:archive_analyzer_results",
         "//chrome/common/safe_browsing:binary_feature_extractor",
-        "//chrome/common/safe_browsing:disk_image_type_sniffer_mac",
         "//chrome/common/safe_browsing:download_type_util",
         "//chrome/services/file_util/public/cpp",
         "//components/content_settings/core/browser",
@@ -274,7 +273,9 @@ static_library("safe_browsing") {
         "//content/public/browser",
         "//net",
       ]
-      if (is_win) {
+      if (is_mac) {
+        deps += [ "//chrome/common/safe_browsing:disk_image_type_sniffer_mac" ]
+      } else if (is_win) {
         deps += [ "//chrome/browser/safe_browsing/incident_reporting:state_store_data_proto" ]
       }
     } else if (safe_browsing_mode == 2) {

chrome/common/importer/BUILD.gn

@@ -4,13 +4,6 @@
 
 import("//mojo/public/tools/bindings/mojom.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)
-
 mojom("interfaces") {
   sources = [ "profile_import.mojom" ]
 
@@ -85,15 +78,8 @@ mojom("interfaces") {
 
 source_set("importer") {
   sources = [
-    "edge_importer_utils_win.cc",
-    "edge_importer_utils_win.h",
     "firefox_importer_utils.cc",
     "firefox_importer_utils.h",
-    "firefox_importer_utils_linux.cc",
-    "firefox_importer_utils_mac.mm",
-    "firefox_importer_utils_win.cc",
-    "ie_importer_utils_win.cc",
-    "ie_importer_utils_win.h",
     "imported_bookmark_entry.cc",
     "imported_bookmark_entry.h",
     "importer_autofill_form_data_entry.cc",
@@ -102,8 +88,6 @@ source_set("importer") {
     "importer_bridge.h",
     "importer_data_types.cc",
     "importer_data_types.h",
-    "importer_test_registry_overrider_win.cc",
-    "importer_test_registry_overrider_win.h",
     "importer_type.h",
     "importer_url_row.cc",
     "importer_url_row.h",
@@ -111,6 +95,21 @@ source_set("importer") {
     "safari_importer_utils.h",
     "safari_importer_utils.mm",
   ]
+  if (is_chromeos || is_linux) {
+    sources += [ "firefox_importer_utils_linux.cc" ]
+  } else if (is_mac) {
+    sources += [ "firefox_importer_utils_mac.mm" ]
+  } else if (is_win) {
+    sources += [
+      "edge_importer_utils_win.cc",
+      "edge_importer_utils_win.h",
+      "firefox_importer_utils_win.cc",
+      "ie_importer_utils_win.cc",
+      "ie_importer_utils_win.h",
+      "importer_test_registry_overrider_win.cc",
+      "importer_test_registry_overrider_win.h",
+    ]
+  }
   deps = [
     "//base",
     "//chrome/app:generated_resources",

chrome/common/safe_browsing/BUILD.gn

@@ -6,13 +6,6 @@ import("//chrome/common/features.gni")
 import("//components/safe_browsing/buildflags.gni")
 import("//third_party/protobuf/proto_library.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)
-
 proto_library("proto") {
   sources = [ "crx_info.proto" ]
 }
@@ -83,24 +76,31 @@ if (safe_browsing_mode == 1) {
     public_deps = [ "//components/safe_browsing/core:csd_proto" ]
   }
 
-  source_set("disk_image_type_sniffer_mac") {
-    sources = [
-      "disk_image_type_sniffer_mac.cc",
-      "disk_image_type_sniffer_mac.h",
-    ]
+  if (is_mac) {
+    source_set("disk_image_type_sniffer_mac") {
+      sources = [
+        "disk_image_type_sniffer_mac.cc",
+        "disk_image_type_sniffer_mac.h",
+      ]
 
-    deps = [ "//base" ]
+      deps = [ "//base" ]
+    }
   }
 
   source_set("binary_feature_extractor") {
     sources = [
       "binary_feature_extractor.cc",
       "binary_feature_extractor.h",
-      "binary_feature_extractor_mac.cc",
-      "binary_feature_extractor_win.cc",
-      "mach_o_image_reader_mac.cc",
-      "mach_o_image_reader_mac.h",
     ]
+    if (is_mac) {
+      sources += [
+        "binary_feature_extractor_mac.cc",
+        "mach_o_image_reader_mac.cc",
+        "mach_o_image_reader_mac.h",
+      ]
+    } else if (is_win) {
+      sources += [ "binary_feature_extractor_win.cc" ]
+    }
     if (is_posix) {
       sources += [ "binary_feature_extractor_posix.cc" ]
     }