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

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

Bug: 1018739
Change-Id: I6c3fe6e56e5ad85ffe02efe806f4a087079f31a2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445778Reviewed-by: Sorin Jianu <sorin@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813658}

chrome/updater/test/test_app/BUILD.gn

@@ -7,13 +7,6 @@ import("//build/util/process_version.gni")
 import("//build/util/version.gni")
 import("//chrome/updater/branding.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)
-
 app_name = "UpdaterTestApp"
 app_bundle_id = "org.chromium.updatertestapp"
 
@@ -58,14 +51,8 @@ source_set("app_sources") {
     "//chrome/updater/app/app.h",
     "test_app.cc",
     "test_app.h",
-    "test_app_mac.mm",
-    "test_app_win.cc",
     "update_client.cc",
     "update_client.h",
-    "update_client_mac.h",
-    "update_client_mac.mm",
-    "update_client_win.cc",
-    "update_client_win.h",
   ]
 
   deps = [
@@ -83,6 +70,9 @@ source_set("app_sources") {
       "//chrome/updater/app/server/mac/service_protocol.mm",
       "//chrome/updater/app/server/mac/update_service_wrappers.h",
       "//chrome/updater/app/server/mac/update_service_wrappers.mm",
+      "test_app_mac.mm",
+      "update_client_mac.h",
+      "update_client_mac.mm",
     ]
 
     deps += [ "//chrome/updater/mac:xpc_names" ]
@@ -91,6 +81,11 @@ source_set("app_sources") {
   }
 
   if (is_win) {
+    sources += [
+      "test_app_win.cc",
+      "update_client_win.cc",
+      "update_client_win.h",
+    ]
     deps += [
       "//chrome/updater/app/server/win:updater_idl_idl",
       "//chrome/updater/win:lib",