BASELINE: Update chromium to 44.0.2403.47

Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

12 files changed, 333 insertions, 74 deletions

diff --git a/chromium/gpu/gles2_conform_support/BUILD.gn b/chromium/gpu/gles2_conform_support/BUILD.gn
new file mode 100644
index 00000000000..c91ecb31795
--- /dev/null
+++ b/chromium/gpu/gles2_conform_support/BUILD.gn
@@ -0,0 +1,168 @@
+# Copyright 2015 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/allocator.gni")
+import("//testing/test.gni")
+
+# GYP version: gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support
+executable("gles2_conform_support") {
+  sources = [
+    "gles2_conform_support.c",
+    "native/egl_native.cc",
+    "native/egl_native_win.cc",
+    "native/main.cc",
+  ]
+  defines = [
+    "GLES2_CONFORM_SUPPORT_ONLY",
+    "GTF_GLES20",
+    "EGLAPI=",
+    "EGLAPIENTRY=",
+  ]
+  deps = [
+    "//base",
+    "//gpu/gles2_conform_support/egl",
+    "//base/third_party/dynamic_annotations",
+    "//ui/gl",
+    "//gpu/command_buffer/client:gles2_c_lib_nocheck",
+  ]
+  if (is_linux) {
+    sources += [
+      "native/egl_native_aura.cc",
+      "native/egl_native_x11.cc",
+    ]
+  }
+  if (use_allocator != "none") {
+    # See http://crbug.com/162998#c4 for why this is needed.
+    deps += [ "//base/allocator" ]
+  }
+}
+
+if (internal_gles2_conform_tests) {
+  action("generate_gles2_conform_embedded_data") {
+    script = "generate_gles2_embedded_data.py"
+    output = [
+      "$target_gen_dir/gles2_conform_test_embedded_data/FilesData.c",
+      "$target_gen_dir/gles2_conform_test_embedded_data/FilesData.h",
+      "$target_gen_dir/gles2_conform_test_embedded_data/FilesTOC.c",
+    ]
+    args = [
+      "../../third_party/gles2_conform/GTF_ES/glsl/GTF",
+      "$target_gen_dir/gles2_conform_test_embedded_data",
+    ]
+  }
+  gles2_conform_gypi = exec_script("//build/gypi_to_gn.py",
+                                   [ rebase_path("gles2_conform_gypi") ],
+                                   "scoped",
+                                   [ "gles2_conform_gypi" ])
+  executable("gles2_conform_test_windowless") {
+    testonly = true
+    sources = [
+      # Include a dummy c++ file to force linking of libstdc++.
+      "dummy.cc",
+      gles2_conform_gypi.gtf_es_sources,
+    ]
+    defines = [
+      "GTF_API=GTF_GLES20",
+      "HKEMBEDDEDFILESYSTEM",
+    ]
+    deps = [
+      ":generate_gles2_conform_embedded_data",
+      "//gpu/gles2_conform_support/egl",
+      "//gpu/gles2_conform_support/native:windowless",
+      "//gpu/command_buffer/client:gles2_c_libnocheck",
+    ]
+    if (is_linux) {
+      if (!is_chromeos) {
+        deps += [ "//build/linux/system/gtk" ]
+
+        if (is_clang) {
+          cflags = [
+            "-Wno-array-bounds",
+            "-Wno-implicit-function-declaration",
+            "-Wno-incompatible-pointer-types",
+            "-Wno-parentheses-equality",
+            "-Wno-pointer-sign",
+            "-Wno-return-type",
+            "-Wno-sizeof-pointer-memaccess",
+            "-Wno-tautological-compare",
+          ]
+        }
+      }
+    }
+    if (is_win) {
+      deps += [
+        "//third_party/angle:libEGL",
+        "//third_party/angle:libGLESv2",
+      ]
+      defines = [
+        "EGLAPI=",
+        "EGLAPIENTRY=",
+      ]
+      defines -= [ "NOMINMAX" ]
+      cflags = [
+        "/wd4018",  # signed/unsigned mismatch
+        "/wd4101",  # unreferenced local variable
+        "/wd4715",  # not all control paths return a value
+        "/wd4267",  # size_t/unsigned int conversion
+      ]
+    }
+    if (is_mac) {
+      defines = [
+        "_STDINT",
+        "_STDINT_H",
+      ]
+      if (is_clang) {
+        cflags = [
+          "-Wno-pointer-sign",
+          "-Wno-array-bounds",
+          "-Wno-sizeof-pointer-memaccess",
+          "-Wno-implicit-function-declaration",
+          "-Wno-logical-op-parentheses",
+          "-Wno-tautological-compare",
+          "-Wno-parentheses-equality",
+          "-Wno-return-type",
+        ]
+        #"xcode_settings": {
+        #"LD": "clang++",
+        #"WARNING_CFLAGS": [
+        #"-Wno-pointer-sign",
+        #"-Wno-array-bounds",
+        #"-Wno-sizeof-pointer-memaccess",
+        #"-Wno-implicit-function-declaration",
+        #"-Wno-logical-op-parentheses",
+        #"-Wno-tautological-compare",
+        #"-Wno-parentheses-equality",
+        #"-Wno-return-type",
+        #],
+        #},
+      }
+    }
+
+    #'run_as': {
+    #     'conditions': [
+    #       ['OS=="win"', {
+    #         'action': [
+    #           '$(TargetPath)',
+    #           '-noimagefileio',
+    #           '-run=<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/mustpass.run',
+    #         ],
+    #       }],
+    #     ],
+    #    },
+  }
+}
+
+test("gles2_conform_test") {
+  sources = [
+    "gles2_conform_test.cc",
+  ]
+  deps = [
+    "//base",
+    "//gpu/config",
+    "//testing/gtest",
+  ]
+  if (internal_gles2_conform_tests) {
+    deps += [ "gles2_conform_test_windowless" ]
+  }
+}
diff --git a/chromium/gpu/gles2_conform_support/egl/BUILD.gn b/chromium/gpu/gles2_conform_support/egl/BUILD.gn
new file mode 100644
index 00000000000..32fb8706ef4
--- /dev/null
+++ b/chromium/gpu/gles2_conform_support/egl/BUILD.gn
@@ -0,0 +1,35 @@
+# Copyright 2015 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.
+
+# GYP version: gpu/gles2_conform_support/gles_conform_support.gyp:egl_native
+source_set("egl") {
+  output_name = "egl_native"
+  sources = [
+    "config.cc",
+    "config.h",
+    "display.cc",
+    "display.h",
+    "egl.cc",
+    "surface.cc",
+    "surface.h",
+  ]
+
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
+
+  defines = [
+    "EGLAPI=",
+    "EGLAPIENTRY=",
+  ]
+
+  deps = [
+    "//base",
+    "//gpu/command_buffer/client:gles2_implementation_no_check",
+    "//gpu/command_buffer/service",
+    "//gpu",
+    "//ui/base",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+    "//ui/gl",
+  ]
+}
diff --git a/chromium/gpu/gles2_conform_support/egl/display.cc b/chromium/gpu/gles2_conform_support/egl/display.cc
index 3fc17b9b29f..bd17250e16e 100644
--- a/chromium/gpu/gles2_conform_support/egl/display.cc
+++ b/chromium/gpu/gles2_conform_support/egl/display.cc
@@ -10,10 +10,12 @@
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
+#include "gpu/command_buffer/common/value_state.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
+#include "gpu/command_buffer/service/valuebuffer_manager.h"
 #include "gpu/gles2_conform_support/egl/config.h"
 #include "gpu/gles2_conform_support/egl/surface.h"
 
@@ -114,8 +116,14 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config,
   if (!command_buffer->Initialize())
     return NULL;
 
-  scoped_refptr<gpu::gles2::ContextGroup> group(new gpu::gles2::ContextGroup(
-      NULL, NULL, new gpu::gles2::ShaderTranslatorCache, NULL, true));
+  scoped_refptr<gpu::gles2::ContextGroup> group(
+      new gpu::gles2::ContextGroup(NULL,
+                                   NULL,
+                                   new gpu::gles2::ShaderTranslatorCache,
+                                   NULL,
+                                   NULL,
+                                   NULL,
+                                   true));
 
   decoder_.reset(gpu::gles2::GLES2Decoder::Create(group.get()));
   if (!decoder_.get())
@@ -327,4 +335,8 @@ uint32 Display::CreateStreamTexture(uint32 texture_id) {
   return 0;
 }
 
+void Display::SetLock(base::Lock*) {
+  NOTIMPLEMENTED();
+}
+
 }  // namespace egl
diff --git a/chromium/gpu/gles2_conform_support/egl/display.h b/chromium/gpu/gles2_conform_support/egl/display.h
index 651ab1abd8a..9b349bd3b6f 100644
--- a/chromium/gpu/gles2_conform_support/egl/display.h
+++ b/chromium/gpu/gles2_conform_support/egl/display.h
@@ -92,6 +92,7 @@ class Display : private gpu::GpuControl {
   void SignalQuery(uint32 query, const base::Closure& callback) override;
   void SetSurfaceVisible(bool visible) override;
   uint32 CreateStreamTexture(uint32 texture_id) override;
+  void SetLock(base::Lock*) override;
 
  private:
   EGLNativeDisplayType display_id_;
diff --git a/chromium/gpu/gles2_conform_support/egl/egl.cc b/chromium/gpu/gles2_conform_support/egl/egl.cc
index 3827229c45a..f23cf76e994 100644
--- a/chromium/gpu/gles2_conform_support/egl/egl.cc
+++ b/chromium/gpu/gles2_conform_support/egl/egl.cc
@@ -106,7 +106,7 @@ EGLBoolean eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor) {
   const char* const argv[] = {
     "dummy"
   };
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
   gfx::GLSurface::InitializeOneOff();
 
   *major = 1;
diff --git a/chromium/gpu/gles2_conform_support/gles2_conform.gypi b/chromium/gpu/gles2_conform_support/gles2_conform.gypi
index 41e0f2850cb..6dcf27746e2 100644
--- a/chromium/gpu/gles2_conform_support/gles2_conform.gypi
+++ b/chromium/gpu/gles2_conform_support/gles2_conform.gypi
@@ -47,12 +47,12 @@
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestPointSizeArray.h',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestPointSprite.c',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestPointSprite.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestRGB8RGBA8.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestRGB8RGBA8.h',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestReadFormat.c',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestReadFormat.h',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestRequiredInternalformat.c',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestRequiredInternalformat.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestRGB8RGBA8.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestRGB8RGBA8.h',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestStencil1.c',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestStencil1.h',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestStencil4.c',
@@ -200,34 +200,40 @@
     'gtf_es_sources': [
       # Bootstrapping files commented out. We have different bootstrapping
       # files for each platform.
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/egl_config_select.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/egl_config_select.h',
-      #'<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/eglNative.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/eglNative.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/eglu.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/eglu.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/eglut.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/eglut.h',
       # Note: FilesDATA.h, FilesDATA.c, and FilesTOC.c are generated
       # by GTF_ES/glsl/GTF/mergeTestFilesToCSource.pl
-      '<(SHARED_INTERMEDIATE_DIR)/gles2_conform_test_embedded_data/FilesDATA.c',
-      '<(SHARED_INTERMEDIATE_DIR)/gles2_conform_test_embedded_data/FilesDATA.h',
-      '<(SHARED_INTERMEDIATE_DIR)/gles2_conform_test_embedded_data/FilesTOC.c',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/FilesTOC.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/gl2ext_missing.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/gl2Native.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/gl2Native.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFAttDataGL.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFAttDataGL.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFDepthRangeParamGL.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFDepthRangeParamGL.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFModelDataGL.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFModelDataGL.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFPointParamGL.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFPointParamGL.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFReadPixelsGL.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFReadPixelsGL.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFShaderDataGL.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFShaderDataGL.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFShaderTextGL.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFShaderTextGL.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFStateDataGL.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFStateDataGL.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFTexDataGL.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFTexDataGL.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFTexParamGL.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFTexParamGL.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFUniDataGL.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFUniDataGL.h',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFArguments.c',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFArguments.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFCoverageDict.c',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFCoverageGL.c',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFCoverageGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFCoverageDict.c',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFDict.h',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFDictBase.h',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFFileReader.c',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFFileReader.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFgl.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFgl.h',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFInitEGL.c',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFLog.c',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFLog.h',
@@ -273,34 +279,28 @@
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFVecBase.h',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFVector.h',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFVersion.h',
-      #'<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/main.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFgl.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFgl.h',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/MIMG.c',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/MIMG.h',
       #'<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/Win32Console.h',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/XmlUtils.c',
       '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/XmlUtils.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFAttDataGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFAttDataGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFDepthRangeParamGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFDepthRangeParamGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFModelDataGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFModelDataGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFPointParamGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFPointParamGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFReadPixelsGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFReadPixelsGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFShaderDataGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFShaderDataGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFShaderTextGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFShaderTextGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFStateDataGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFStateDataGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFTexDataGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFTexDataGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFTexParamGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFTexParamGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFUniDataGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL/GTFUniDataGL.h',
+      #'<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/eglNative.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/eglNative.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/egl_config_select.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/egl_config_select.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/eglu.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/eglu.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/eglut.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/eglut.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/gl2Native.c',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/gl2Native.h',
+      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/gl2ext_missing.h',
+      #'<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/main.c',
+      '<(SHARED_INTERMEDIATE_DIR)/gles2_conform_test_embedded_data/FilesDATA.c',
+      '<(SHARED_INTERMEDIATE_DIR)/gles2_conform_test_embedded_data/FilesDATA.h',
+      '<(SHARED_INTERMEDIATE_DIR)/gles2_conform_test_embedded_data/FilesTOC.c',
       '<@(gl2_extension_test_sources)',
       '<@(gl2_fixed_test_sources)',
       '<@(gl2_test_sources)',
diff --git a/chromium/gpu/gles2_conform_support/gles2_conform_support.gyp b/chromium/gpu/gles2_conform_support/gles2_conform_support.gyp
index 928b1528010..3835c4bfc8f 100644
--- a/chromium/gpu/gles2_conform_support/gles2_conform_support.gyp
+++ b/chromium/gpu/gles2_conform_support/gles2_conform_support.gyp
@@ -14,8 +14,8 @@
    'conditions': [
      ['OS=="linux"', {
        'bootstrap_sources_native': [
-         'native/egl_native_aura.cc',
          'native/egl_native.cc',
+         'native/egl_native_aura.cc',
          'native/egl_native_x11.cc',
        ],
      }],
@@ -30,6 +30,7 @@
   },
   'targets': [
     {
+      # GN version: //gpu/gles2_conform_support/egl
       'target_name': 'egl_native',
       'type': 'static_library',
       'dependencies': [
@@ -60,6 +61,7 @@
       'msvs_disabled_warnings': [ 4267, ],
     },
     {
+      # GN version: //gpu/gles2_conform_support/native
       'target_name': 'egl_main_native',
       'type': 'static_library',
       'dependencies': [
@@ -77,6 +79,7 @@
       ],
     },
     {
+      # GN version: //gpu/gles2_conform_support/native:windowless
       'target_name': 'egl_main_windowless',
       'type': 'static_library',
       'dependencies': [
@@ -84,9 +87,9 @@
         '../../third_party/khronos/khronos.gyp:khronos_headers',
       ],
       'sources': [
-        'native/main.cc',
         'native/egl_native.cc',
         'native/egl_native_windowless.cc',
+        'native/main.cc',
         '<@(bootstrap_sources_native)',
       ],
       'defines': [
@@ -97,6 +100,7 @@
       ],
     },
     {
+      # GN version: //gpu/gles2_conform_support
       'target_name': 'gles2_conform_support',
       'type': 'executable',
       'dependencies': [
diff --git a/chromium/gpu/gles2_conform_support/gles2_conform_test.cc b/chromium/gpu/gles2_conform_support/gles2_conform_test.cc
index 46a511569cb..906e1af2754 100644
--- a/chromium/gpu/gles2_conform_support/gles2_conform_test.cc
+++ b/chromium/gpu/gles2_conform_support/gles2_conform_test.cc
@@ -63,8 +63,8 @@ bool RunGLES2ConformTest(const char* path) {
   base::FilePath program(test_path.Append(FILE_PATH_LITERAL(
       "gles2_conform_test_windowless")));
 
-  CommandLine* currentCmdLine = CommandLine::ForCurrentProcess();
-  CommandLine cmdline(program);
+  base::CommandLine* currentCmdLine = base::CommandLine::ForCurrentProcess();
+  base::CommandLine cmdline(program);
   cmdline.AppendArguments(*currentCmdLine, false);
   cmdline.AppendSwitch(std::string("--"));
   cmdline.AppendArg(std::string("-run=") + path);
@@ -85,7 +85,7 @@ bool RunGLES2ConformTest(const char* path) {
 
 int main(int argc, char** argv) {
   base::AtExitManager exit_manager;
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif
diff --git a/chromium/gpu/gles2_conform_support/gles2_conform_test.gyp b/chromium/gpu/gles2_conform_support/gles2_conform_test.gyp
index 4cbb35b3daa..1f23efa3c3c 100644
--- a/chromium/gpu/gles2_conform_support/gles2_conform_test.gyp
+++ b/chromium/gpu/gles2_conform_support/gles2_conform_test.gyp
@@ -137,12 +137,9 @@
                 4018,  # signed/unsigned mismatch
                 4101,  # unreferenced local variable
                 4715,  # not all control paths return a value
+                4267,  # size_t/unsigned int conversion
               ],
-              'msvs_settings': {
-                'VCCLCompilerTool': {
-                  'AdditionalOptions': ['/UNOMINMAX'],
-                },
-              },
+              'defines!': [ 'NOMINMAX' ],
             }],
             ['OS=="mac"', {
               'defines': [
diff --git a/chromium/gpu/gles2_conform_support/gles2_conform_test_expectations.txt b/chromium/gpu/gles2_conform_support/gles2_conform_test_expectations.txt
index 532ce749b66..76b7431eec8 100644
--- a/chromium/gpu/gles2_conform_support/gles2_conform_test_expectations.txt
+++ b/chromium/gpu/gles2_conform_support/gles2_conform_test_expectations.txt
@@ -76,22 +76,6 @@
 393677 CHROMEOS INTEL 0xa011 : GL2FixedTests_point_rasterization_input_run = FAIL
 393677 CHROMEOS INTEL 0xa011 : GL2FixedTests_scissor_input_run = FAIL
 
-408251 WIN : GL2ExtensionTests_vertex_array_object_input_run = FAIL
-408251 WIN : GL2FixedTests_blend_input_run = FAIL
-408251 WIN : GL2FixedTests_buffer_clear_input_run = FAIL
-408251 WIN : GL2FixedTests_buffer_color_input_run = FAIL
-408251 WIN : GL2FixedTests_copy_texture_input_run = FAIL
-408251 WIN : GL2FixedTests_depth_buffer_clear_input_run = FAIL
-408251 WIN : GL2FixedTests_mipmaps_interpolation_input_run = FAIL
-408251 WIN : GL2FixedTests_stencil_plane_clear_input_run = FAIL
-408251 WIN : GL2FixedTests_triangle_tiling_input_run = FAIL
-408251 WIN : GL2FixedTests_user_clip_planes_input_run = FAIL
-408251 WIN : GL2Tests_fixed_data_type_input_run = FAIL
-408251 WIN : GL_biConstants_input_run = FAIL
-408251 WIN : GL_biuDepthRange_input_run = FAIL
-408251 WIN : GL_mat_input_run = FAIL
-408251 WIN : GL_struct_input_run = FAIL
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 //  Temprory entries: they should be removed once the bugs are fixed.
diff --git a/chromium/gpu/gles2_conform_support/native/BUILD.gn b/chromium/gpu/gles2_conform_support/native/BUILD.gn
new file mode 100644
index 00000000000..0d1c0ee04d7
--- /dev/null
+++ b/chromium/gpu/gles2_conform_support/native/BUILD.gn
@@ -0,0 +1,58 @@
+# Copyright 2015 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.
+
+# GYP version: gpu/gles2_conform_support/gles2_conform_support.gyp:egl_main_native
+source_set("native") {
+  output_name = "egl_main_native"
+  sources = [
+    "egl_native.cc",
+    "egl_native_win.cc",
+    "main.cc",
+  ]
+  defines = [
+    "GLES2_CONFORM_SUPPORT_ONLY",
+    "GTF_GLES20",
+    "EGLAPI=",
+    "EGLAPIENTRY=",
+  ]
+  deps = [
+    "//base",
+    "//gpu/gles2_conform_support/egl",
+    "//ui/gl",
+  ]
+  if (is_linux) {
+    sources += [
+      "egl_native_aura.cc",
+      "egl_native_x11.cc",
+    ]
+  }
+}
+
+# GYP version: gpu/gles2_conform_support/gles2_conform_support.gyp:egl_main_windowless
+source_set("windowless") {
+  output_name = "egl_main_windowless"
+  sources = [
+    "egl_native.cc",
+    "egl_native_win.cc",
+    "egl_native_windowless.cc",
+    "main.cc",
+  ]
+  defines = [
+    "GLES2_CONFORM_SUPPORT_ONLY",
+    "GTF_GLES20",
+    "EGLAPI=",
+    "EGLAPIENTRY=",
+  ]
+  deps = [
+    "//base",
+    "//gpu/gles2_conform_support/egl",
+    "//ui/gl",
+  ]
+  if (is_linux) {
+    sources += [
+      "egl_native_aura.cc",
+      "egl_native_x11.cc",
+    ]
+  }
+}
diff --git a/chromium/gpu/gles2_conform_support/native/main.cc b/chromium/gpu/gles2_conform_support/native/main.cc
index d0d05d86455..1dc377b099e 100644
--- a/chromium/gpu/gles2_conform_support/native/main.cc
+++ b/chromium/gpu/gles2_conform_support/native/main.cc
@@ -23,11 +23,11 @@ extern "C" {
 
 int main(int argc, char *argv[]) {
   base::AtExitManager at_exit;
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
   base::MessageLoopForUI message_loop;
 
-  CommandLine::StringVector args =
-    CommandLine::ForCurrentProcess()->GetArgs();
+  base::CommandLine::StringVector args =
+      base::CommandLine::ForCurrentProcess()->GetArgs();
 
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;