Revert of Make ui/gl/... consistently use on Swiftshader includes on Windows official builds.

ui/gl/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/linux/pkg_config.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
 use_egl = is_win || is_android || is_linux
 use_glx = use_x11
@@ skipping 213 matching lines @@
     ]
 
     libs = [ "dwmapi.lib" ]
     ldflags = [ "/DELAYLOAD:dwmapi.dll" ]
 
     data_deps = [
       "//third_party/angle:libEGL",
       "//third_party/angle:libGLESv2",
       "//third_party/mesa:osmesa",
     ]
-
-    if (is_official_build) {
-      include_dirs = [ "//third_party/swiftshader/include" ]
-    }
   }
   if (is_mac) {
     sources += [
       "gl_context_cgl.cc",
       "gl_context_cgl.h",
       "gl_fence_apple.cc",
       "gl_fence_apple.h",
       "gl_image_io_surface.h",
       "gl_image_io_surface.mm",
       "scoped_cgl.cc",
@@ skipping 150 matching lines @@
     sources = [
       "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
       "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java",
     ]
     public_deps = [
       ":surface_jni_headers",
     ]
     jni_package = "ui/gl"
   }
 }