Revert of Work on Windows GN component build.

content/common/BUILD.gn

Index: content/common/BUILD.gn
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 25bb75168a4d04ce1e1bdac578287a3f01f2498d..8d739e7714e847d3f1affba59e4fa814da661c73 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -144,7 +144,6 @@
     "//build/util:webkit_version",
     "//components/tracing",
     "//gpu/command_buffer/client:gles2_interface",
-    "//gpu/command_buffer/common:gles2_utils",
     "//net",
     "//skia",
     "//third_party/icu",
@@ -280,10 +279,8 @@
   }
 
   if (use_x11) {
-    configs += [
-      "//build/config/linux:xcomposite",
-      "//third_party/khronos:khronos_headers",
-    ]
+    include_dirs += [ "//third_party/khronos" ]
+    configs += [ "//build/config/linux:xcomposite" ]
 
     if (current_cpu != "arm" || !is_chromeos) {
       sources += [ "gpu/x_util.h" ]
@@ -406,7 +403,7 @@
       "gpu/media/dxva_video_decode_accelerator.cc",
       "gpu/media/dxva_video_decode_accelerator.h",
     ]
-    configs += [ "//third_party/khronos:khronos_headers" ]
+    include_dirs += [ "//third_party/khronos" ]
     deps += [ "//ui/gl" ]
     libs += [
       "d3d9.lib",