GN: Fixes for component build

Source/web/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/ui.gni")
 import("//third_party/WebKit/Source/bindings/bindings.gni")
 import("//third_party/WebKit/Source/config.gni")
 import("//third_party/WebKit/Source/core/core.gni")
 import("//third_party/WebKit/Source/modules/modules.gni")
 import("//third_party/WebKit/Source/platform/platform.gni")
@@ skipping 29 matching lines @@
     "//third_party/WebKit/Source:config",
     "//third_party/WebKit/Source:inside_blink",
     "//third_party/WebKit/Source:non_test_config",
   ]
 
   sources = web_gypi.web_files
 
   if (!use_default_render_theme) {
     sources -= [ "default/WebRenderTheme.cpp" ]
   }
+
+  if (is_component_build) {
+    deps += [
+      "//base/test:test_support",
+      "//testing/gmock",
+      "//testing/gtest",
+      "//third_party/WebKit/Source/core:testing",
+      "//third_party/WebKit/Source/modules:modules_testing",
+    ]
+
+    configs -= [
+      "//third_party/WebKit/Source:non_test_config",
+    ]
+
+    sources += web_gypi.web_unittest_files
+    sources += bindings_unittest_files
+    sources += core_unittest_files
+    sources += modules_unittest_files
+    sources += platform_web_unittest_files
+
+    sources += [ "WebTestingSupport.cpp" ]
+  }
 }
 
 # GYP version: WebKit/Source/web/web.gyp:blink_web_test_support
 source_set("test_support") {
   if (!is_component_build) {
     deps = [
       "//skia",
       "//third_party/WebKit/Source/core:testing",
       "//third_party/WebKit/Source/modules:modules_testing",
       "//third_party/WebKit/Source/wtf",
     ]
 
     sources = [ "WebTestingSupport.cpp" ]
 
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [
       "//build/config/compiler:no_chromium_code",
       "//third_party/WebKit/Source:config",
     ]
   }
 }
 
-# TODO(GYP): Enable when //content/test:test_support links.
-if (false) {
 # GYP version: WebKit/Source/web/web_tests.gyp:webkit_unit_tests
 test("webkit_unit_tests") {
   deps = [
     ":test_support",
     ":web",
     "//base",
     "//base/test:test_support",
     "//base:i18n",
     "//content/test:test_support",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/WebKit/Source/wtf:test_support",
     "//third_party/libwebp",
     "//third_party/zlib",
     "//url",
     "//v8",
-   ]
+  ]
 
   sources = [ "tests/RunAllTests.cpp" ]
 
+  configs += [ "//third_party/WebKit/Source:config" ]
+
   if (!is_component_build) {
     deps += [ "//third_party/WebKit/Source/core" ]
 
     configs += [ "//third_party/WebKit/Source:inside_blink" ]
 
     sources += web_gypi.web_unittest_files
     sources += bindings_unittest_files
     sources += core_unittest_files
     sources += modules_unittest_files
     sources += platform_web_unittest_files
   }
 }
-}