Revert of Work on Windows GN component build.

content/common/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/features.gni")
 import("//build/config/ui.gni")
 import("//content/common/common.gni")
 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 if (is_chromeos && current_cpu != "arm") {
@@ skipping 126 matching lines @@
 
   public_deps = [
     "//gpu/command_buffer/common",
     "//third_party/WebKit/public:blink_headers",
   ]
   deps = [
     "//base",
     "//build/util:webkit_version",
     "//components/tracing",
     "//gpu/command_buffer/client:gles2_interface",
-    "//gpu/command_buffer/common:gles2_utils",
     "//net",
     "//skia",
     "//third_party/icu",
     "//ui/accessibility",
     "//ui/base",
     "//ui/base/ime",
     "//ui/events/ipc",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gfx/ipc",
@@ skipping 115 matching lines @@
     if (use_ozone) {
       # If we're using pango, never use this ozone file (it was removed in all
       # non-ozone cases above).
       sources -= [ "font_list_ozone.cc" ]
     }
   } else {
     sources -= [ "font_list_pango.cc" ]
   }
 
   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" ]
     }
   }
 
   if (enable_plugins) {
     deps += [ "//ppapi/shared_impl" ]
   } else {
     sources -= [
@@ skipping 102 matching lines @@
         ]
       }
     }
   }
 
   if (is_win) {
     sources += [
       "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",
       "d3d11.lib",
       "dxva2.lib",
       "strmiids.lib",
       "mf.lib",
       "mfplat.lib",
       "mfuuid.lib",
     ]
@@ skipping 52 matching lines @@
     "permission_service.mojom",
     "presentation/presentation_service.mojom",
     "render_frame_setup.mojom",
   ]
 
   deps = [
     "//content/public/common:mojo_bindings",
     "//third_party/mojo/src/mojo/public/interfaces/application:application",
   ]
 }