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}

ash/BUILD.gn

@@ -352,8 +352,7 @@ test("ash_unittests") {
   }
 }
 
-if (!is_win || link_chrome_on_windows) {
-  executable("ash_shell") {
+executable("ash_shell") {
   testonly = true
   sources = [
     "shell/shell_main.cc",
@@ -373,9 +372,9 @@ if (!is_win || link_chrome_on_windows) {
   if (is_chromeos) {
     deps += [ "//device/bluetooth" ]
   }
-  }
+}
 
-  test("ash_shell_unittests") {
+test("ash_shell_unittests") {
   sources = [
     "shell/window_watcher_unittest.cc",
     "test/ash_unittests.cc",
@@ -395,5 +394,4 @@ if (!is_win || link_chrome_on_windows) {
   if (is_chromeos) {
     deps += [ "//ui/display" ]
   }
-  }
 }

build/config/BUILDCONFIG.gn

@@ -113,11 +113,6 @@ declare_args() {
     # toolchains.
     cros_use_custom_toolchain = false
   }
-
-  # TODO(brettw) remove this flag (and therefore enable linking all targets) on
-  # Windows when we have sufficient bot capacity. In the meantime, you can
-  # enable linking for local compiles.
-  link_chrome_on_windows = true
 }
 
 # TODO(dpranke): Remove these asserts when os and cpu_arch are removed.

cc/BUILD.gn

@@ -731,8 +731,7 @@ source_set("test_support") {
   }
 }
 
-if (!is_win || link_chrome_on_windows) {
-  test("cc_unittests") {
+test("cc_unittests") {
   sources = [
     "animation/animation_unittest.cc",
     "animation/keyframed_animation_curve_unittest.cc",
@@ -886,7 +885,6 @@ if (!is_win || link_chrome_on_windows) {
     "//ui/gfx:test_support",
     "//ui/gl",
   ]
-  }
 }
 
 test("cc_perftests") {

cc/blink/BUILD.gn

@@ -72,7 +72,7 @@ component("blink") {
 
 # GYP version: //cc/blink/cc_blink_tests.gyp:cc_blink_unittests
 # TODO(GYP): make linking work on the mac.
-if (!is_mac && (!is_win || link_chrome_on_windows)) {
+if (!is_mac) {
   test("cc_blink_unittests") {
     sources = [
       "web_animation_unittest.cc",

chrome/BUILD.gn

@@ -12,16 +12,7 @@ if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
-if (is_win && !link_chrome_on_windows) {
-  # When linking is disabled on Windows, create a dummy Chrome target to
-  # make targets work that depend on Chrome.
-  group("chrome") {
-  }
-  group("main_dll") {
-  }
-}
-
-if (!is_android && (!is_win || link_chrome_on_windows)) {
+if (!is_android) {
   # TODO(GYP) for Windows need to the the reorder-imports step which probably
   # means adding another target and renaming this to chrome_initial like in GYP.
   executable("chrome") {
@@ -153,8 +144,7 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
   }
 }  # !is_android
 
-if (!is_win || link_chrome_on_windows) {
-  shared_library("main_dll") {
+shared_library("main_dll") {
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
   deps = [
@@ -236,7 +226,6 @@ if (!is_win || link_chrome_on_windows) {
   if (enable_plugins) {
     deps += [ "//pdf" ]
   }
-  }
 }
 
 # GYP version: chromium_browser_dependencies variable in chrome.gyp

chrome/test/BUILD.gn

@@ -215,7 +215,7 @@ source_set("test_support_unit") {
   ]
 }
 
-if (!is_android && (!is_win || link_chrome_on_windows)) {
+if (!is_android) {
   import("//chrome/chrome_tests.gni")
 
   test("interactive_ui_tests") {

components/BUILD.gn

@@ -221,8 +221,7 @@ group("all_components") {
 # component (it's important to use a source_set instead of a static library or
 # no tests will run) and add a reference here. You can add more than one unit
 # test target if convenient.
-if (!is_win || link_chrome_on_windows) {
-  test("components_unittests") {
+test("components_unittests") {
   sources = [
     "test/run_all_unittests.cc",
   ]
@@ -285,9 +284,9 @@ if (!is_win || link_chrome_on_windows) {
   if (is_win) {
     deps += [ "//components/browser_watcher:unit_tests" ]
   }
-  }
+}
 
-  repack("components_tests_pak") {
+repack("components_tests_pak") {
   sources = [
     "$root_gen_dir/components/components_resources.pak",
     "$root_gen_dir/components/strings/components_strings_en-US.pak",
@@ -305,5 +304,4 @@ if (!is_win || link_chrome_on_windows) {
     "//ui/resources",
     "//ui/strings",
   ]
-  }
 }

content/shell/BUILD.gn

@@ -482,7 +482,7 @@ repack("pak") {
 
 # TODO(GYP): Figure out what this should be on android
 # and make linking this work on the Mac.
-if (!is_android && !is_mac && (!is_win || link_chrome_on_windows)) {
+if (!is_android && !is_mac) {
   executable("content_shell") {
     testonly = true
 

content/test/BUILD.gn

@@ -247,7 +247,7 @@ if (!is_ios) {
 }  # !is_ios
 
 # TODO(GYP) enable content_browsertests on Mac when it links.
-if (!is_mac && (!is_win || link_chrome_on_windows)) {
+if (!is_mac) {
   test("content_browsertests") {
     sources =
         rebase_path(content_tests_gypi_values.content_browsertests_sources,
@@ -439,7 +439,7 @@ if (!is_mac && (!is_win || link_chrome_on_windows)) {
   }
 }
 
-if (!is_mac && (!is_win || link_chrome_on_windows)) {  # TODO(GYP) enable on Mac once it links.
+if (!is_mac) {  # TODO(GYP) enable on Mac once it links.
   test("content_unittests") {
     sources = rebase_path(content_tests_gypi_values.content_unittests_sources,
                           ".",
@@ -631,7 +631,7 @@ if (!is_mac && (!is_win || link_chrome_on_windows)) {  # TODO(GYP) enable on Mac
   }
 }
 
-if (!is_mac && (!is_win || link_chrome_on_windows)) {  # TODO(GYP) enable on Mac once it links.
+if (!is_mac) {  # TODO(GYP) enable on Mac once it links.
   test("content_perftests") {
     sources = [
       "../browser/net/sqlite_persistent_cookie_store_perftest.cc",

extensions/shell/BUILD.gn

@@ -127,7 +127,7 @@ source_set("app_shell_lib") {
   }
 }
 
-if (!(is_chromeos && !use_ozone) && (!is_win || link_chrome_on_windows)) {
+if (!(is_chromeos && !use_ozone)) {
   executable("app_shell") {
     # testonly because :app_shell_lib is testonly. See :app_shell_lib comment.
     testonly = true

google_apis/BUILD.gn

@@ -198,8 +198,7 @@ source_set("test_support") {
   }
 }
 
-if (!is_win || link_chrome_on_windows) {
-  test("google_apis_unittests") {
+test("google_apis_unittests") {
   sources = [
     "gaia/gaia_auth_fetcher_unittest.cc",
     "gaia/gaia_auth_util_unittest.cc",
@@ -238,5 +237,4 @@ if (!is_win || link_chrome_on_windows) {
       "drive/time_util_unittest.cc",
     ]
   }
-  }
 }

gpu/BUILD.gn

@@ -66,8 +66,7 @@ source_set("test_support") {
   ]
 }
 
-if (!is_win || link_chrome_on_windows) {
-  test("gl_tests") {
+test("gl_tests") {
   sources = [
     "command_buffer/tests/compressed_texture_test.cc",
     "command_buffer/tests/gl_bind_uniform_location_unittest.cc",
@@ -133,9 +132,9 @@ if (!is_win || link_chrome_on_windows) {
   #         '../third_party/angle/src/build_angle.gyp:libGLESv2',
   #       ],
   #     }],
-  }
+}
 
-  test("gpu_unittests") {
+test("gpu_unittests") {
   sources = [
     "command_buffer/client/buffer_tracker_unittest.cc",
     "command_buffer/client/client_test_helper.cc",
@@ -249,9 +248,9 @@ if (!is_win || link_chrome_on_windows) {
     "//gpu/command_buffer/client:gles2_c_lib",
     "//gpu/command_buffer/client:gles2_implementation",
   ]
-  }
+}
 
-  test("gpu_perftests") {
+test("gpu_perftests") {
   sources = [
     "perftests/measurements.cc",
     "perftests/run_all_tests.cc",
@@ -267,9 +266,9 @@ if (!is_win || link_chrome_on_windows) {
     "//ui/gfx/geometry",
     "//ui/gl",
   ]
-  }
+}
 
-  test("angle_unittests") {
+test("angle_unittests") {
   sources = [
     "angle_unittest_main.cc",
   ]
@@ -282,5 +281,4 @@ if (!is_win || link_chrome_on_windows) {
     "//testing/gtest",
     "//third_party/angle:translator_static",
   ]
-  }
 }

media/blink/BUILD.gn

@@ -83,7 +83,7 @@ component("blink") {
   }
 }
 
-if (!is_mac && (!is_win || link_chrome_on_windows)) {
+if (!is_mac) {
   # TODO(GYP): Make linking this work on the mac.
   test("media_blink_unittests") {
     deps = [

ui/app_list/BUILD.gn

@@ -218,8 +218,7 @@ static_library("test_support") {
   ]
 }
 
-if (!is_win || link_chrome_on_windows) {
-  test("app_list_unittests") {
+test("app_list_unittests") {
   sources = [
     "app_list_item_list_unittest.cc",
     "app_list_model_unittest.cc",
@@ -282,5 +281,4 @@ if (!is_win || link_chrome_on_windows) {
       "cocoa/test/apps_grid_controller_test_helper.mm",
     ]
   }
-  }
 }

ui/aura/BUILD.gn

@@ -243,8 +243,7 @@ executable("demo") {
   }
 }
 
-if (!is_win || link_chrome_on_windows) {
-  executable("bench") {
+executable("bench") {
   output_name = "aura_bench"
   testonly = true
 
@@ -272,9 +271,9 @@ if (!is_win || link_chrome_on_windows) {
   if (use_x11) {
     deps += [ "//ui/gfx/x" ]
   }
-  }
+}
 
-  test("aura_unittests") {
+test("aura_unittests") {
   sources = [
     "gestures/gesture_recognizer_unittest.cc",
     "test/run_all_unittests.cc",
@@ -301,5 +300,4 @@ if (!is_win || link_chrome_on_windows) {
   if (is_linux) {
     deps += [ "//third_party/mesa" ]
   }
-  }
 }

ui/keyboard/BUILD.gn

@@ -93,8 +93,7 @@ build_closure("inputview") {
   path = rebase_path("//third_party/google_input_tools")
 }
 
-if (!is_win || link_chrome_on_windows) {
-  test("keyboard_unittests") {
+test("keyboard_unittests") {
   sources = [
     "keyboard_controller_unittest.cc",
     "test/run_all_unittests.cc",
@@ -121,5 +120,4 @@ if (!is_win || link_chrome_on_windows) {
     "//ui/wm",
     "//url",
   ]
-  }
 }

ui/message_center/BUILD.gn

@@ -176,8 +176,7 @@ static_library("test_support") {
   ]
 }
 
-if (!is_win || link_chrome_on_windows) {
-  test("message_center_unittests") {
+test("message_center_unittests") {
   sources = [
     "test/run_all_unittests.cc",
   ]
@@ -236,5 +235,4 @@ if (!is_win || link_chrome_on_windows) {
       ]
     }
   }  # enable_notifications && !is_android
-  }
 }

ui/snapshot/BUILD.gn

@@ -56,8 +56,7 @@ component("snapshot") {
   }
 }
 
-if (!is_win || link_chrome_on_windows) {
-  test("snapshot_unittests") {
+test("snapshot_unittests") {
   sources = [
     "snapshot_aura_unittest.cc",
     "snapshot_mac_unittest.mm",
@@ -88,5 +87,4 @@ if (!is_win || link_chrome_on_windows) {
   } else {
     sources -= [ "snapshot_aura_unittest.cc" ]
   }
-  }
 }

ui/views/BUILD.gn

@@ -162,8 +162,7 @@ static_library("test_support") {
   }
 }
 
-if (!is_win || link_chrome_on_windows) {
-  test("views_unittests") {
+test("views_unittests") {
   sources = gypi_values.views_unittests_sources
 
   deps = [
@@ -260,7 +259,6 @@ if (!is_win || link_chrome_on_windows) {
       "widget/window_reorderer_unittest.cc",
     ]
   }
-  }
 }
 
 if (is_mac) {

ui/views/examples/BUILD.gn

@@ -88,8 +88,7 @@ component("views_examples_lib") {
   }
 }
 
-if (!is_win || link_chrome_on_windows) {
-  executable("views_examples_exe") {
+executable("views_examples_exe") {
   testonly = true
 
   sources = [
@@ -117,7 +116,6 @@ if (!is_win || link_chrome_on_windows) {
   if (use_x11) {
     deps += [ "//ui/gfx/x" ]
   }
-  }
 }
 
 component("views_examples_with_content_lib") {

ui/wm/BUILD.gn

@@ -115,8 +115,7 @@ static_library("test_support") {
   ]
 }
 
-if (!is_win || link_chrome_on_windows) {
-  test("wm_unittests") {
+test("wm_unittests") {
   sources = [
     "core/capture_controller_unittest.cc",
     "core/compound_event_filter_unittest.cc",
@@ -149,5 +148,4 @@ if (!is_win || link_chrome_on_windows) {
     "//ui/gfx/geometry",
     "//ui/gl",
   ]
-  }
 }