Remove link_chrome_on_windows GN flag.

This flag was used to disable linking when the bots were too behind. It's not needed any more.

Review URL: https://codereview.chromium.org/974543002

Cr-Commit-Position: refs/heads/master@{#318795}

1 files changed, 34 insertions, 36 deletions

diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index ed4cd13..7db48e0 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -352,48 +352,46 @@ test("ash_unittests") {
   }
 }
 
-if (!is_win || link_chrome_on_windows) {
-  executable("ash_shell") {
-    testonly = true
-    sources = [
-      "shell/shell_main.cc",
-    ]
+executable("ash_shell") {
+  testonly = true
+  sources = [
+    "shell/shell_main.cc",
+  ]
 
-    deps = [
-      ":ash_shell_lib",
-      "//components/user_manager",
-    ]
+  deps = [
+    ":ash_shell_lib",
+    "//components/user_manager",
+  ]
 
-    if (is_win) {
-      configs -= [ "//build/config/win:console" ]
-      configs += [ "//build/config/win:windowed" ]
-      deps += [ "//sandbox" ]
-    }
+  if (is_win) {
+    configs -= [ "//build/config/win:console" ]
+    configs += [ "//build/config/win:windowed" ]
+    deps += [ "//sandbox" ]
+  }
 
-    if (is_chromeos) {
-      deps += [ "//device/bluetooth" ]
-    }
+  if (is_chromeos) {
+    deps += [ "//device/bluetooth" ]
   }
+}
 
-  test("ash_shell_unittests") {
-    sources = [
-      "shell/window_watcher_unittest.cc",
-      "test/ash_unittests.cc",
-    ]
+test("ash_shell_unittests") {
+  sources = [
+    "shell/window_watcher_unittest.cc",
+    "test/ash_unittests.cc",
+  ]
 
-    deps = [
-      ":ash_shell_lib",
-      ":test_support",
-      "//base/test:test_support",
-      "//components/user_manager",
-      "//content/test:test_support",
-      "//skia",
-      "//testing/gtest",
-      "//ui/accessibility",
-    ]
+  deps = [
+    ":ash_shell_lib",
+    ":test_support",
+    "//base/test:test_support",
+    "//components/user_manager",
+    "//content/test:test_support",
+    "//skia",
+    "//testing/gtest",
+    "//ui/accessibility",
+  ]
 
-    if (is_chromeos) {
-      deps += [ "//ui/display" ]
-    }
+  if (is_chromeos) {
+    deps += [ "//ui/display" ]
   }
 }