GN Windows component build fixes.

content/test/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 import("//testing/test.gni")
 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 content_tests_gypi_values =
     exec_script("//build/gypi_to_gn.py",
                 [
                   rebase_path("../content_tests.gypi"),
                   "--replace=<(SHARED_INTERMEDIATE_DIR)=$root_gen_dir",
                 ],
                 "scope",
                 [ "../content_tests.gypi" ])
 
 # GYP version //content/content_tests.gypi:test_support_content
-static_library("test_support") {
+source_set("test_support") {
   testonly = true
   public_deps = []
   deps = [
     "//cc/blink",
     "//content/public/app:both",
     "//content/public/browser",
     "//content/public/common",
     "//net:test_support",
     "//skia",
     "//storage/common",
@@ skipping 86 matching lines @@
 
     if (use_aura || is_mac) {
       deps += [ "//ui/compositor" ]
     }
 
     if (use_ozone) {
       deps += [ "//ui/ozone" ]
     }
 
     if (is_win) {
-      deps += [ "//third_party/iaccessible2" ]
-      sources += [ "../app/startup_helper_win.cc" ]
+      deps += [
+        "//content:startup_helper_win",
+        "//third_party/iaccessible2",
+      ]
     }
 
     if (!is_android && !is_ios) {
       sources += [
         "../browser/compositor/test/no_transport_image_transport_factory.cc",
         "../browser/compositor/test/no_transport_image_transport_factory.h",
       ]
       deps += [
         "//ui/compositor",
         "//third_party/libvpx",
@@ skipping 569 matching lines @@
       "//gpu/blink",
       "//testing/gtest",
       "//third_party/WebKit/public:blink",
       "//ui/base",
       "//ui/gfx",
       "//ui/gfx/geometry",
       "//ui/gl",
     ]
   }
 }