Clean up deprecated sources assignment filter in //weblayer

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

Bug: 1018739
Change-Id: I3129dd962fb4d4ab5fe4872ee21f0704f94e3f4e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2442831
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813241}

weblayer/BUILD.gn

@@ -28,13 +28,6 @@ if (is_android) {
   import("//v8/gni/v8.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("android_descriptors") {
   sources = [ "browser/android_descriptors.h" ]
   public_deps = [ "//content/public/common:content_descriptors" ]
@@ -200,12 +193,8 @@ source_set("weblayer_lib_base") {
     "browser/http_auth_handler_impl.h",
     "browser/i18n_util.cc",
     "browser/i18n_util.h",
-    "browser/infobar_container_android.cc",
-    "browser/infobar_container_android.h",
     "browser/insecure_form_controller_client.cc",
     "browser/insecure_form_controller_client.h",
-    "browser/javascript_tab_modal_dialog_manager_delegate_android.cc",
-    "browser/javascript_tab_modal_dialog_manager_delegate_android.h",
     "browser/js_communication/web_message_host_factory_wrapper.cc",
     "browser/js_communication/web_message_host_factory_wrapper.h",
     "browser/navigation_controller_impl.cc",
@@ -538,8 +527,12 @@ source_set("weblayer_lib_base") {
       "browser/fullscreen_callback_proxy.h",
       "browser/google_accounts_callback_proxy.cc",
       "browser/google_accounts_callback_proxy.h",
+      "browser/infobar_container_android.cc",
+      "browser/infobar_container_android.h",
       "browser/infobar_service.cc",
       "browser/infobar_service.h",
+      "browser/javascript_tab_modal_dialog_manager_delegate_android.cc",
+      "browser/javascript_tab_modal_dialog_manager_delegate_android.h",
       "browser/js_communication/web_message_host_factory_proxy.cc",
       "browser/js_communication/web_message_host_factory_proxy.h",
       "browser/js_communication/web_message_reply_proxy_impl.cc",

weblayer/shell/BUILD.gn

@@ -14,13 +14,6 @@ if (is_android) {
   import("//build/config/android/config.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("weblayer_shell_lib") {
   testonly = true
   sources = [
@@ -28,11 +21,14 @@ static_library("weblayer_shell_lib") {
     "app/shell_main_params.h",
     "browser/shell.cc",
     "browser/shell.h",
-    "browser/shell_android.cc",
     "common/shell_switches.cc",
     "common/shell_switches.h",
   ]
 
+  if (is_android) {
+    sources += [ "browser/shell_android.cc" ]
+  }
+
   configs += [
     "//build/config:precompiled_headers",