Revert of Work on Windows GN component build.

gpu/config/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")
 
 declare_args() {
   # Use the PCI lib to collect GPU information on Linux.
   use_libpci = true
 }
 
-group("config") {
-  if (is_component_build) {
-    public_deps = [
-      "//gpu",
-    ]
-  } else {
-    public_deps = [
-      ":config_sources",
-    ]
-  }
-}
-
-source_set("config_sources") {
-  visibility = [ "//gpu/*" ]
-
+source_set("config") {
   sources = [
     "dx_diag_node.cc",
     "dx_diag_node.h",
     "gpu_blacklist.cc",
     "gpu_blacklist.h",
     "gpu_control_list.cc",
     "gpu_control_list.h",
     "gpu_control_list_jsons.h",
     "gpu_driver_bug_list.cc",
     "gpu_driver_bug_list.h",
@@ skipping 22 matching lines @@
   ]
 
   configs += [
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
     "//gpu:gpu_implementation",
   ]
 
   deps = [
     "//base",
-    "//gpu/command_buffer/service:service_sources",
+    "//gpu/command_buffer/service",
     "//third_party/re2",
     "//ui/gl",
   ]
 
   # Prefer mesa GL headers to system headers, which cause problems on Win.
   include_dirs = [ "//third_party/mesa/src/include" ]
 
   if (is_win) {
     deps += [ "//third_party/libxml" ]
     libs = [
@@ skipping 23 matching lines @@
       "//third_party/libXNVCtrl",
       "//ui/gfx/x",
     ]
   } else {
     sources -= [ "gpu_info_collector_x11.cc" ]
   }
   if (!use_ozone) {
     sources -= [ "gpu_info_collector_ozone.cc" ]
   }
 }