Enable linking full chrome on windows GN builds again.

Now that we have fastbuild and Goma working, it should be safe to
link the full binary again in a GN build on the bots.

TBR=brettw@chromium.org, jam@chromium.org
BUG=354261

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

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

build/config/BUILDCONFIG.gn

@@ -80,7 +80,7 @@ declare_args() {
   # 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 = false
+  link_chrome_on_windows = true
 }
 
 # =============================================================================

chrome/BUILD.gn

@@ -51,8 +51,6 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
         "app/chrome_watcher_command_line_win.h",
         "app/client_util.cc",
         "app/client_util.h",
-        "app/chrome_watcher_command_line_win.cc",
-        "app/chrome_watcher_command_line_win.h",
         "app/signature_validator_win.cc",
         "app/signature_validator_win.h",
         "common/crash_keys.cc",
@@ -154,7 +152,7 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
       # TODO(GYP) some stuff from GYP including chrome_multiple_dll.
     }
 
-    if (enable_plugins) {
+    if (is_linux && enable_plugins) {
       deps += [ "//pdf" ]
     }
   }

chrome/chrome_exe.gypi

@@ -190,7 +190,7 @@
                 '../build/linux/system.gyp:xext',
               ],
             }],
-            ['enable_plugins==1', {
+            ['OS=="linux" and enable_plugins==1', {
               'dependencies': [
                 '../pdf/pdf.gyp:pdf',
               ],