gn: Fix more build issues on Win

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")
 
 source_set("config") {
   sources = [
     "dx_diag_node.cc",
     "dx_diag_node.h",
@@ skipping 30 matching lines @@
   ]
 
   defines = [ "GPU_IMPLEMENTATION" ]
 
   deps = [
     "//base",
     "//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 = [ "dxguid.lib", "setupapi.lib" ]
 
     if (is_chrome_branded && is_official_build) {
       sources += [
         "//third_party/amd/AmdCfxPxExt.h",
         "//third_party/amd/amd_videocard_info_win.cc",
       ]
     }
@@ skipping 12 matching lines @@
       "//third_party/libXNVCtrl",
     ]
   } else {
     sources -= [ "gpu_info_collector_x11.cc" ]
   }
   if (!use_ozone) {
     sources -= [ "gpu_info_collector_ozone.cc" ]
   }
 }