Revert of Work on Windows GN component build.

gpu/command_buffer/client/BUILD.gn

 # Copyright (c) 2013 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.
 
-# The files here go into the "gpu" component in a component build (with
-# "command_buffer_client" and "gles2_cmd_helper" just forwarding) and goes into
-# separate static libraries in non-component build. This needs to match the
-# GYP build which was likely an attempt to make larger components to help with
-# loading.
-group("client") {
-  if (is_component_build) {
-    public_deps = [
-      "//gpu",
-    ]
-  } else {
-    public_deps = [
-      ":client_sources",
-    ]
-  }
-}
-
-group("gles2_cmd_helper") {
-  if (is_component_build) {
-    public_deps = [
-      "//gpu",
-    ]
-  } else {
-    public_deps = [
-      ":gles2_cmd_helper_sources",
-    ]
-  }
-}
-
-source_set("client_sources") {
-  visibility = [ "//gpu/*" ]
-
+source_set("client") {
   sources = [
     "cmd_buffer_helper.cc",
     "cmd_buffer_helper.h",
     "fenced_allocator.cc",
     "fenced_allocator.h",
     "gpu_control.h",
     "gpu_memory_buffer_manager.cc",
     "gpu_memory_buffer_manager.h",
     "mapped_memory.cc",
     "mapped_memory.h",
     "ring_buffer.cc",
     "ring_buffer.h",
     "transfer_buffer.cc",
     "transfer_buffer.h",
   ]
 
   configs += [
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
     "//gpu:gpu_implementation",
   ]
 
   all_dependent_configs = [ "//third_party/khronos:khronos_headers" ]
 
   deps = [
-    "//gpu/command_buffer/common:common_sources",
+    "//gpu/command_buffer/common",
   ]
 }
 
+group("gles2_cmd_helper") {
+  if (is_component_build) {
+    deps = [
+      "//gpu",
+    ]
+  } else {
+    deps = [
+      ":gles2_cmd_helper_sources",
+    ]
+  }
+}
+
 source_set("gles2_cmd_helper_sources") {
-  visibility = [ "//gpu/*" ]
+  visibility = [
+    ":gles2_cmd_helper",
+    "//gpu",
+  ]
   sources = [
     "gles2_cmd_helper.cc",
     "gles2_cmd_helper.h",
     "gles2_cmd_helper_autogen.h",
   ]
 
   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 = [
-    ":client_sources",
+    ":client",
   ]
 }
 
 gles2_c_lib_source_files = [
   "gles2_c_lib.cc",
   "gles2_c_lib_autogen.h",
   "gles2_c_lib_export.h",
   "gles2_lib.cc",
   "gles2_lib.h",
 ]
@@ skipping 127 matching lines @@
   ]
   deps = [
     ":client",
     ":gles2_implementation_no_check",
     ":gles2_interface",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//gpu/command_buffer/common",
   ]
 }