Remove //gpu/{blink,ipc}, gyp files, DEPS files

We don't use Blink, chromium's //ipc system or gyp builds here.

TBR=viettrungluu@chromium.org

Review URL: https://codereview.chromium.org/1053393002
diff --git a/gpu/DEPS b/gpu/DEPS
deleted file mode 100644
index 6b8aacb..0000000
--- a/gpu/DEPS
+++ /dev/null
@@ -1,11 +0,0 @@
-include_rules = [
-  "+third_party/angle",
-  "+third_party/amd",
-  "+third_party/re2",
-  "+third_party/smhasher",
-  "+third_party/protbuf",
-  "+crypto",
-  "+ui/gfx",
-  "+ui/gl",
-  "+ui/surface",
-]
diff --git a/gpu/blink/BUILD.gn b/gpu/blink/BUILD.gn
deleted file mode 100644
index 7d08ba1..0000000
--- a/gpu/blink/BUILD.gn
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.
-
-# GYP version: gpu/blink/gpu_blink.gyp:gpu_blink
-component("blink") {
-  output_name = "gpu_blink"
-
-  sources = [
-    "gpu_blink_export.h",
-    "webgraphicscontext3d_impl.cc",
-    "webgraphicscontext3d_impl.h",
-    "webgraphicscontext3d_in_process_command_buffer_impl.cc",
-    "webgraphicscontext3d_in_process_command_buffer_impl.h",
-  ]
-
-  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
-  defines = [ "GPU_BLINK_IMPLEMENTATION" ]
-
-  deps = [
-    "//base",
-    "//base/third_party/dynamic_annotations",
-    "//cc",
-    "//gpu/command_buffer/common",
-    "//gpu/command_buffer/service",
-    "//gpu/command_buffer/client:gles2_c_lib",
-    "//gpu/command_buffer/client:gles2_implementation",
-    "//gpu/command_buffer/client:gl_in_process_context",
-    "//gpu/skia_bindings",
-    "//skia",
-    "//third_party/WebKit/public:blink_minimal",
-    "//third_party/angle:translator",
-    "//ui/gl",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-  ]
-}
diff --git a/gpu/blink/DEPS b/gpu/blink/DEPS
deleted file mode 100644
index c8199ab..0000000
--- a/gpu/blink/DEPS
+++ /dev/null
@@ -1,4 +0,0 @@
-include_rules = [
-  "+third_party/WebKit/public/platform",
-  "+third_party/khronos/GLES2",
-]
diff --git a/gpu/blink/gpu_blink.gyp b/gpu/blink/gpu_blink.gyp
deleted file mode 100644
index 06a7c12..0000000
--- a/gpu/blink/gpu_blink.gyp
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.
-
-{
-  'conditions': [
-    ['OS != "ios"', {
-      'targets': [
-        {
-          # GN version: //gpu/blink
-          'target_name': 'gpu_blink',
-          'type': '<(component)',
-          'variables': {
-            'chromium_code': 1,
-            'enable_wexit_time_destructors': 1,
-          },
-          'dependencies': [
-            '<(DEPTH)/base/base.gyp:base',
-            '<(DEPTH)/cc/cc.gyp:cc',
-            '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-            '<(DEPTH)/gpu/command_buffer/command_buffer.gyp:gles2_utils',
-            '<(DEPTH)/gpu/gpu.gyp:command_buffer_service',
-            '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
-            '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
-            '<(DEPTH)/gpu/gpu.gyp:gl_in_process_context',
-            '<(DEPTH)/gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
-            '<(DEPTH)/skia/skia.gyp:skia',
-            '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
-            '<(angle_path)/src/angle.gyp:translator',
-            '<(DEPTH)/ui/gl/gl.gyp:gl',
-            '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
-            '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
-          ],
-          'sources': [
-            'gpu_blink_export.h',
-            'webgraphicscontext3d_impl.cc',
-            'webgraphicscontext3d_impl.h',
-            'webgraphicscontext3d_in_process_command_buffer_impl.cc',
-            'webgraphicscontext3d_in_process_command_buffer_impl.h',
-          ],
-          'defines': [
-            'GPU_BLINK_IMPLEMENTATION',
-          ],
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [ 4267, ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/gpu/blink/gpu_blink_export.h b/gpu/blink/gpu_blink_export.h
deleted file mode 100644
index ee69750..0000000
--- a/gpu/blink/gpu_blink_export.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// 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.
-
-#ifndef GPU_BLINK_GPU_BLINK_EXPORT_H_
-#define GPU_BLINK_GPU_BLINK_EXPORT_H_
-
-#if defined(COMPONENT_BUILD)
-#if defined(WIN32)
-
-#if defined(GPU_BLINK_IMPLEMENTATION)
-#define GPU_BLINK_EXPORT __declspec(dllexport)
-#else
-#define GPU_BLINK_EXPORT __declspec(dllimport)
-#endif  // defined(GPU_BLINK_IMPLEMENTATION)
-
-#else // defined(WIN32)
-#if defined(GPU_BLINK_IMPLEMENTATION)
-#define GPU_BLINK_EXPORT __attribute__((visibility("default")))
-#else
-#define GPU_BLINK_EXPORT
-#endif
-#endif
-
-#else // defined(COMPONENT_BUILD)
-#define GPU_BLINK_EXPORT
-#endif
-
-#endif  // GPU_BLINK_GPU_BLINK_EXPORT_H_
diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc
deleted file mode 100644
index e469532..0000000
--- a/gpu/blink/webgraphicscontext3d_impl.cc
+++ /dev/null
@@ -1,1238 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "gpu/blink/webgraphicscontext3d_impl.h"
-
-#include "base/atomicops.h"
-#include "base/lazy_instance.h"
-#include "base/logging.h"
-#include "gpu/GLES2/gl2extchromium.h"
-#include "gpu/command_buffer/client/gles2_implementation.h"
-#include "gpu/command_buffer/client/gles2_lib.h"
-#include "gpu/command_buffer/common/gles2_cmd_utils.h"
-#include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h"
-
-#include "third_party/khronos/GLES2/gl2.h"
-#ifndef GL_GLEXT_PROTOTYPES
-#define GL_GLEXT_PROTOTYPES 1
-#endif
-#include "third_party/khronos/GLES2/gl2ext.h"
-
-using blink::WGC3Dbitfield;
-using blink::WGC3Dboolean;
-using blink::WGC3Dbyte;
-using blink::WGC3Dchar;
-using blink::WGC3Dclampf;
-using blink::WGC3Denum;
-using blink::WGC3Dfloat;
-using blink::WGC3Dint;
-using blink::WGC3Dintptr;
-using blink::WGC3Dsizei;
-using blink::WGC3Dsizeiptr;
-using blink::WGC3Duint64;
-using blink::WGC3Duint;
-using blink::WebGLId;
-
-namespace gpu_blink {
-
-namespace {
-
-uint32_t GenFlushID() {
-  static base::subtle::Atomic32 flush_id = 0;
-
-  base::subtle::Atomic32 my_id = base::subtle::Barrier_AtomicIncrement(
-      &flush_id, 1);
-  return static_cast<uint32_t>(my_id);
-}
-
-} // namespace anonymous
-
-class WebGraphicsContext3DErrorMessageCallback
-    : public ::gpu::gles2::GLES2ImplementationErrorMessageCallback {
- public:
-  WebGraphicsContext3DErrorMessageCallback(
-      WebGraphicsContext3DImpl* context)
-      : graphics_context_(context) {
-  }
-
-  void OnErrorMessage(const char* msg, int id) override;
-
- private:
-  WebGraphicsContext3DImpl* graphics_context_;
-
-  DISALLOW_COPY_AND_ASSIGN(WebGraphicsContext3DErrorMessageCallback);
-};
-
-void WebGraphicsContext3DErrorMessageCallback::OnErrorMessage(
-    const char* msg, int id) {
-  graphics_context_->OnErrorMessage(msg, id);
-}
-
-// Helper macros to reduce the amount of code.
-
-#define DELEGATE_TO_GL(name, glname)                                    \
-void WebGraphicsContext3DImpl::name() {                                 \
-  gl_->glname();                                                        \
-}
-
-#define DELEGATE_TO_GL_R(name, glname, rt)                              \
-rt WebGraphicsContext3DImpl::name() {                                   \
-  return gl_->glname();                                                 \
-}
-
-#define DELEGATE_TO_GL_1(name, glname, t1)                              \
-void WebGraphicsContext3DImpl::name(t1 a1) {                            \
-  gl_->glname(a1);                                                      \
-}
-
-#define DELEGATE_TO_GL_1R(name, glname, t1, rt)                         \
-rt WebGraphicsContext3DImpl::name(t1 a1) {                              \
-  return gl_->glname(a1);                                               \
-}
-
-#define DELEGATE_TO_GL_1RB(name, glname, t1, rt)                        \
-rt WebGraphicsContext3DImpl::name(t1 a1) {                              \
-  return gl_->glname(a1) ? true : false;                                \
-}
-
-#define DELEGATE_TO_GL_2(name, glname, t1, t2)                          \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2) {                     \
-  gl_->glname(a1, a2);                                                  \
-}
-
-#define DELEGATE_TO_GL_2R(name, glname, t1, t2, rt)                     \
-rt WebGraphicsContext3DImpl::name(t1 a1, t2 a2) {                       \
-  return gl_->glname(a1, a2);                                           \
-}
-
-#define DELEGATE_TO_GL_3(name, glname, t1, t2, t3)                      \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3) {              \
-  gl_->glname(a1, a2, a3);                                              \
-}
-
-#define DELEGATE_TO_GL_3R(name, glname, t1, t2, t3, rt)                 \
-rt WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3) {                \
-  return gl_->glname(a1, a2, a3);                                       \
-}
-
-#define DELEGATE_TO_GL_4(name, glname, t1, t2, t3, t4)                  \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4) {       \
-  gl_->glname(a1, a2, a3, a4);                                          \
-}
-
-#define DELEGATE_TO_GL_4R(name, glname, t1, t2, t3, t4, rt)             \
-rt WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4) {         \
-  return gl_->glname(a1, a2, a3, a4);                                   \
-}
-
-#define DELEGATE_TO_GL_5(name, glname, t1, t2, t3, t4, t5)              \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5) {\
-                                                                        \
-  gl_->glname(a1, a2, a3, a4, a5);                                      \
-}
-
-#define DELEGATE_TO_GL_6(name, glname, t1, t2, t3, t4, t5, t6)          \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,  \
-                                    t6 a6) {                            \
-  gl_->glname(a1, a2, a3, a4, a5, a6);                                  \
-}
-
-#define DELEGATE_TO_GL_7(name, glname, t1, t2, t3, t4, t5, t6, t7)      \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,  \
-                                    t6 a6, t7 a7) {                     \
-  gl_->glname(a1, a2, a3, a4, a5, a6, a7);                              \
-}
-
-#define DELEGATE_TO_GL_8(name, glname, t1, t2, t3, t4, t5, t6, t7, t8)  \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,  \
-                                    t6 a6, t7 a7, t8 a8) {              \
-  gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8);                          \
-}
-
-#define DELEGATE_TO_GL_9(name, glname, t1, t2, t3, t4, t5, t6, t7, t8, t9) \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,  \
-                                    t6 a6, t7 a7, t8 a8, t9 a9) {       \
-  gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8, a9);                      \
-}
-
-#define DELEGATE_TO_GL_9R(name, glname, t1, t2, t3, t4, t5, t6, t7, t8, \
-                          t9, rt)                                       \
-rt WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,    \
-                                    t6 a6, t7 a7, t8 a8, t9 a9) {       \
-  return gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8, a9);               \
-}
-
-#define DELEGATE_TO_GL_10(name, glname, t1, t2, t3, t4, t5, t6, t7, t8, \
-                          t9, t10)                                      \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,  \
-                                    t6 a6, t7 a7, t8 a8, t9 a9,         \
-                                    t10 a10) {                          \
-  gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);                 \
-}
-
-#define DELEGATE_TO_GL_11(name, glname, t1, t2, t3, t4, t5, t6, t7, t8, \
-                          t9, t10, t11)                                 \
-void WebGraphicsContext3DImpl::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5,  \
-                                    t6 a6, t7 a7, t8 a8, t9 a9, t10 a10,\
-                                    t11 a11) {                          \
-  gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);            \
-}
-
-WebGraphicsContext3DImpl::WebGraphicsContext3DImpl()
-    : initialized_(false),
-      initialize_failed_(false),
-      context_lost_callback_(0),
-      context_lost_reason_(GL_NO_ERROR),
-      error_message_callback_(0),
-      gl_(NULL),
-      flush_id_(0) {
-}
-
-WebGraphicsContext3DImpl::~WebGraphicsContext3DImpl() {
-
-}
-
-void WebGraphicsContext3DImpl::synthesizeGLError(WGC3Denum error) {
-  if (std::find(synthetic_errors_.begin(), synthetic_errors_.end(), error) ==
-      synthetic_errors_.end()) {
-    synthetic_errors_.push_back(error);
-  }
-}
-
-uint32_t WebGraphicsContext3DImpl::lastFlushID() {
-  return flush_id_;
-}
-
-DELEGATE_TO_GL_R(insertSyncPoint, InsertSyncPointCHROMIUM, unsigned int)
-
-DELEGATE_TO_GL_3(reshapeWithScaleFactor, ResizeCHROMIUM, int, int, float)
-
-DELEGATE_TO_GL_4R(mapBufferSubDataCHROMIUM, MapBufferSubDataCHROMIUM, WGC3Denum,
-                  WGC3Dintptr, WGC3Dsizeiptr, WGC3Denum, void*)
-
-DELEGATE_TO_GL_1(unmapBufferSubDataCHROMIUM, UnmapBufferSubDataCHROMIUM,
-                 const void*)
-
-DELEGATE_TO_GL_9R(mapTexSubImage2DCHROMIUM, MapTexSubImage2DCHROMIUM, WGC3Denum,
-                  WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei,
-                  WGC3Denum, WGC3Denum, WGC3Denum, void*)
-
-DELEGATE_TO_GL_1(unmapTexSubImage2DCHROMIUM, UnmapTexSubImage2DCHROMIUM,
-                 const void*)
-
-DELEGATE_TO_GL_3(discardFramebufferEXT, DiscardFramebufferEXT, WGC3Denum,
-                 WGC3Dsizei, const WGC3Denum*)
-
-blink::WebString WebGraphicsContext3DImpl::
-    getRequestableExtensionsCHROMIUM() {
-  return blink::WebString::fromUTF8(
-      gl_->GetRequestableExtensionsCHROMIUM());
-}
-
-DELEGATE_TO_GL_1(requestExtensionCHROMIUM, RequestExtensionCHROMIUM,
-                 const char*)
-
-void WebGraphicsContext3DImpl::blitFramebufferCHROMIUM(
-    WGC3Dint srcX0, WGC3Dint srcY0, WGC3Dint srcX1, WGC3Dint srcY1,
-    WGC3Dint dstX0, WGC3Dint dstY0, WGC3Dint dstX1, WGC3Dint dstY1,
-    WGC3Dbitfield mask, WGC3Denum filter) {
-  gl_->BlitFramebufferCHROMIUM(
-      srcX0, srcY0, srcX1, srcY1,
-      dstX0, dstY0, dstX1, dstY1,
-      mask, filter);
-}
-
-DELEGATE_TO_GL_5(renderbufferStorageMultisampleCHROMIUM,
-                 RenderbufferStorageMultisampleCHROMIUM, WGC3Denum, WGC3Dsizei,
-                 WGC3Denum, WGC3Dsizei, WGC3Dsizei)
-
-DELEGATE_TO_GL_1(activeTexture, ActiveTexture, WGC3Denum)
-
-DELEGATE_TO_GL_2(attachShader, AttachShader, WebGLId, WebGLId)
-
-DELEGATE_TO_GL_3(bindAttribLocation, BindAttribLocation, WebGLId,
-                 WGC3Duint, const WGC3Dchar*)
-
-DELEGATE_TO_GL_2(bindBuffer, BindBuffer, WGC3Denum, WebGLId)
-
-DELEGATE_TO_GL_2(bindFramebuffer, BindFramebuffer, WGC3Denum, WebGLId)
-
-DELEGATE_TO_GL_2(bindRenderbuffer, BindRenderbuffer, WGC3Denum, WebGLId)
-
-DELEGATE_TO_GL_2(bindTexture, BindTexture, WGC3Denum, WebGLId)
-
-DELEGATE_TO_GL_4(blendColor, BlendColor,
-                 WGC3Dclampf, WGC3Dclampf, WGC3Dclampf, WGC3Dclampf)
-
-DELEGATE_TO_GL_1(blendEquation, BlendEquation, WGC3Denum)
-
-DELEGATE_TO_GL_2(blendEquationSeparate, BlendEquationSeparate,
-                 WGC3Denum, WGC3Denum)
-
-DELEGATE_TO_GL_2(blendFunc, BlendFunc, WGC3Denum, WGC3Denum)
-
-DELEGATE_TO_GL_4(blendFuncSeparate, BlendFuncSeparate,
-                 WGC3Denum, WGC3Denum, WGC3Denum, WGC3Denum)
-
-DELEGATE_TO_GL_4(bufferData, BufferData,
-                 WGC3Denum, WGC3Dsizeiptr, const void*, WGC3Denum)
-
-DELEGATE_TO_GL_4(bufferSubData, BufferSubData,
-                 WGC3Denum, WGC3Dintptr, WGC3Dsizeiptr, const void*)
-
-DELEGATE_TO_GL_1R(checkFramebufferStatus, CheckFramebufferStatus,
-                  WGC3Denum, WGC3Denum)
-
-DELEGATE_TO_GL_1(clear, Clear, WGC3Dbitfield)
-
-DELEGATE_TO_GL_4(clearColor, ClearColor,
-                 WGC3Dclampf, WGC3Dclampf, WGC3Dclampf, WGC3Dclampf)
-
-DELEGATE_TO_GL_1(clearDepth, ClearDepthf, WGC3Dclampf)
-
-DELEGATE_TO_GL_1(clearStencil, ClearStencil, WGC3Dint)
-
-DELEGATE_TO_GL_4(colorMask, ColorMask,
-                 WGC3Dboolean, WGC3Dboolean, WGC3Dboolean, WGC3Dboolean)
-
-DELEGATE_TO_GL_1(compileShader, CompileShader, WebGLId)
-
-DELEGATE_TO_GL_8(compressedTexImage2D, CompressedTexImage2D,
-                 WGC3Denum, WGC3Dint, WGC3Denum, WGC3Dint, WGC3Dint,
-                 WGC3Dsizei, WGC3Dsizei, const void*)
-
-DELEGATE_TO_GL_9(compressedTexSubImage2D, CompressedTexSubImage2D,
-                 WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint,
-                 WGC3Denum, WGC3Dsizei, const void*)
-
-DELEGATE_TO_GL_8(copyTexImage2D, CopyTexImage2D,
-                 WGC3Denum, WGC3Dint, WGC3Denum, WGC3Dint, WGC3Dint,
-                 WGC3Dsizei, WGC3Dsizei, WGC3Dint)
-
-DELEGATE_TO_GL_8(copyTexSubImage2D, CopyTexSubImage2D,
-                 WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint,
-                 WGC3Dsizei, WGC3Dsizei)
-
-DELEGATE_TO_GL_1(cullFace, CullFace, WGC3Denum)
-
-DELEGATE_TO_GL_1(depthFunc, DepthFunc, WGC3Denum)
-
-DELEGATE_TO_GL_1(depthMask, DepthMask, WGC3Dboolean)
-
-DELEGATE_TO_GL_2(depthRange, DepthRangef, WGC3Dclampf, WGC3Dclampf)
-
-DELEGATE_TO_GL_2(detachShader, DetachShader, WebGLId, WebGLId)
-
-DELEGATE_TO_GL_1(disable, Disable, WGC3Denum)
-
-DELEGATE_TO_GL_1(disableVertexAttribArray, DisableVertexAttribArray,
-                 WGC3Duint)
-
-DELEGATE_TO_GL_3(drawArrays, DrawArrays, WGC3Denum, WGC3Dint, WGC3Dsizei)
-
-void WebGraphicsContext3DImpl::drawElements(WGC3Denum mode,
-                                                         WGC3Dsizei count,
-                                                         WGC3Denum type,
-                                                         WGC3Dintptr offset) {
-  gl_->DrawElements(
-      mode, count, type,
-      reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
-}
-
-DELEGATE_TO_GL_1(enable, Enable, WGC3Denum)
-
-DELEGATE_TO_GL_1(enableVertexAttribArray, EnableVertexAttribArray,
-                 WGC3Duint)
-
-void WebGraphicsContext3DImpl::finish() {
-  flush_id_ = GenFlushID();
-  gl_->Finish();
-}
-
-void WebGraphicsContext3DImpl::flush() {
-  flush_id_ = GenFlushID();
-  gl_->Flush();
-}
-
-DELEGATE_TO_GL_4(framebufferRenderbuffer, FramebufferRenderbuffer,
-                 WGC3Denum, WGC3Denum, WGC3Denum, WebGLId)
-
-DELEGATE_TO_GL_5(framebufferTexture2D, FramebufferTexture2D,
-                 WGC3Denum, WGC3Denum, WGC3Denum, WebGLId, WGC3Dint)
-
-DELEGATE_TO_GL_1(frontFace, FrontFace, WGC3Denum)
-
-DELEGATE_TO_GL_1(generateMipmap, GenerateMipmap, WGC3Denum)
-
-bool WebGraphicsContext3DImpl::getActiveAttrib(
-    WebGLId program, WGC3Duint index, ActiveInfo& info) {
-  if (!program) {
-    synthesizeGLError(GL_INVALID_VALUE);
-    return false;
-  }
-  GLint max_name_length = -1;
-  gl_->GetProgramiv(
-      program, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, &max_name_length);
-  if (max_name_length < 0)
-    return false;
-  if (max_name_length == 0) {
-    // No active attributes exist.
-    synthesizeGLError(GL_INVALID_VALUE);
-    return false;
-  }
-  scoped_ptr<GLchar[]> name(new GLchar[max_name_length]);
-  GLsizei length = 0;
-  GLint size = -1;
-  GLenum type = 0;
-  gl_->GetActiveAttrib(
-      program, index, max_name_length, &length, &size, &type, name.get());
-  if (size < 0) {
-    return false;
-  }
-  info.name = blink::WebString::fromUTF8(name.get(), length);
-  info.type = type;
-  info.size = size;
-  return true;
-}
-
-bool WebGraphicsContext3DImpl::getActiveUniform(
-    WebGLId program, WGC3Duint index, ActiveInfo& info) {
-  GLint max_name_length = -1;
-  gl_->GetProgramiv(
-      program, GL_ACTIVE_UNIFORM_MAX_LENGTH, &max_name_length);
-  if (max_name_length < 0)
-    return false;
-  if (max_name_length == 0) {
-    // No active uniforms exist.
-    synthesizeGLError(GL_INVALID_VALUE);
-    return false;
-  }
-  scoped_ptr<GLchar[]> name(new GLchar[max_name_length]);
-  GLsizei length = 0;
-  GLint size = -1;
-  GLenum type = 0;
-  gl_->GetActiveUniform(
-      program, index, max_name_length, &length, &size, &type, name.get());
-  if (size < 0) {
-    return false;
-  }
-  info.name = blink::WebString::fromUTF8(name.get(), length);
-  info.type = type;
-  info.size = size;
-  return true;
-}
-
-DELEGATE_TO_GL_4(getAttachedShaders, GetAttachedShaders,
-                 WebGLId, WGC3Dsizei, WGC3Dsizei*, WebGLId*)
-
-DELEGATE_TO_GL_2R(getAttribLocation, GetAttribLocation,
-                  WebGLId, const WGC3Dchar*, WGC3Dint)
-
-DELEGATE_TO_GL_2(getBooleanv, GetBooleanv, WGC3Denum, WGC3Dboolean*)
-
-DELEGATE_TO_GL_3(getBufferParameteriv, GetBufferParameteriv,
-                 WGC3Denum, WGC3Denum, WGC3Dint*)
-
-WGC3Denum WebGraphicsContext3DImpl::getError() {
-  if (!synthetic_errors_.empty()) {
-    std::vector<WGC3Denum>::iterator iter = synthetic_errors_.begin();
-    WGC3Denum err = *iter;
-    synthetic_errors_.erase(iter);
-    return err;
-  }
-
-  return gl_->GetError();
-}
-
-DELEGATE_TO_GL_2(getFloatv, GetFloatv, WGC3Denum, WGC3Dfloat*)
-
-DELEGATE_TO_GL_4(getFramebufferAttachmentParameteriv,
-                 GetFramebufferAttachmentParameteriv,
-                 WGC3Denum, WGC3Denum, WGC3Denum, WGC3Dint*)
-
-DELEGATE_TO_GL_2(getIntegerv, GetIntegerv, WGC3Denum, WGC3Dint*)
-
-DELEGATE_TO_GL_3(getProgramiv, GetProgramiv, WebGLId, WGC3Denum, WGC3Dint*)
-
-blink::WebString WebGraphicsContext3DImpl::getProgramInfoLog(
-    WebGLId program) {
-  GLint logLength = 0;
-  gl_->GetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength);
-  if (!logLength)
-    return blink::WebString();
-  scoped_ptr<GLchar[]> log(new GLchar[logLength]);
-  if (!log)
-    return blink::WebString();
-  GLsizei returnedLogLength = 0;
-  gl_->GetProgramInfoLog(
-      program, logLength, &returnedLogLength, log.get());
-  DCHECK_EQ(logLength, returnedLogLength + 1);
-  blink::WebString res =
-      blink::WebString::fromUTF8(log.get(), returnedLogLength);
-  return res;
-}
-
-DELEGATE_TO_GL_3(getRenderbufferParameteriv, GetRenderbufferParameteriv,
-                 WGC3Denum, WGC3Denum, WGC3Dint*)
-
-DELEGATE_TO_GL_3(getShaderiv, GetShaderiv, WebGLId, WGC3Denum, WGC3Dint*)
-
-blink::WebString WebGraphicsContext3DImpl::getShaderInfoLog(
-    WebGLId shader) {
-  GLint logLength = 0;
-  gl_->GetShaderiv(shader, GL_INFO_LOG_LENGTH, &logLength);
-  if (!logLength)
-    return blink::WebString();
-  scoped_ptr<GLchar[]> log(new GLchar[logLength]);
-  if (!log)
-    return blink::WebString();
-  GLsizei returnedLogLength = 0;
-  gl_->GetShaderInfoLog(
-      shader, logLength, &returnedLogLength, log.get());
-  DCHECK_EQ(logLength, returnedLogLength + 1);
-  blink::WebString res =
-      blink::WebString::fromUTF8(log.get(), returnedLogLength);
-  return res;
-}
-
-DELEGATE_TO_GL_4(getShaderPrecisionFormat, GetShaderPrecisionFormat,
-                 WGC3Denum, WGC3Denum, WGC3Dint*, WGC3Dint*)
-
-blink::WebString WebGraphicsContext3DImpl::getShaderSource(
-    WebGLId shader) {
-  GLint logLength = 0;
-  gl_->GetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &logLength);
-  if (!logLength)
-    return blink::WebString();
-  scoped_ptr<GLchar[]> log(new GLchar[logLength]);
-  if (!log)
-    return blink::WebString();
-  GLsizei returnedLogLength = 0;
-  gl_->GetShaderSource(
-      shader, logLength, &returnedLogLength, log.get());
-  if (!returnedLogLength)
-    return blink::WebString();
-  DCHECK_EQ(logLength, returnedLogLength + 1);
-  blink::WebString res =
-      blink::WebString::fromUTF8(log.get(), returnedLogLength);
-  return res;
-}
-
-blink::WebString WebGraphicsContext3DImpl::
-    getTranslatedShaderSourceANGLE(WebGLId shader) {
-  GLint logLength = 0;
-  gl_->GetShaderiv(
-      shader, GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE, &logLength);
-  if (!logLength)
-    return blink::WebString();
-  scoped_ptr<GLchar[]> log(new GLchar[logLength]);
-  if (!log)
-    return blink::WebString();
-  GLsizei returnedLogLength = 0;
-  gl_->GetTranslatedShaderSourceANGLE(
-      shader, logLength, &returnedLogLength, log.get());
-  if (!returnedLogLength)
-    return blink::WebString();
-  DCHECK_EQ(logLength, returnedLogLength + 1);
-  blink::WebString res =
-      blink::WebString::fromUTF8(log.get(), returnedLogLength);
-  return res;
-}
-
-blink::WebString WebGraphicsContext3DImpl::getString(
-    WGC3Denum name) {
-  return blink::WebString::fromUTF8(
-      reinterpret_cast<const char*>(gl_->GetString(name)));
-}
-
-DELEGATE_TO_GL_3(getTexParameterfv, GetTexParameterfv,
-                 WGC3Denum, WGC3Denum, WGC3Dfloat*)
-
-DELEGATE_TO_GL_3(getTexParameteriv, GetTexParameteriv,
-                 WGC3Denum, WGC3Denum, WGC3Dint*)
-
-DELEGATE_TO_GL_3(getUniformfv, GetUniformfv, WebGLId, WGC3Dint, WGC3Dfloat*)
-
-DELEGATE_TO_GL_3(getUniformiv, GetUniformiv, WebGLId, WGC3Dint, WGC3Dint*)
-
-DELEGATE_TO_GL_2R(getUniformLocation, GetUniformLocation,
-                  WebGLId, const WGC3Dchar*, WGC3Dint)
-
-DELEGATE_TO_GL_3(getVertexAttribfv, GetVertexAttribfv,
-                 WGC3Duint, WGC3Denum, WGC3Dfloat*)
-
-DELEGATE_TO_GL_3(getVertexAttribiv, GetVertexAttribiv,
-                 WGC3Duint, WGC3Denum, WGC3Dint*)
-
-WGC3Dsizeiptr WebGraphicsContext3DImpl::getVertexAttribOffset(
-    WGC3Duint index, WGC3Denum pname) {
-  GLvoid* value = NULL;
-  // NOTE: If pname is ever a value that returns more then 1 element
-  // this will corrupt memory.
-  gl_->GetVertexAttribPointerv(index, pname, &value);
-  return static_cast<WGC3Dsizeiptr>(reinterpret_cast<intptr_t>(value));
-}
-
-DELEGATE_TO_GL_2(hint, Hint, WGC3Denum, WGC3Denum)
-
-DELEGATE_TO_GL_1RB(isBuffer, IsBuffer, WebGLId, WGC3Dboolean)
-
-DELEGATE_TO_GL_1RB(isEnabled, IsEnabled, WGC3Denum, WGC3Dboolean)
-
-DELEGATE_TO_GL_1RB(isFramebuffer, IsFramebuffer, WebGLId, WGC3Dboolean)
-
-DELEGATE_TO_GL_1RB(isProgram, IsProgram, WebGLId, WGC3Dboolean)
-
-DELEGATE_TO_GL_1RB(isRenderbuffer, IsRenderbuffer, WebGLId, WGC3Dboolean)
-
-DELEGATE_TO_GL_1RB(isShader, IsShader, WebGLId, WGC3Dboolean)
-
-DELEGATE_TO_GL_1RB(isTexture, IsTexture, WebGLId, WGC3Dboolean)
-
-DELEGATE_TO_GL_1(lineWidth, LineWidth, WGC3Dfloat)
-
-DELEGATE_TO_GL_1(linkProgram, LinkProgram, WebGLId)
-
-DELEGATE_TO_GL_2(pixelStorei, PixelStorei, WGC3Denum, WGC3Dint)
-
-DELEGATE_TO_GL_2(polygonOffset, PolygonOffset, WGC3Dfloat, WGC3Dfloat)
-
-DELEGATE_TO_GL_7(readPixels, ReadPixels,
-                 WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei, WGC3Denum,
-                 WGC3Denum, void*)
-
-DELEGATE_TO_GL_4(renderbufferStorage, RenderbufferStorage,
-                 WGC3Denum, WGC3Denum, WGC3Dsizei, WGC3Dsizei)
-
-DELEGATE_TO_GL_2(sampleCoverage, SampleCoverage, WGC3Dfloat, WGC3Dboolean)
-
-DELEGATE_TO_GL_4(scissor, Scissor, WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei)
-
-void WebGraphicsContext3DImpl::shaderSource(
-    WebGLId shader, const WGC3Dchar* string) {
-  GLint length = strlen(string);
-  gl_->ShaderSource(shader, 1, &string, &length);
-}
-
-DELEGATE_TO_GL_3(stencilFunc, StencilFunc, WGC3Denum, WGC3Dint, WGC3Duint)
-
-DELEGATE_TO_GL_4(stencilFuncSeparate, StencilFuncSeparate,
-                 WGC3Denum, WGC3Denum, WGC3Dint, WGC3Duint)
-
-DELEGATE_TO_GL_1(stencilMask, StencilMask, WGC3Duint)
-
-DELEGATE_TO_GL_2(stencilMaskSeparate, StencilMaskSeparate,
-                 WGC3Denum, WGC3Duint)
-
-DELEGATE_TO_GL_3(stencilOp, StencilOp,
-                 WGC3Denum, WGC3Denum, WGC3Denum)
-
-DELEGATE_TO_GL_4(stencilOpSeparate, StencilOpSeparate,
-                 WGC3Denum, WGC3Denum, WGC3Denum, WGC3Denum)
-
-DELEGATE_TO_GL_9(texImage2D, TexImage2D,
-                 WGC3Denum, WGC3Dint, WGC3Denum, WGC3Dsizei, WGC3Dsizei,
-                 WGC3Dint, WGC3Denum, WGC3Denum, const void*)
-
-DELEGATE_TO_GL_3(texParameterf, TexParameterf,
-                 WGC3Denum, WGC3Denum, WGC3Dfloat);
-
-static const unsigned int kTextureWrapR = 0x8072;
-
-void WebGraphicsContext3DImpl::texParameteri(
-    WGC3Denum target, WGC3Denum pname, WGC3Dint param) {
-  // TODO(kbr): figure out whether the setting of TEXTURE_WRAP_R in
-  // GraphicsContext3D.cpp is strictly necessary to avoid seams at the
-  // edge of cube maps, and, if it is, push it into the GLES2 service
-  // side code.
-  if (pname == kTextureWrapR) {
-    return;
-  }
-  gl_->TexParameteri(target, pname, param);
-}
-
-DELEGATE_TO_GL_9(texSubImage2D, TexSubImage2D,
-                 WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei,
-                 WGC3Dsizei, WGC3Denum, WGC3Denum, const void*)
-
-DELEGATE_TO_GL_2(uniform1f, Uniform1f, WGC3Dint, WGC3Dfloat)
-
-DELEGATE_TO_GL_3(uniform1fv, Uniform1fv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Dfloat*)
-
-DELEGATE_TO_GL_2(uniform1i, Uniform1i, WGC3Dint, WGC3Dint)
-
-DELEGATE_TO_GL_3(uniform1iv, Uniform1iv, WGC3Dint, WGC3Dsizei, const WGC3Dint*)
-
-DELEGATE_TO_GL_3(uniform2f, Uniform2f, WGC3Dint, WGC3Dfloat, WGC3Dfloat)
-
-DELEGATE_TO_GL_3(uniform2fv, Uniform2fv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Dfloat*)
-
-DELEGATE_TO_GL_3(uniform2i, Uniform2i, WGC3Dint, WGC3Dint, WGC3Dint)
-
-DELEGATE_TO_GL_3(uniform2iv, Uniform2iv, WGC3Dint, WGC3Dsizei, const WGC3Dint*)
-
-DELEGATE_TO_GL_4(uniform3f, Uniform3f, WGC3Dint,
-                 WGC3Dfloat, WGC3Dfloat, WGC3Dfloat)
-
-DELEGATE_TO_GL_3(uniform3fv, Uniform3fv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Dfloat*)
-
-DELEGATE_TO_GL_4(uniform3i, Uniform3i, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint)
-
-DELEGATE_TO_GL_3(uniform3iv, Uniform3iv, WGC3Dint, WGC3Dsizei, const WGC3Dint*)
-
-DELEGATE_TO_GL_5(uniform4f, Uniform4f, WGC3Dint,
-                 WGC3Dfloat, WGC3Dfloat, WGC3Dfloat, WGC3Dfloat)
-
-DELEGATE_TO_GL_3(uniform4fv, Uniform4fv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Dfloat*)
-
-DELEGATE_TO_GL_5(uniform4i, Uniform4i, WGC3Dint,
-                 WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint)
-
-DELEGATE_TO_GL_3(uniform4iv, Uniform4iv, WGC3Dint, WGC3Dsizei, const WGC3Dint*)
-
-DELEGATE_TO_GL_4(uniformMatrix2fv, UniformMatrix2fv,
-                 WGC3Dint, WGC3Dsizei, WGC3Dboolean, const WGC3Dfloat*)
-
-DELEGATE_TO_GL_4(uniformMatrix3fv, UniformMatrix3fv,
-                 WGC3Dint, WGC3Dsizei, WGC3Dboolean, const WGC3Dfloat*)
-
-DELEGATE_TO_GL_4(uniformMatrix4fv, UniformMatrix4fv,
-                 WGC3Dint, WGC3Dsizei, WGC3Dboolean, const WGC3Dfloat*)
-
-DELEGATE_TO_GL_1(useProgram, UseProgram, WebGLId)
-
-DELEGATE_TO_GL_1(validateProgram, ValidateProgram, WebGLId)
-
-DELEGATE_TO_GL_2(vertexAttrib1f, VertexAttrib1f, WGC3Duint, WGC3Dfloat)
-
-DELEGATE_TO_GL_2(vertexAttrib1fv, VertexAttrib1fv, WGC3Duint,
-                 const WGC3Dfloat*)
-
-DELEGATE_TO_GL_3(vertexAttrib2f, VertexAttrib2f, WGC3Duint,
-                 WGC3Dfloat, WGC3Dfloat)
-
-DELEGATE_TO_GL_2(vertexAttrib2fv, VertexAttrib2fv, WGC3Duint,
-                 const WGC3Dfloat*)
-
-DELEGATE_TO_GL_4(vertexAttrib3f, VertexAttrib3f, WGC3Duint,
-                 WGC3Dfloat, WGC3Dfloat, WGC3Dfloat)
-
-DELEGATE_TO_GL_2(vertexAttrib3fv, VertexAttrib3fv, WGC3Duint,
-                 const WGC3Dfloat*)
-
-DELEGATE_TO_GL_5(vertexAttrib4f, VertexAttrib4f, WGC3Duint,
-                 WGC3Dfloat, WGC3Dfloat, WGC3Dfloat, WGC3Dfloat)
-
-DELEGATE_TO_GL_2(vertexAttrib4fv, VertexAttrib4fv, WGC3Duint,
-                 const WGC3Dfloat*)
-
-void WebGraphicsContext3DImpl::vertexAttribPointer(
-    WGC3Duint index, WGC3Dint size, WGC3Denum type, WGC3Dboolean normalized,
-    WGC3Dsizei stride, WGC3Dintptr offset) {
-  gl_->VertexAttribPointer(
-      index, size, type, normalized, stride,
-      reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
-}
-
-DELEGATE_TO_GL_4(viewport, Viewport,
-                 WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei)
-
-WebGLId WebGraphicsContext3DImpl::createBuffer() {
-  GLuint o;
-  gl_->GenBuffers(1, &o);
-  return o;
-}
-
-WebGLId WebGraphicsContext3DImpl::createFramebuffer() {
-  GLuint o = 0;
-  gl_->GenFramebuffers(1, &o);
-  return o;
-}
-
-WebGLId WebGraphicsContext3DImpl::createRenderbuffer() {
-  GLuint o;
-  gl_->GenRenderbuffers(1, &o);
-  return o;
-}
-
-WebGLId WebGraphicsContext3DImpl::createTexture() {
-  GLuint o;
-  gl_->GenTextures(1, &o);
-  return o;
-}
-
-void WebGraphicsContext3DImpl::deleteBuffer(WebGLId buffer) {
-  gl_->DeleteBuffers(1, &buffer);
-}
-
-void WebGraphicsContext3DImpl::deleteFramebuffer(
-    WebGLId framebuffer) {
-  gl_->DeleteFramebuffers(1, &framebuffer);
-}
-
-void WebGraphicsContext3DImpl::deleteRenderbuffer(
-    WebGLId renderbuffer) {
-  gl_->DeleteRenderbuffers(1, &renderbuffer);
-}
-
-void WebGraphicsContext3DImpl::deleteTexture(WebGLId texture) {
-  gl_->DeleteTextures(1, &texture);
-}
-
-DELEGATE_TO_GL_R(createProgram, CreateProgram, WebGLId)
-
-DELEGATE_TO_GL_1R(createShader, CreateShader, WGC3Denum, WebGLId)
-
-DELEGATE_TO_GL_1(deleteProgram, DeleteProgram, WebGLId)
-
-DELEGATE_TO_GL_1(deleteShader, DeleteShader, WebGLId)
-
-void WebGraphicsContext3DImpl::setErrorMessageCallback(
-    WebGraphicsContext3D::WebGraphicsErrorMessageCallback* cb) {
-  error_message_callback_ = cb;
-}
-
-void WebGraphicsContext3DImpl::setContextLostCallback(
-    WebGraphicsContext3D::WebGraphicsContextLostCallback* cb) {
-  context_lost_callback_ = cb;
-}
-
-DELEGATE_TO_GL_5(texImageIOSurface2DCHROMIUM, TexImageIOSurface2DCHROMIUM,
-                 WGC3Denum, WGC3Dint, WGC3Dint, WGC3Duint, WGC3Duint)
-
-DELEGATE_TO_GL_5(texStorage2DEXT, TexStorage2DEXT,
-                 WGC3Denum, WGC3Dint, WGC3Duint, WGC3Dint, WGC3Dint)
-
-WebGLId WebGraphicsContext3DImpl::createQueryEXT() {
-  GLuint o;
-  gl_->GenQueriesEXT(1, &o);
-  return o;
-}
-
-void WebGraphicsContext3DImpl::deleteQueryEXT(
-    WebGLId query) {
-  gl_->DeleteQueriesEXT(1, &query);
-}
-
-DELEGATE_TO_GL_1R(isQueryEXT, IsQueryEXT, WebGLId, WGC3Dboolean)
-DELEGATE_TO_GL_2(beginQueryEXT, BeginQueryEXT, WGC3Denum, WebGLId)
-DELEGATE_TO_GL_1(endQueryEXT, EndQueryEXT, WGC3Denum)
-DELEGATE_TO_GL_3(getQueryivEXT, GetQueryivEXT, WGC3Denum, WGC3Denum, WGC3Dint*)
-DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivEXT,
-                 WebGLId, WGC3Denum, WGC3Duint*)
-
-void WebGraphicsContext3DImpl::copyTextureCHROMIUM(WGC3Denum target,
-                                                   WebGLId source_id,
-                                                   WebGLId dest_id,
-                                                   WGC3Dint level,
-                                                   WGC3Denum internal_format,
-                                                   WGC3Denum dest_type) {
-  copyTextureCHROMIUM(target, source_id, dest_id, internal_format, dest_type);
-}
-
-void WebGraphicsContext3DImpl::copySubTextureCHROMIUM(WGC3Denum target,
-                                                      WebGLId source_id,
-                                                      WebGLId dest_id,
-                                                      WGC3Dint level,
-                                                      WGC3Dint xoffset,
-                                                      WGC3Dint yoffset) {
-  copySubTextureCHROMIUM(target, source_id, dest_id, xoffset, yoffset);
-}
-
-DELEGATE_TO_GL_5(copyTextureCHROMIUM,
-                 CopyTextureCHROMIUM,
-                 WGC3Denum,
-                 WebGLId,
-                 WebGLId,
-                 WGC3Denum,
-                 WGC3Denum);
-
-DELEGATE_TO_GL_5(copySubTextureCHROMIUM,
-                 CopySubTextureCHROMIUM,
-                 WGC3Denum,
-                 WebGLId,
-                 WebGLId,
-                 WGC3Dint,
-                 WGC3Dint);
-
-DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM,
-                 WebGLId, WGC3Dint, const WGC3Dchar*)
-
-void WebGraphicsContext3DImpl::shallowFlushCHROMIUM() {
-  flush_id_ = GenFlushID();
-  gl_->ShallowFlushCHROMIUM();
-}
-
-void WebGraphicsContext3DImpl::shallowFinishCHROMIUM() {
-  flush_id_ = GenFlushID();
-  gl_->ShallowFinishCHROMIUM();
-}
-
-DELEGATE_TO_GL_1(waitSyncPoint, WaitSyncPointCHROMIUM, GLuint)
-
-void WebGraphicsContext3DImpl::loseContextCHROMIUM(
-    WGC3Denum current, WGC3Denum other) {
-  gl_->LoseContextCHROMIUM(current, other);
-  gl_->Flush();
-}
-
-DELEGATE_TO_GL_1(genMailboxCHROMIUM, GenMailboxCHROMIUM, WGC3Dbyte*)
-DELEGATE_TO_GL_2(produceTextureCHROMIUM, ProduceTextureCHROMIUM,
-                 WGC3Denum, const WGC3Dbyte*)
-DELEGATE_TO_GL_3(produceTextureDirectCHROMIUM, ProduceTextureDirectCHROMIUM,
-                 WebGLId, WGC3Denum, const WGC3Dbyte*)
-DELEGATE_TO_GL_2(consumeTextureCHROMIUM, ConsumeTextureCHROMIUM,
-                 WGC3Denum, const WGC3Dbyte*)
-DELEGATE_TO_GL_2R(createAndConsumeTextureCHROMIUM,
-                  CreateAndConsumeTextureCHROMIUM,
-                  WGC3Denum, const WGC3Dbyte*, WebGLId)
-
-DELEGATE_TO_GL_2(genValuebuffersCHROMIUM,
-                 GenValuebuffersCHROMIUM,
-                 WGC3Dsizei,
-                 WebGLId*);
-
-WebGLId WebGraphicsContext3DImpl::createValuebufferCHROMIUM() {
-  GLuint o;
-  gl_->GenValuebuffersCHROMIUM(1, &o);
-  return o;
-}
-
-DELEGATE_TO_GL_2(deleteValuebuffersCHROMIUM,
-                 DeleteValuebuffersCHROMIUM,
-                 WGC3Dsizei,
-                 WebGLId*);
-
-void WebGraphicsContext3DImpl::deleteValuebufferCHROMIUM(WebGLId valuebuffer) {
-  gl_->DeleteValuebuffersCHROMIUM(1, &valuebuffer);
-}
-
-DELEGATE_TO_GL_1RB(isValuebufferCHROMIUM,
-                   IsValuebufferCHROMIUM,
-                   WebGLId,
-                   WGC3Dboolean)
-DELEGATE_TO_GL_2(bindValuebufferCHROMIUM,
-                 BindValuebufferCHROMIUM,
-                 WGC3Denum,
-                 WebGLId)
-DELEGATE_TO_GL_2(subscribeValueCHROMIUM,
-                 SubscribeValueCHROMIUM,
-                 WGC3Denum,
-                 WGC3Denum);
-DELEGATE_TO_GL_1(populateSubscribedValuesCHROMIUM,
-                 PopulateSubscribedValuesCHROMIUM,
-                 WGC3Denum);
-DELEGATE_TO_GL_3(uniformValuebufferCHROMIUM,
-                 UniformValuebufferCHROMIUM,
-                 WGC3Dint,
-                 WGC3Denum,
-                 WGC3Denum);
-DELEGATE_TO_GL_2(traceBeginCHROMIUM,
-                 TraceBeginCHROMIUM,
-                 const WGC3Dchar*,
-                 const WGC3Dchar*);
-DELEGATE_TO_GL(traceEndCHROMIUM, TraceEndCHROMIUM);
-
-void WebGraphicsContext3DImpl::insertEventMarkerEXT(
-    const WGC3Dchar* marker) {
-  gl_->InsertEventMarkerEXT(0, marker);
-}
-
-void WebGraphicsContext3DImpl::pushGroupMarkerEXT(
-    const WGC3Dchar* marker) {
-  gl_->PushGroupMarkerEXT(0, marker);
-}
-
-DELEGATE_TO_GL(popGroupMarkerEXT, PopGroupMarkerEXT);
-
-WebGLId WebGraphicsContext3DImpl::createVertexArrayOES() {
-  GLuint array;
-  gl_->GenVertexArraysOES(1, &array);
-  return array;
-}
-
-void WebGraphicsContext3DImpl::deleteVertexArrayOES(
-    WebGLId array) {
-  gl_->DeleteVertexArraysOES(1, &array);
-}
-
-DELEGATE_TO_GL_1R(isVertexArrayOES, IsVertexArrayOES, WebGLId, WGC3Dboolean)
-DELEGATE_TO_GL_1(bindVertexArrayOES, BindVertexArrayOES, WebGLId)
-
-DELEGATE_TO_GL_2(bindTexImage2DCHROMIUM, BindTexImage2DCHROMIUM,
-                 WGC3Denum, WGC3Dint)
-DELEGATE_TO_GL_2(releaseTexImage2DCHROMIUM, ReleaseTexImage2DCHROMIUM,
-                 WGC3Denum, WGC3Dint)
-
-DELEGATE_TO_GL_2R(mapBufferCHROMIUM, MapBufferCHROMIUM, WGC3Denum, WGC3Denum,
-                  void*)
-DELEGATE_TO_GL_1R(unmapBufferCHROMIUM, UnmapBufferCHROMIUM, WGC3Denum,
-                  WGC3Dboolean)
-
-DELEGATE_TO_GL_9(asyncTexImage2DCHROMIUM, AsyncTexImage2DCHROMIUM, WGC3Denum,
-                 WGC3Dint, WGC3Denum, WGC3Dsizei, WGC3Dsizei, WGC3Dint,
-                 WGC3Denum, WGC3Denum, const void*)
-DELEGATE_TO_GL_9(asyncTexSubImage2DCHROMIUM, AsyncTexSubImage2DCHROMIUM,
-                 WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei,
-                 WGC3Dsizei, WGC3Denum, WGC3Denum, const void*)
-
-DELEGATE_TO_GL_1(waitAsyncTexImage2DCHROMIUM, WaitAsyncTexImage2DCHROMIUM,
-                 WGC3Denum)
-
-DELEGATE_TO_GL_2(drawBuffersEXT, DrawBuffersEXT, WGC3Dsizei, const WGC3Denum*)
-
-DELEGATE_TO_GL_4(drawArraysInstancedANGLE, DrawArraysInstancedANGLE, WGC3Denum,
-                 WGC3Dint, WGC3Dsizei, WGC3Dsizei)
-
-void WebGraphicsContext3DImpl::drawElementsInstancedANGLE(
-    WGC3Denum mode,
-    WGC3Dsizei count,
-    WGC3Denum type,
-    WGC3Dintptr offset,
-    WGC3Dsizei primcount) {
-  gl_->DrawElementsInstancedANGLE(
-      mode, count, type,
-      reinterpret_cast<void*>(static_cast<intptr_t>(offset)), primcount);
-}
-
-DELEGATE_TO_GL_2(vertexAttribDivisorANGLE, VertexAttribDivisorANGLE, WGC3Duint,
-                 WGC3Duint)
-
-DELEGATE_TO_GL_4R(createGpuMemoryBufferImageCHROMIUM,
-                  CreateGpuMemoryBufferImageCHROMIUM,
-                  WGC3Dsizei,
-                  WGC3Dsizei,
-                  WGC3Denum,
-                  WGC3Denum,
-                  WGC3Duint);
-
-DELEGATE_TO_GL_1(destroyImageCHROMIUM, DestroyImageCHROMIUM, WGC3Duint);
-
-DELEGATE_TO_GL_6(framebufferTexture2DMultisampleEXT,
-                 FramebufferTexture2DMultisampleEXT,
-                 WGC3Denum, WGC3Denum, WGC3Denum, WebGLId, WGC3Dint, WGC3Dsizei)
-
-DELEGATE_TO_GL_5(renderbufferStorageMultisampleEXT,
-                 RenderbufferStorageMultisampleEXT, WGC3Denum, WGC3Dsizei,
-                 WGC3Denum, WGC3Dsizei, WGC3Dsizei)
-
-DELEGATE_TO_GL_1(beginTransformFeedback, BeginTransformFeedback, WGC3Denum)
-DELEGATE_TO_GL_3(bindBufferBase, BindBufferBase, WGC3Denum, WGC3Duint,
-                 WGC3Duint)
-DELEGATE_TO_GL_5(bindBufferRange, BindBufferRange, WGC3Denum, WGC3Duint,
-                 WGC3Duint, WGC3Dintptr, WGC3Dsizeiptr)
-DELEGATE_TO_GL_2(bindSampler, BindSampler, WGC3Duint, WebGLId)
-DELEGATE_TO_GL_2(bindTransformFeedback, BindTransformFeedback, WGC3Denum,
-                 WebGLId)
-DELEGATE_TO_GL_4(clearBufferfi, ClearBufferfi, WGC3Denum, WGC3Dint, WGC3Dfloat,
-                 WGC3Dint)
-DELEGATE_TO_GL_3(clearBufferfv, ClearBufferfv, WGC3Denum, WGC3Dint,
-                 const WGC3Dfloat *)
-DELEGATE_TO_GL_3(clearBufferiv, ClearBufferiv, WGC3Denum, WGC3Dint,
-                 const WGC3Dint *)
-DELEGATE_TO_GL_3(clearBufferuiv, ClearBufferuiv, WGC3Denum, WGC3Dint,
-                 const WGC3Duint *)
-//DELEGATE_TO_GL_3R(clientWaitSync, ClientWaitSync, WebGLId, WGC3Dbitfield,
-//                  WGC3Duint64, WGC3Denum)
-//DELEGATE_TO_GL_9(compressedTexImage3D, CompressedTexImage3D, WGC3Denum,
-//                 WGC3Dint, WGC3Denum, WGC3Dsizei, WGC3Dsizei, WGC3Dsizei,
-//                 WGC3Dint, WGC3Dsizei, const void *)
-//DELEGATE_TO_GL_11(compressedTexSubImage3D, CompressedTexSubImage3D, WGC3Denum,
-//                  WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei,
-//                  WGC3Dsizei, WGC3Dsizei, WGC3Denum, WGC3Dsizei, const void *)
-DELEGATE_TO_GL_5(copyBufferSubData, CopyBufferSubData, WGC3Denum, WGC3Denum,
-                 WGC3Dintptr, WGC3Dintptr, WGC3Dsizeiptr)
-DELEGATE_TO_GL_9(copyTexSubImage3D, CopyTexSubImage3D, WGC3Denum, WGC3Dint,
-                 WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei,
-                 WGC3Dsizei)
-WebGLId WebGraphicsContext3DImpl::createSampler() {
-  GLuint sampler;
-  gl_->GenSamplers(1, &sampler);
-  return sampler;
-}
-WebGLId WebGraphicsContext3DImpl::createTransformFeedback() {
-  GLuint tf;
-  gl_->GenTransformFeedbacks(1, &tf);
-  return tf;
-}
-void WebGraphicsContext3DImpl::deleteSampler(WebGLId sampler) {
-  gl_->DeleteSamplers(1, &sampler);
-}
-//DELEGATE_TO_GL_1(deleteSync, DeleteSync, WebGLId)
-void WebGraphicsContext3DImpl::deleteTransformFeedback(WebGLId tf) {
-  gl_->DeleteTransformFeedbacks(1, &tf);
-}
-DELEGATE_TO_GL(endTransformFeedback, EndTransformFeedback)
-//DELEGATE_TO_GL_2R(fenceSync, FenceSync, WGC3Denum, WGC3Dbitfield, WebGLId)
-DELEGATE_TO_GL_5(framebufferTextureLayer, FramebufferTextureLayer, WGC3Denum,
-                 WGC3Denum, WGC3Duint, WGC3Dint, WGC3Dint)
-DELEGATE_TO_GL_5(getActiveUniformBlockName, GetActiveUniformBlockName,
-                 WGC3Duint, WGC3Duint, WGC3Dsizei, WGC3Dsizei *, WGC3Dchar *)
-DELEGATE_TO_GL_4(getActiveUniformBlockiv, GetActiveUniformBlockiv, WGC3Duint,
-                 WGC3Duint, WGC3Denum, WGC3Dint *)
-//DELEGATE_TO_GL_5(getActiveUniformsiv, GetActiveUniformsiv, WGC3Duint,
-//                 WGC3Dsizei, const WGC3Duint *, WGC3Denum, WGC3Dint *)
-DELEGATE_TO_GL_2R(getFragDataLocation, GetFragDataLocation, WGC3Duint,
-                  const WGC3Dchar *, WGC3Dint)
-DELEGATE_TO_GL_5(getInternalformativ, GetInternalformativ, WGC3Denum, WGC3Denum,
-                 WGC3Denum, WGC3Dsizei, WGC3Dint *)
-DELEGATE_TO_GL_3(getSamplerParameterfv, GetSamplerParameterfv, WGC3Duint,
-                 WGC3Denum, WGC3Dfloat *)
-DELEGATE_TO_GL_3(getSamplerParameteriv, GetSamplerParameteriv, WGC3Duint,
-                 WGC3Denum, WGC3Dint *)
-//DELEGATE_TO_GL_7(getTransformFeedbackVarying, GetTransformFeedbackVarying,
-//                 WGC3Duint, WGC3Duint, WGC3Dsizei, WGC3Dsizei *, WGC3Dsizei *,
-//                 WGC3Denum *, WGC3Dchar *)
-DELEGATE_TO_GL_2R(getUniformBlockIndex, GetUniformBlockIndex, WGC3Duint,
-                  const WGC3Dchar *, WGC3Duint)
-//DELEGATE_TO_GL_4(getUniformIndices, GetUniformIndices, WGC3Duint, WGC3Dsizei,
-//                 const WGC3Dchar *const*, WGC3Duint *)
-//DELEGATE_TO_GL_3(getUniformuiv, GetUniformuiv, WGC3Duint, WGC3Dint,
-//                 WGC3Duint *)
-//DELEGATE_TO_GL_3(getVertexAttribIiv, GetVertexAttribIiv, WGC3Duint,
-//                 WGC3Denum, WGC3Dint *)
-//DELEGATE_TO_GL_3(getVertexAttribIuiv, GetVertexAttribIuiv, WGC3Duint,
-//                 WGC3Denum, WGC3Duint *)
-DELEGATE_TO_GL_3(invalidateFramebuffer, InvalidateFramebuffer, WGC3Denum,
-                 WGC3Dsizei, const WGC3Denum *)
-DELEGATE_TO_GL_7(invalidateSubFramebuffer, InvalidateSubFramebuffer, WGC3Denum,
-                 WGC3Dsizei, const WGC3Denum *, WGC3Dint, WGC3Dint, WGC3Dsizei,
-                 WGC3Dsizei)
-DELEGATE_TO_GL_1R(isSampler, IsSampler, WebGLId, WGC3Dboolean)
-//DELEGATE_TO_GL_1R(isSync, IsSync, WebGLId, WGC3Dboolean)
-DELEGATE_TO_GL_1R(isTransformFeedback, IsTransformFeedback, WGC3Duint,
-                  WGC3Dboolean)
-DELEGATE_TO_GL(pauseTransformFeedback, PauseTransformFeedback)
-//DELEGATE_TO_GL_3(programParameteri, ProgramParameteri, WGC3Duint, WGC3Denum,
-//                 WGC3Dint)
-DELEGATE_TO_GL_1(readBuffer, ReadBuffer, WGC3Denum)
-DELEGATE_TO_GL(resumeTransformFeedback, ResumeTransformFeedback)
-DELEGATE_TO_GL_3(samplerParameterf, SamplerParameterf, WGC3Duint, WGC3Denum,
-                 WGC3Dfloat)
-DELEGATE_TO_GL_3(samplerParameterfv, SamplerParameterfv, WGC3Duint, WGC3Denum,
-                 const WGC3Dfloat *)
-DELEGATE_TO_GL_3(samplerParameteri, SamplerParameteri, WGC3Duint, WGC3Denum,
-                 WGC3Dint)
-DELEGATE_TO_GL_3(samplerParameteriv, SamplerParameteriv, WGC3Duint, WGC3Denum,
-                 const WGC3Dint *)
-DELEGATE_TO_GL_10(texImage3D, TexImage3D, WGC3Denum, WGC3Dint, WGC3Dint,
-                  WGC3Dsizei, WGC3Dsizei, WGC3Dsizei, WGC3Dint, WGC3Denum,
-                  WGC3Denum, const void *)
-DELEGATE_TO_GL_6(texStorage3D, TexStorage3D, WGC3Denum, WGC3Dsizei, WGC3Denum,
-                 WGC3Dsizei, WGC3Dsizei, WGC3Dsizei)
-DELEGATE_TO_GL_11(texSubImage3D, TexSubImage3D, WGC3Denum, WGC3Dint, WGC3Dint,
-                  WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei, WGC3Dsizei,
-                  WGC3Denum, WGC3Denum, const void *)
-DELEGATE_TO_GL_4(transformFeedbackVaryings, TransformFeedbackVaryings,
-                 WGC3Duint, WGC3Dsizei, const WGC3Dchar *const*, WGC3Denum)
-DELEGATE_TO_GL_2(uniform1ui, Uniform1ui, WGC3Dint, WGC3Duint)
-DELEGATE_TO_GL_3(uniform1uiv, Uniform1uiv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Duint *)
-DELEGATE_TO_GL_3(uniform2ui, Uniform2ui, WGC3Dint, WGC3Duint, WGC3Duint)
-DELEGATE_TO_GL_3(uniform2uiv, Uniform2uiv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Duint *)
-DELEGATE_TO_GL_4(uniform3ui, Uniform3ui, WGC3Dint, WGC3Duint, WGC3Duint,
-                 WGC3Duint)
-DELEGATE_TO_GL_3(uniform3uiv, Uniform3uiv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Duint *)
-DELEGATE_TO_GL_5(uniform4ui, Uniform4ui, WGC3Dint, WGC3Duint, WGC3Duint,
-                 WGC3Duint, WGC3Duint)
-DELEGATE_TO_GL_3(uniform4uiv, Uniform4uiv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Duint *)
-DELEGATE_TO_GL_3(uniformBlockBinding, UniformBlockBinding, WGC3Duint, WGC3Duint,
-                 WGC3Duint)
-DELEGATE_TO_GL_4(uniformMatrix2x3fv, UniformMatrix2x3fv, WGC3Dint, WGC3Dsizei,
-                 WGC3Dboolean, const WGC3Dfloat*)
-DELEGATE_TO_GL_4(uniformMatrix2x4fv, UniformMatrix2x4fv, WGC3Dint, WGC3Dsizei,
-                 WGC3Dboolean, const WGC3Dfloat*)
-DELEGATE_TO_GL_4(uniformMatrix3x2fv, UniformMatrix3x2fv, WGC3Dint, WGC3Dsizei,
-                 WGC3Dboolean, const WGC3Dfloat*)
-DELEGATE_TO_GL_4(uniformMatrix3x4fv, UniformMatrix3x4fv, WGC3Dint, WGC3Dsizei,
-                 WGC3Dboolean, const WGC3Dfloat*)
-DELEGATE_TO_GL_4(uniformMatrix4x2fv, UniformMatrix4x2fv, WGC3Dint, WGC3Dsizei,
-                 WGC3Dboolean, const WGC3Dfloat*)
-DELEGATE_TO_GL_4(uniformMatrix4x3fv, UniformMatrix4x3fv, WGC3Dint, WGC3Dsizei,
-                 WGC3Dboolean, const WGC3Dfloat*)
-DELEGATE_TO_GL_5(vertexAttribI4i, VertexAttribI4i, WGC3Duint, WGC3Dint,
-                 WGC3Dint, WGC3Dint, WGC3Dint)
-DELEGATE_TO_GL_2(vertexAttribI4iv, VertexAttribI4iv, WGC3Duint,
-                 const WGC3Dint *)
-DELEGATE_TO_GL_5(vertexAttribI4ui, VertexAttribI4ui, WGC3Duint, WGC3Duint,
-                 WGC3Duint, WGC3Duint, WGC3Duint)
-DELEGATE_TO_GL_2(vertexAttribI4uiv, VertexAttribI4uiv, WGC3Duint,
-                 const WGC3Duint *)
-void WebGraphicsContext3DImpl::vertexAttribIPointer(
-    WGC3Duint index, WGC3Dint size, WGC3Denum type, WGC3Dsizei stride,
-    WGC3Dintptr offset) {
-  gl_->VertexAttribIPointer(
-      index, size, type, stride,
-      reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
-}
-//DELEGATE_TO_GL_3(waitSync, WaitSync, WebGLId, WGC3Dbitfield, WGC3Duint64)
-
-GrGLInterface* WebGraphicsContext3DImpl::createGrGLInterface() {
-  return skia_bindings::CreateCommandBufferSkiaGLBinding();
-}
-
-::gpu::gles2::GLES2ImplementationErrorMessageCallback*
-    WebGraphicsContext3DImpl::getErrorMessageCallback() {
-  if (!client_error_message_callback_) {
-    client_error_message_callback_.reset(
-        new WebGraphicsContext3DErrorMessageCallback(this));
-  }
-  return client_error_message_callback_.get();
-}
-
-void WebGraphicsContext3DImpl::OnErrorMessage(
-    const std::string& message, int id) {
-  if (error_message_callback_) {
-    blink::WebString str = blink::WebString::fromUTF8(message.c_str());
-    error_message_callback_->onErrorMessage(str, id);
-  }
-}
-
-// TODO(bajones): Look into removing these functions from the blink interface
-void WebGraphicsContext3DImpl::prepareTexture() {
-  NOTREACHED();
-}
-
-void WebGraphicsContext3DImpl::postSubBufferCHROMIUM(
-    int x, int y, int width, int height) {
-  NOTREACHED();
-}
-
-void WebGraphicsContext3DImpl::setVisibilityCHROMIUM(
-    bool visible) {
-  NOTREACHED();
-}
-
-void WebGraphicsContext3DImpl::copyTextureToParentTextureCHROMIUM(
-    WebGLId texture, WebGLId parentTexture) {
-  NOTIMPLEMENTED();
-}
-
-void WebGraphicsContext3DImpl::releaseShaderCompiler() {
-}
-
-// static
-void WebGraphicsContext3DImpl::ConvertAttributes(
-    const blink::WebGraphicsContext3D::Attributes& attributes,
-    ::gpu::gles2::ContextCreationAttribHelper* output_attribs) {
-  output_attribs->alpha_size = attributes.alpha ? 8 : 0;
-  output_attribs->depth_size = attributes.depth ? 24 : 0;
-  output_attribs->stencil_size = attributes.stencil ? 8 : 0;
-  output_attribs->samples = attributes.antialias ? 4 : 0;
-  output_attribs->sample_buffers = attributes.antialias ? 1 : 0;
-  output_attribs->fail_if_major_perf_caveat =
-      attributes.failIfMajorPerformanceCaveat;
-  output_attribs->bind_generates_resource = false;
-  output_attribs->es3_context_required =
-      (attributes.webGL && attributes.webGLVersion == 2);
-}
-
-}  // namespace gpu_blink
diff --git a/gpu/blink/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h
deleted file mode 100644
index a232d06..0000000
--- a/gpu/blink/webgraphicscontext3d_impl.h
+++ /dev/null
@@ -1,960 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef GPU_BLINK_WEBGRAPHICSCONTEXT3D_IMPL_H_
-#define GPU_BLINK_WEBGRAPHICSCONTEXT3D_IMPL_H_
-
-#include <string>
-#include <vector>
-
-#include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
-#include "gpu/blink/gpu_blink_export.h"
-#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-
-namespace gpu {
-
-namespace gles2 {
-class GLES2Interface;
-class GLES2ImplementationErrorMessageCallback;
-struct ContextCreationAttribHelper;
-}
-}
-
-namespace gpu_blink {
-
-class WebGraphicsContext3DErrorMessageCallback;
-
-class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
-    : public NON_EXPORTED_BASE(blink::WebGraphicsContext3D) {
- public:
-  virtual ~WebGraphicsContext3DImpl();
-
-  //----------------------------------------------------------------------
-  // WebGraphicsContext3D methods
-
-  virtual uint32_t lastFlushID();
-
-  virtual unsigned int insertSyncPoint();
-  virtual void waitSyncPoint(unsigned int sync_point);
-
-  virtual void loseContextCHROMIUM(blink::WGC3Denum current,
-                                   blink::WGC3Denum other);
-
-  virtual void reshapeWithScaleFactor(
-      int width, int height, float scale_factor);
-
-  virtual void prepareTexture();
-  virtual void postSubBufferCHROMIUM(int x, int y, int width, int height);
-
-  virtual void activeTexture(blink::WGC3Denum texture);
-  virtual void attachShader(blink::WebGLId program, blink::WebGLId shader);
-  virtual void bindAttribLocation(blink::WebGLId program,
-                                  blink::WGC3Duint index,
-                                  const blink::WGC3Dchar* name);
-  virtual void bindBuffer(blink::WGC3Denum target, blink::WebGLId buffer);
-  virtual void bindFramebuffer(blink::WGC3Denum target,
-                               blink::WebGLId framebuffer);
-  virtual void bindRenderbuffer(blink::WGC3Denum target,
-                                blink::WebGLId renderbuffer);
-  virtual void bindTexture(blink::WGC3Denum target, blink::WebGLId texture);
-  virtual void blendColor(blink::WGC3Dclampf red,
-                          blink::WGC3Dclampf green,
-                          blink::WGC3Dclampf blue,
-                          blink::WGC3Dclampf alpha);
-  virtual void blendEquation(blink::WGC3Denum mode);
-  virtual void blendEquationSeparate(blink::WGC3Denum modeRGB,
-                                     blink::WGC3Denum modeAlpha);
-  virtual void blendFunc(blink::WGC3Denum sfactor, blink::WGC3Denum dfactor);
-  virtual void blendFuncSeparate(blink::WGC3Denum srcRGB,
-                                 blink::WGC3Denum dstRGB,
-                                 blink::WGC3Denum srcAlpha,
-                                 blink::WGC3Denum dstAlpha);
-
-  virtual void bufferData(blink::WGC3Denum target,
-                          blink::WGC3Dsizeiptr size,
-                          const void* data,
-                          blink::WGC3Denum usage);
-  virtual void bufferSubData(blink::WGC3Denum target,
-                             blink::WGC3Dintptr offset,
-                             blink::WGC3Dsizeiptr size,
-                             const void* data);
-
-  virtual blink::WGC3Denum checkFramebufferStatus(blink::WGC3Denum target);
-  virtual void clear(blink::WGC3Dbitfield mask);
-  virtual void clearColor(blink::WGC3Dclampf red,
-                          blink::WGC3Dclampf green,
-                          blink::WGC3Dclampf blue,
-                          blink::WGC3Dclampf alpha);
-  virtual void clearDepth(blink::WGC3Dclampf depth);
-  virtual void clearStencil(blink::WGC3Dint s);
-  virtual void colorMask(blink::WGC3Dboolean red,
-                         blink::WGC3Dboolean green,
-                         blink::WGC3Dboolean blue,
-                         blink::WGC3Dboolean alpha);
-  virtual void compileShader(blink::WebGLId shader);
-
-  virtual void compressedTexImage2D(blink::WGC3Denum target,
-                                    blink::WGC3Dint level,
-                                    blink::WGC3Denum internalformat,
-                                    blink::WGC3Dsizei width,
-                                    blink::WGC3Dsizei height,
-                                    blink::WGC3Dint border,
-                                    blink::WGC3Dsizei imageSize,
-                                    const void* data);
-  virtual void compressedTexSubImage2D(blink::WGC3Denum target,
-                                       blink::WGC3Dint level,
-                                       blink::WGC3Dint xoffset,
-                                       blink::WGC3Dint yoffset,
-                                       blink::WGC3Dsizei width,
-                                       blink::WGC3Dsizei height,
-                                       blink::WGC3Denum format,
-                                       blink::WGC3Dsizei imageSize,
-                                       const void* data);
-  virtual void copyTexImage2D(blink::WGC3Denum target,
-                              blink::WGC3Dint level,
-                              blink::WGC3Denum internalformat,
-                              blink::WGC3Dint x,
-                              blink::WGC3Dint y,
-                              blink::WGC3Dsizei width,
-                              blink::WGC3Dsizei height,
-                              blink::WGC3Dint border);
-  virtual void copyTexSubImage2D(blink::WGC3Denum target,
-                                 blink::WGC3Dint level,
-                                 blink::WGC3Dint xoffset,
-                                 blink::WGC3Dint yoffset,
-                                 blink::WGC3Dint x,
-                                 blink::WGC3Dint y,
-                                 blink::WGC3Dsizei width,
-                                 blink::WGC3Dsizei height);
-  virtual void cullFace(blink::WGC3Denum mode);
-  virtual void depthFunc(blink::WGC3Denum func);
-  virtual void depthMask(blink::WGC3Dboolean flag);
-  virtual void depthRange(blink::WGC3Dclampf zNear, blink::WGC3Dclampf zFar);
-  virtual void detachShader(blink::WebGLId program, blink::WebGLId shader);
-  virtual void disable(blink::WGC3Denum cap);
-  virtual void disableVertexAttribArray(blink::WGC3Duint index);
-  virtual void drawArrays(blink::WGC3Denum mode,
-                          blink::WGC3Dint first,
-                          blink::WGC3Dsizei count);
-  virtual void drawElements(blink::WGC3Denum mode,
-                            blink::WGC3Dsizei count,
-                            blink::WGC3Denum type,
-                            blink::WGC3Dintptr offset);
-
-  virtual void enable(blink::WGC3Denum cap);
-  virtual void enableVertexAttribArray(blink::WGC3Duint index);
-  virtual void finish();
-  virtual void flush();
-  virtual void framebufferRenderbuffer(blink::WGC3Denum target,
-                                       blink::WGC3Denum attachment,
-                                       blink::WGC3Denum renderbuffertarget,
-                                       blink::WebGLId renderbuffer);
-  virtual void framebufferTexture2D(blink::WGC3Denum target,
-                                    blink::WGC3Denum attachment,
-                                    blink::WGC3Denum textarget,
-                                    blink::WebGLId texture,
-                                    blink::WGC3Dint level);
-  virtual void frontFace(blink::WGC3Denum mode);
-  virtual void generateMipmap(blink::WGC3Denum target);
-
-  virtual bool getActiveAttrib(blink::WebGLId program,
-                               blink::WGC3Duint index,
-                               ActiveInfo&);
-  virtual bool getActiveUniform(blink::WebGLId program,
-                                blink::WGC3Duint index,
-                                ActiveInfo&);
-
-  virtual void getAttachedShaders(blink::WebGLId program,
-                                  blink::WGC3Dsizei maxCount,
-                                  blink::WGC3Dsizei* count,
-                                  blink::WebGLId* shaders);
-
-  virtual blink::WGC3Dint getAttribLocation(blink::WebGLId program,
-                                            const blink::WGC3Dchar* name);
-
-  virtual void getBooleanv(blink::WGC3Denum pname, blink::WGC3Dboolean* value);
-
-  virtual void getBufferParameteriv(blink::WGC3Denum target,
-                                    blink::WGC3Denum pname,
-                                    blink::WGC3Dint* value);
-
-  virtual blink::WGC3Denum getError();
-
-  virtual void getFloatv(blink::WGC3Denum pname, blink::WGC3Dfloat* value);
-
-  virtual void getFramebufferAttachmentParameteriv(blink::WGC3Denum target,
-                                                   blink::WGC3Denum attachment,
-                                                   blink::WGC3Denum pname,
-                                                   blink::WGC3Dint* value);
-
-  virtual void getIntegerv(blink::WGC3Denum pname, blink::WGC3Dint* value);
-
-  virtual void getProgramiv(blink::WebGLId program,
-                            blink::WGC3Denum pname,
-                            blink::WGC3Dint* value);
-
-  virtual blink::WebString getProgramInfoLog(blink::WebGLId program);
-
-  virtual void getRenderbufferParameteriv(blink::WGC3Denum target,
-                                          blink::WGC3Denum pname,
-                                          blink::WGC3Dint* value);
-
-  virtual void getShaderiv(blink::WebGLId shader,
-                           blink::WGC3Denum pname,
-                           blink::WGC3Dint* value);
-
-  virtual blink::WebString getShaderInfoLog(blink::WebGLId shader);
-
-  virtual void getShaderPrecisionFormat(blink::WGC3Denum shadertype,
-                                        blink::WGC3Denum precisiontype,
-                                        blink::WGC3Dint* range,
-                                        blink::WGC3Dint* precision);
-
-  virtual blink::WebString getShaderSource(blink::WebGLId shader);
-  virtual blink::WebString getString(blink::WGC3Denum name);
-
-  virtual void getTexParameterfv(blink::WGC3Denum target,
-                                 blink::WGC3Denum pname,
-                                 blink::WGC3Dfloat* value);
-  virtual void getTexParameteriv(blink::WGC3Denum target,
-                                 blink::WGC3Denum pname,
-                                 blink::WGC3Dint* value);
-
-  virtual void getUniformfv(blink::WebGLId program,
-                            blink::WGC3Dint location,
-                            blink::WGC3Dfloat* value);
-  virtual void getUniformiv(blink::WebGLId program,
-                            blink::WGC3Dint location,
-                            blink::WGC3Dint* value);
-
-  virtual blink::WGC3Dint getUniformLocation(blink::WebGLId program,
-                                             const blink::WGC3Dchar* name);
-
-  virtual void getVertexAttribfv(blink::WGC3Duint index,
-                                 blink::WGC3Denum pname,
-                                 blink::WGC3Dfloat* value);
-  virtual void getVertexAttribiv(blink::WGC3Duint index,
-                                 blink::WGC3Denum pname,
-                                 blink::WGC3Dint* value);
-
-  virtual blink::WGC3Dsizeiptr getVertexAttribOffset(blink::WGC3Duint index,
-                                                     blink::WGC3Denum pname);
-
-  virtual void hint(blink::WGC3Denum target, blink::WGC3Denum mode);
-  virtual blink::WGC3Dboolean isBuffer(blink::WebGLId buffer);
-  virtual blink::WGC3Dboolean isEnabled(blink::WGC3Denum cap);
-  virtual blink::WGC3Dboolean isFramebuffer(blink::WebGLId framebuffer);
-  virtual blink::WGC3Dboolean isProgram(blink::WebGLId program);
-  virtual blink::WGC3Dboolean isRenderbuffer(blink::WebGLId renderbuffer);
-  virtual blink::WGC3Dboolean isShader(blink::WebGLId shader);
-  virtual blink::WGC3Dboolean isTexture(blink::WebGLId texture);
-  virtual void lineWidth(blink::WGC3Dfloat);
-  virtual void linkProgram(blink::WebGLId program);
-  virtual void pixelStorei(blink::WGC3Denum pname, blink::WGC3Dint param);
-  virtual void polygonOffset(blink::WGC3Dfloat factor, blink::WGC3Dfloat units);
-
-  virtual void readPixels(blink::WGC3Dint x,
-                          blink::WGC3Dint y,
-                          blink::WGC3Dsizei width,
-                          blink::WGC3Dsizei height,
-                          blink::WGC3Denum format,
-                          blink::WGC3Denum type,
-                          void* pixels);
-
-  virtual void releaseShaderCompiler();
-  virtual void renderbufferStorage(blink::WGC3Denum target,
-                                   blink::WGC3Denum internalformat,
-                                   blink::WGC3Dsizei width,
-                                   blink::WGC3Dsizei height);
-  virtual void sampleCoverage(blink::WGC3Dfloat value,
-                              blink::WGC3Dboolean invert);
-  virtual void scissor(blink::WGC3Dint x,
-                       blink::WGC3Dint y,
-                       blink::WGC3Dsizei width,
-                       blink::WGC3Dsizei height);
-  virtual void shaderSource(blink::WebGLId shader,
-                            const blink::WGC3Dchar* string);
-  virtual void stencilFunc(blink::WGC3Denum func,
-                           blink::WGC3Dint ref,
-                           blink::WGC3Duint mask);
-  virtual void stencilFuncSeparate(blink::WGC3Denum face,
-                                   blink::WGC3Denum func,
-                                   blink::WGC3Dint ref,
-                                   blink::WGC3Duint mask);
-  virtual void stencilMask(blink::WGC3Duint mask);
-  virtual void stencilMaskSeparate(blink::WGC3Denum face,
-                                   blink::WGC3Duint mask);
-  virtual void stencilOp(blink::WGC3Denum fail,
-                         blink::WGC3Denum zfail,
-                         blink::WGC3Denum zpass);
-  virtual void stencilOpSeparate(blink::WGC3Denum face,
-                                 blink::WGC3Denum fail,
-                                 blink::WGC3Denum zfail,
-                                 blink::WGC3Denum zpass);
-
-  virtual void texImage2D(blink::WGC3Denum target,
-                          blink::WGC3Dint level,
-                          blink::WGC3Denum internalformat,
-                          blink::WGC3Dsizei width,
-                          blink::WGC3Dsizei height,
-                          blink::WGC3Dint border,
-                          blink::WGC3Denum format,
-                          blink::WGC3Denum type,
-                          const void* pixels);
-
-  virtual void texParameterf(blink::WGC3Denum target,
-                             blink::WGC3Denum pname,
-                             blink::WGC3Dfloat param);
-  virtual void texParameteri(blink::WGC3Denum target,
-                             blink::WGC3Denum pname,
-                             blink::WGC3Dint param);
-
-  virtual void texSubImage2D(blink::WGC3Denum target,
-                             blink::WGC3Dint level,
-                             blink::WGC3Dint xoffset,
-                             blink::WGC3Dint yoffset,
-                             blink::WGC3Dsizei width,
-                             blink::WGC3Dsizei height,
-                             blink::WGC3Denum format,
-                             blink::WGC3Denum type,
-                             const void* pixels);
-
-  virtual void uniform1f(blink::WGC3Dint location, blink::WGC3Dfloat x);
-  virtual void uniform1fv(blink::WGC3Dint location,
-                          blink::WGC3Dsizei count,
-                          const blink::WGC3Dfloat* v);
-  virtual void uniform1i(blink::WGC3Dint location, blink::WGC3Dint x);
-  virtual void uniform1iv(blink::WGC3Dint location,
-                          blink::WGC3Dsizei count,
-                          const blink::WGC3Dint* v);
-  virtual void uniform2f(blink::WGC3Dint location,
-                         blink::WGC3Dfloat x,
-                         blink::WGC3Dfloat y);
-  virtual void uniform2fv(blink::WGC3Dint location,
-                          blink::WGC3Dsizei count,
-                          const blink::WGC3Dfloat* v);
-  virtual void uniform2i(blink::WGC3Dint location,
-                         blink::WGC3Dint x,
-                         blink::WGC3Dint y);
-  virtual void uniform2iv(blink::WGC3Dint location,
-                          blink::WGC3Dsizei count,
-                          const blink::WGC3Dint* v);
-  virtual void uniform3f(blink::WGC3Dint location,
-                         blink::WGC3Dfloat x,
-                         blink::WGC3Dfloat y,
-                         blink::WGC3Dfloat z);
-  virtual void uniform3fv(blink::WGC3Dint location,
-                          blink::WGC3Dsizei count,
-                          const blink::WGC3Dfloat* v);
-  virtual void uniform3i(blink::WGC3Dint location,
-                         blink::WGC3Dint x,
-                         blink::WGC3Dint y,
-                         blink::WGC3Dint z);
-  virtual void uniform3iv(blink::WGC3Dint location,
-                          blink::WGC3Dsizei count,
-                          const blink::WGC3Dint* v);
-  virtual void uniform4f(blink::WGC3Dint location,
-                         blink::WGC3Dfloat x,
-                         blink::WGC3Dfloat y,
-                         blink::WGC3Dfloat z,
-                         blink::WGC3Dfloat w);
-  virtual void uniform4fv(blink::WGC3Dint location,
-                          blink::WGC3Dsizei count,
-                          const blink::WGC3Dfloat* v);
-  virtual void uniform4i(blink::WGC3Dint location,
-                         blink::WGC3Dint x,
-                         blink::WGC3Dint y,
-                         blink::WGC3Dint z,
-                         blink::WGC3Dint w);
-  virtual void uniform4iv(blink::WGC3Dint location,
-                          blink::WGC3Dsizei count,
-                          const blink::WGC3Dint* v);
-  virtual void uniformMatrix2fv(blink::WGC3Dint location,
-                                blink::WGC3Dsizei count,
-                                blink::WGC3Dboolean transpose,
-                                const blink::WGC3Dfloat* value);
-  virtual void uniformMatrix3fv(blink::WGC3Dint location,
-                                blink::WGC3Dsizei count,
-                                blink::WGC3Dboolean transpose,
-                                const blink::WGC3Dfloat* value);
-  virtual void uniformMatrix4fv(blink::WGC3Dint location,
-                                blink::WGC3Dsizei count,
-                                blink::WGC3Dboolean transpose,
-                                const blink::WGC3Dfloat* value);
-
-  virtual void useProgram(blink::WebGLId program);
-  virtual void validateProgram(blink::WebGLId program);
-
-  virtual void vertexAttrib1f(blink::WGC3Duint index, blink::WGC3Dfloat x);
-  virtual void vertexAttrib1fv(blink::WGC3Duint index,
-                               const blink::WGC3Dfloat* values);
-  virtual void vertexAttrib2f(blink::WGC3Duint index,
-                              blink::WGC3Dfloat x,
-                              blink::WGC3Dfloat y);
-  virtual void vertexAttrib2fv(blink::WGC3Duint index,
-                               const blink::WGC3Dfloat* values);
-  virtual void vertexAttrib3f(blink::WGC3Duint index,
-                              blink::WGC3Dfloat x,
-                              blink::WGC3Dfloat y,
-                              blink::WGC3Dfloat z);
-  virtual void vertexAttrib3fv(blink::WGC3Duint index,
-                               const blink::WGC3Dfloat* values);
-  virtual void vertexAttrib4f(blink::WGC3Duint index,
-                              blink::WGC3Dfloat x,
-                              blink::WGC3Dfloat y,
-                              blink::WGC3Dfloat z,
-                              blink::WGC3Dfloat w);
-  virtual void vertexAttrib4fv(blink::WGC3Duint index,
-                               const blink::WGC3Dfloat* values);
-  virtual void vertexAttribPointer(blink::WGC3Duint index,
-                                   blink::WGC3Dint size,
-                                   blink::WGC3Denum type,
-                                   blink::WGC3Dboolean normalized,
-                                   blink::WGC3Dsizei stride,
-                                   blink::WGC3Dintptr offset);
-
-  virtual void viewport(blink::WGC3Dint x,
-                        blink::WGC3Dint y,
-                        blink::WGC3Dsizei width,
-                        blink::WGC3Dsizei height);
-
-  virtual blink::WebGLId createBuffer();
-  virtual blink::WebGLId createFramebuffer();
-  virtual blink::WebGLId createRenderbuffer();
-  virtual blink::WebGLId createTexture();
-
-  virtual void deleteBuffer(blink::WebGLId);
-  virtual void deleteFramebuffer(blink::WebGLId);
-  virtual void deleteRenderbuffer(blink::WebGLId);
-  virtual void deleteTexture(blink::WebGLId);
-
-  virtual blink::WebGLId createProgram();
-  virtual blink::WebGLId createShader(blink::WGC3Denum);
-
-  virtual void deleteProgram(blink::WebGLId);
-  virtual void deleteShader(blink::WebGLId);
-
-  virtual void synthesizeGLError(blink::WGC3Denum);
-
-  virtual void* mapBufferSubDataCHROMIUM(blink::WGC3Denum target,
-                                         blink::WGC3Dintptr offset,
-                                         blink::WGC3Dsizeiptr size,
-                                         blink::WGC3Denum access);
-  virtual void unmapBufferSubDataCHROMIUM(const void*);
-  virtual void* mapTexSubImage2DCHROMIUM(blink::WGC3Denum target,
-                                         blink::WGC3Dint level,
-                                         blink::WGC3Dint xoffset,
-                                         blink::WGC3Dint yoffset,
-                                         blink::WGC3Dsizei width,
-                                         blink::WGC3Dsizei height,
-                                         blink::WGC3Denum format,
-                                         blink::WGC3Denum type,
-                                         blink::WGC3Denum access);
-  virtual void unmapTexSubImage2DCHROMIUM(const void*);
-
-  virtual void setVisibilityCHROMIUM(bool visible);
-
-  virtual void discardFramebufferEXT(blink::WGC3Denum target,
-                                     blink::WGC3Dsizei numAttachments,
-                                     const blink::WGC3Denum* attachments);
-  virtual void copyTextureToParentTextureCHROMIUM(blink::WebGLId texture,
-                                                  blink::WebGLId parentTexture);
-
-  virtual blink::WebString getRequestableExtensionsCHROMIUM();
-  virtual void requestExtensionCHROMIUM(const char*);
-
-  virtual void blitFramebufferCHROMIUM(blink::WGC3Dint srcX0,
-                                       blink::WGC3Dint srcY0,
-                                       blink::WGC3Dint srcX1,
-                                       blink::WGC3Dint srcY1,
-                                       blink::WGC3Dint dstX0,
-                                       blink::WGC3Dint dstY0,
-                                       blink::WGC3Dint dstX1,
-                                       blink::WGC3Dint dstY1,
-                                       blink::WGC3Dbitfield mask,
-                                       blink::WGC3Denum filter);
-  virtual void renderbufferStorageMultisampleCHROMIUM(
-      blink::WGC3Denum target,
-      blink::WGC3Dsizei samples,
-      blink::WGC3Denum internalformat,
-      blink::WGC3Dsizei width,
-      blink::WGC3Dsizei height);
-
-  virtual blink::WebString getTranslatedShaderSourceANGLE(
-      blink::WebGLId shader);
-
-  virtual void setContextLostCallback(
-      WebGraphicsContext3D::WebGraphicsContextLostCallback* callback);
-
-  virtual void setErrorMessageCallback(
-      WebGraphicsContext3D::WebGraphicsErrorMessageCallback* callback);
-
-  virtual void texImageIOSurface2DCHROMIUM(blink::WGC3Denum target,
-                                           blink::WGC3Dint width,
-                                           blink::WGC3Dint height,
-                                           blink::WGC3Duint ioSurfaceId,
-                                           blink::WGC3Duint plane);
-
-  virtual void texStorage2DEXT(blink::WGC3Denum target,
-                               blink::WGC3Dint levels,
-                               blink::WGC3Duint internalformat,
-                               blink::WGC3Dint width,
-                               blink::WGC3Dint height);
-
-  virtual blink::WebGLId createQueryEXT();
-  virtual void deleteQueryEXT(blink::WebGLId query);
-  virtual blink::WGC3Dboolean isQueryEXT(blink::WGC3Duint query);
-  virtual void beginQueryEXT(blink::WGC3Denum target, blink::WebGLId query);
-  virtual void endQueryEXT(blink::WGC3Denum target);
-  virtual void getQueryivEXT(blink::WGC3Denum target,
-                             blink::WGC3Denum pname,
-                             blink::WGC3Dint* params);
-  virtual void getQueryObjectuivEXT(blink::WebGLId query,
-                                    blink::WGC3Denum pname,
-                                    blink::WGC3Duint* params);
-
-  // TODO(dshwang): Remove |level| in Blink and then remove it.
-  void copyTextureCHROMIUM(blink::WGC3Denum target,
-                           blink::WebGLId source_id,
-                           blink::WebGLId dest_id,
-                           blink::WGC3Dint level,
-                           blink::WGC3Denum internal_format,
-                           blink::WGC3Denum dest_type) override;
-
-  void copySubTextureCHROMIUM(blink::WGC3Denum target,
-                              blink::WebGLId source_id,
-                              blink::WebGLId dest_id,
-                              blink::WGC3Dint level,
-                              blink::WGC3Dint xoffset,
-                              blink::WGC3Dint yoffset) override;
-
-  virtual void copyTextureCHROMIUM(blink::WGC3Denum target,
-                                   blink::WebGLId source_id,
-                                   blink::WebGLId dest_id,
-                                   blink::WGC3Denum internal_format,
-                                   blink::WGC3Denum dest_type);
-
-  virtual void copySubTextureCHROMIUM(blink::WGC3Denum target,
-                                      blink::WebGLId sourceId,
-                                      blink::WebGLId destId,
-                                      blink::WGC3Dint xoffset,
-                                      blink::WGC3Dint yoffset);
-
-  virtual void bindUniformLocationCHROMIUM(blink::WebGLId program,
-                                           blink::WGC3Dint location,
-                                           const blink::WGC3Dchar* uniform);
-
-  virtual void shallowFlushCHROMIUM();
-  virtual void shallowFinishCHROMIUM();
-
-  virtual void genMailboxCHROMIUM(blink::WGC3Dbyte* mailbox);
-  virtual void produceTextureCHROMIUM(blink::WGC3Denum target,
-                                      const blink::WGC3Dbyte* mailbox);
-  virtual void produceTextureDirectCHROMIUM(blink::WebGLId texture,
-                                            blink::WGC3Denum target,
-                                            const blink::WGC3Dbyte* mailbox);
-  virtual void consumeTextureCHROMIUM(blink::WGC3Denum target,
-                                      const blink::WGC3Dbyte* mailbox);
-  virtual blink::WebGLId createAndConsumeTextureCHROMIUM(
-      blink::WGC3Denum target,
-      const blink::WGC3Dbyte* mailbox);
-
-  virtual void genValuebuffersCHROMIUM(blink::WGC3Dsizei count,
-                                       blink::WebGLId* ids);
-  virtual blink::WebGLId createValuebufferCHROMIUM();
-  virtual void deleteValuebuffersCHROMIUM(blink::WGC3Dsizei count,
-                                          blink::WebGLId* ids);
-  virtual void deleteValuebufferCHROMIUM(blink::WebGLId);
-  virtual void bindValuebufferCHROMIUM(blink::WGC3Denum target,
-                                       blink::WebGLId valuebuffer);
-  virtual blink::WGC3Dboolean isValuebufferCHROMIUM(
-      blink::WebGLId renderbuffer);
-  virtual void subscribeValueCHROMIUM(blink::WGC3Denum target,
-                                      blink::WGC3Denum subscription);
-  virtual void populateSubscribedValuesCHROMIUM(blink::WGC3Denum target);
-  virtual void uniformValuebufferCHROMIUM(blink::WGC3Dint location,
-                                          blink::WGC3Denum target,
-                                          blink::WGC3Denum subscription);
-  virtual void traceBeginCHROMIUM(const blink::WGC3Dchar* category_name,
-                                  const blink::WGC3Dchar* trace_name);
-  virtual void traceEndCHROMIUM();
-
-  virtual void insertEventMarkerEXT(const blink::WGC3Dchar* marker);
-  virtual void pushGroupMarkerEXT(const blink::WGC3Dchar* marker);
-  virtual void popGroupMarkerEXT();
-
-  // GL_OES_vertex_array_object
-  virtual blink::WebGLId createVertexArrayOES();
-  virtual void deleteVertexArrayOES(blink::WebGLId array);
-  virtual blink::WGC3Dboolean isVertexArrayOES(blink::WebGLId array);
-  virtual void bindVertexArrayOES(blink::WebGLId array);
-
-  virtual void bindTexImage2DCHROMIUM(blink::WGC3Denum target,
-                                      blink::WGC3Dint image_id);
-  virtual void releaseTexImage2DCHROMIUM(blink::WGC3Denum target,
-                                         blink::WGC3Dint image_id);
-
-  virtual void* mapBufferCHROMIUM(blink::WGC3Denum target,
-                                  blink::WGC3Denum access);
-  virtual blink::WGC3Dboolean unmapBufferCHROMIUM(blink::WGC3Denum target);
-
-  // Async pixel transfer functions.
-  virtual void asyncTexImage2DCHROMIUM(blink::WGC3Denum target,
-                                       blink::WGC3Dint level,
-                                       blink::WGC3Denum internalformat,
-                                       blink::WGC3Dsizei width,
-                                       blink::WGC3Dsizei height,
-                                       blink::WGC3Dint border,
-                                       blink::WGC3Denum format,
-                                       blink::WGC3Denum type,
-                                       const void* pixels);
-  virtual void asyncTexSubImage2DCHROMIUM(blink::WGC3Denum target,
-                                          blink::WGC3Dint level,
-                                          blink::WGC3Dint xoffset,
-                                          blink::WGC3Dint yoffset,
-                                          blink::WGC3Dsizei width,
-                                          blink::WGC3Dsizei height,
-                                          blink::WGC3Denum format,
-                                          blink::WGC3Denum type,
-                                          const void* pixels);
-  virtual void waitAsyncTexImage2DCHROMIUM(blink::WGC3Denum target);
-
-  // GL_EXT_draw_buffers
-  virtual void drawBuffersEXT(blink::WGC3Dsizei n,
-                              const blink::WGC3Denum* bufs);
-
-  // GL_ANGLE_instanced_arrays
-  virtual void drawArraysInstancedANGLE(blink::WGC3Denum mode,
-                                        blink::WGC3Dint first,
-                                        blink::WGC3Dsizei count,
-                                        blink::WGC3Dsizei primcount);
-  virtual void drawElementsInstancedANGLE(blink::WGC3Denum mode,
-                                          blink::WGC3Dsizei count,
-                                          blink::WGC3Denum type,
-                                          blink::WGC3Dintptr offset,
-                                          blink::WGC3Dsizei primcount);
-  virtual void vertexAttribDivisorANGLE(blink::WGC3Duint index,
-                                        blink::WGC3Duint divisor);
-
-  // GL_CHROMIUM_gpu_memory_buffer_image
-  virtual blink::WGC3Duint createGpuMemoryBufferImageCHROMIUM(
-      blink::WGC3Dsizei width,
-      blink::WGC3Dsizei height,
-      blink::WGC3Denum internalformat,
-      blink::WGC3Denum usage);
-  virtual void destroyImageCHROMIUM(blink::WGC3Duint image_id);
-
-  // GL_EXT_multisampled_render_to_texture
-  virtual void framebufferTexture2DMultisampleEXT(blink::WGC3Denum target,
-                                                  blink::WGC3Denum attachment,
-                                                  blink::WGC3Denum textarget,
-                                                  blink::WebGLId texture,
-                                                  blink::WGC3Dint level,
-                                                  blink::WGC3Dsizei samples);
-  virtual void renderbufferStorageMultisampleEXT(
-      blink::WGC3Denum target,
-      blink::WGC3Dsizei samples,
-      blink::WGC3Denum internalformat,
-      blink::WGC3Dsizei width,
-      blink::WGC3Dsizei height);
-
-  // OpenGL ES 3.0 functions not represented by pre-existing extensions
-  virtual void beginTransformFeedback(blink::WGC3Denum primitiveMode);
-  virtual void bindBufferBase(blink::WGC3Denum target,
-                              blink::WGC3Duint index,
-                              blink::WGC3Duint buffer);
-  virtual void bindBufferRange(blink::WGC3Denum target,
-                               blink::WGC3Duint index,
-                               blink::WGC3Duint buffer,
-                               blink::WGC3Dintptr offset,
-                               blink::WGC3Dsizeiptr size);
-  virtual void bindSampler(blink::WGC3Duint unit, blink::WebGLId sampler);
-  virtual void bindTransformFeedback(blink::WGC3Denum target,
-                                     blink::WebGLId transformfeedback);
-  virtual void clearBufferfi(blink::WGC3Denum buffer,
-                             blink::WGC3Dint drawbuffer,
-                             blink::WGC3Dfloat depth,
-                             blink::WGC3Dint stencil);
-  virtual void clearBufferfv(blink::WGC3Denum buffer,
-                             blink::WGC3Dint drawbuffer,
-                             const blink::WGC3Dfloat* value);
-  virtual void clearBufferiv(blink::WGC3Denum buffer,
-                             blink::WGC3Dint drawbuffer,
-                             const blink::WGC3Dint* value);
-  virtual void clearBufferuiv(blink::WGC3Denum buffer,
-                              blink::WGC3Dint drawbuffer,
-                              const blink::WGC3Duint* value);
-  // virtual blink::WGC3Denum clientWaitSync(blink::WebGLId sync,
-  //                                         blink::WGC3Dbitfield flags,
-  //                                         blink::WGC3Duint64 timeout);
-  // virtual void compressedTexImage3D(blink::WGC3Denum target, blink::WGC3Dint
-  // level,
-  //    blink::WGC3Denum internalformat, blink::WGC3Dsizei width,
-  //    WGC3Dsizei height, WGC3Dsizei depth, blink::WGC3Dint border,
-  //    WGC3Dsizei imageSize, const void *data);
-  // virtual void compressedTexSubImage3D(blink::WGC3Denum target,
-  //    blink::WGC3Dint level, blink::WGC3Dint xoffset, blink::WGC3Dint yoffset,
-  //    blink::WGC3Dint zoffset,
-  //    blink::WGC3Dsizei width, blink::WGC3Dsizei height,
-  //    blink::WGC3Dsizei depth, blink::WGC3Denum format,
-  //    blink::WGC3Dsizei imageSize, const void *data);
-  virtual void copyBufferSubData(blink::WGC3Denum readTarget,
-                                 blink::WGC3Denum writeTarget,
-                                 blink::WGC3Dintptr readOffset,
-                                 blink::WGC3Dintptr writeOffset,
-                                 blink::WGC3Dsizeiptr size);
-  virtual void copyTexSubImage3D(blink::WGC3Denum target,
-                                 blink::WGC3Dint level,
-                                 blink::WGC3Dint xoffset,
-                                 blink::WGC3Dint yoffset,
-                                 blink::WGC3Dint zoffset,
-                                 blink::WGC3Dint x,
-                                 blink::WGC3Dint y,
-                                 blink::WGC3Dsizei width,
-                                 blink::WGC3Dsizei height);
-  virtual blink::WebGLId createSampler();
-  virtual blink::WebGLId createTransformFeedback();
-  virtual void deleteSampler(blink::WebGLId sampler);
-  // virtual void deleteSync(blink::WebGLId sync);
-  virtual void deleteTransformFeedback(blink::WebGLId transformfeedback);
-  virtual void endTransformFeedback(void);
-  // virtual blink::WebGLId fenceSync(blink::WGC3Denum condition,
-  //                                  blink::WGC3Dbitfield flags);
-  virtual void framebufferTextureLayer(blink::WGC3Denum target,
-                                       blink::WGC3Denum attachment,
-                                       blink::WGC3Duint texture,
-                                       blink::WGC3Dint level,
-                                       blink::WGC3Dint layer);
-  virtual void getActiveUniformBlockName(blink::WGC3Duint program,
-                                         blink::WGC3Duint uniformBlockIndex,
-                                         blink::WGC3Dsizei bufSize,
-                                         blink::WGC3Dsizei* length,
-                                         blink::WGC3Dchar* uniformBlockName);
-  virtual void getActiveUniformBlockiv(blink::WGC3Duint program,
-                                       blink::WGC3Duint uniformBlockIndex,
-                                       blink::WGC3Denum pname,
-                                       blink::WGC3Dint* params);
-  // virtual void getActiveUniformsiv(blink::WGC3Duint program,
-  //    blink::WGC3Dsizei uniformCount, const blink::WGC3Duint *uniformIndices,
-  //    blink::WGC3Denum pname, blink::WGC3Dint *params);
-  virtual blink::WGC3Dint getFragDataLocation(blink::WGC3Duint program,
-                                              const blink::WGC3Dchar* name);
-  virtual void getInternalformativ(blink::WGC3Denum target,
-                                   blink::WGC3Denum internalformat,
-                                   blink::WGC3Denum pname,
-                                   blink::WGC3Dsizei bufSize,
-                                   blink::WGC3Dint* params);
-  virtual void getSamplerParameterfv(blink::WGC3Duint sampler,
-                                     blink::WGC3Denum pname,
-                                     blink::WGC3Dfloat* params);
-  virtual void getSamplerParameteriv(blink::WGC3Duint sampler,
-                                     blink::WGC3Denum pname,
-                                     blink::WGC3Dint* params);
-  // virtual void getTransformFeedbackVarying(blink::WGC3Duint program,
-  // blink::WGC3Duint index,
-  //    blink::WGC3Dsizei bufSize, blink::WGC3Dsizei *length,
-  //    blink::WGC3Dsizei *size, blink::WGC3Denum *type,
-  //    blink::WGC3Dchar *name);
-  virtual blink::WGC3Duint getUniformBlockIndex(
-      blink::WGC3Duint program,
-      const blink::WGC3Dchar* uniformBlockName);
-  // virtual void getUniformIndices(blink::WGC3Duint program,
-  //    blink::WGC3Dsizei uniformCount,
-  //    const blink::WGC3Dchar *const*uniformNames,
-  //    blink::WGC3Duint *uniformIndices);
-  // virtual void getUniformuiv(blink::WGC3Duint program, blink::WGC3Dint
-  // location,
-  //    blink::WGC3Duint *params);
-  // virtual void getVertexAttribIiv(blink::WGC3Duint index, blink::WGC3Denum
-  // pname,
-  //    blink::WGC3Dint *params);
-  // virtual void getVertexAttribIuiv(blink::WGC3Duint index, blink::WGC3Denum
-  // pname,
-  //    blink::WGC3Duint *params);
-  virtual void invalidateFramebuffer(blink::WGC3Denum target,
-                                     blink::WGC3Dsizei numAttachments,
-                                     const blink::WGC3Denum* attachments);
-  virtual void invalidateSubFramebuffer(blink::WGC3Denum target,
-                                        blink::WGC3Dsizei numAttachments,
-                                        const blink::WGC3Denum* attachments,
-                                        blink::WGC3Dint x,
-                                        blink::WGC3Dint y,
-                                        blink::WGC3Dsizei width,
-                                        blink::WGC3Dsizei height);
-  virtual blink::WGC3Dboolean isSampler(blink::WebGLId sampler);
-  // virtual blink::WGC3Dboolean isSync(blink::WebGLId sync);
-  virtual blink::WGC3Dboolean isTransformFeedback(blink::WGC3Duint id);
-  virtual void pauseTransformFeedback(void);
-  // virtual void programParameteri(blink::WGC3Duint program, blink::WGC3Denum
-  // pname,
-  //    blink::WGC3Dint value);
-  virtual void readBuffer(blink::WGC3Denum src);
-  virtual void resumeTransformFeedback(void);
-  virtual void samplerParameterf(blink::WGC3Duint sampler,
-                                 blink::WGC3Denum pname,
-                                 blink::WGC3Dfloat param);
-  virtual void samplerParameterfv(blink::WGC3Duint sampler,
-                                  blink::WGC3Denum pname,
-                                  const blink::WGC3Dfloat* param);
-  virtual void samplerParameteri(blink::WGC3Duint sampler,
-                                 blink::WGC3Denum pname,
-                                 blink::WGC3Dint param);
-  virtual void samplerParameteriv(blink::WGC3Duint sampler,
-                                  blink::WGC3Denum pname,
-                                  const blink::WGC3Dint* param);
-  virtual void texImage3D(blink::WGC3Denum target,
-                          blink::WGC3Dint level,
-                          blink::WGC3Dint internalformat,
-                          blink::WGC3Dsizei width,
-                          blink::WGC3Dsizei height,
-                          blink::WGC3Dsizei depth,
-                          blink::WGC3Dint border,
-                          blink::WGC3Denum format,
-                          blink::WGC3Denum type,
-                          const void* pixels);
-  virtual void texStorage3D(blink::WGC3Denum target,
-                            blink::WGC3Dsizei levels,
-                            blink::WGC3Denum internalformat,
-                            blink::WGC3Dsizei width,
-                            blink::WGC3Dsizei height,
-                            blink::WGC3Dsizei depth);
-  virtual void texSubImage3D(blink::WGC3Denum target,
-                             blink::WGC3Dint level,
-                             blink::WGC3Dint xoffset,
-                             blink::WGC3Dint yoffset,
-                             blink::WGC3Dint zoffset,
-                             blink::WGC3Dsizei width,
-                             blink::WGC3Dsizei height,
-                             blink::WGC3Dsizei depth,
-                             blink::WGC3Denum format,
-                             blink::WGC3Denum type,
-                             const void* pixels);
-  virtual void transformFeedbackVaryings(
-      blink::WGC3Duint program,
-      blink::WGC3Dsizei count,
-      const blink::WGC3Dchar* const* varyings,
-      blink::WGC3Denum bufferMode);
-  virtual void uniform1ui(blink::WGC3Dint location, blink::WGC3Duint x);
-  virtual void uniform1uiv(blink::WGC3Dint location,
-                           blink::WGC3Dsizei count,
-                           const blink::WGC3Duint* value);
-  virtual void uniform2ui(blink::WGC3Dint location,
-                          blink::WGC3Duint x,
-                          blink::WGC3Duint y);
-  virtual void uniform2uiv(blink::WGC3Dint location,
-                           blink::WGC3Dsizei count,
-                           const blink::WGC3Duint* value);
-  virtual void uniform3ui(blink::WGC3Dint location,
-                          blink::WGC3Duint x,
-                          blink::WGC3Duint y,
-                          blink::WGC3Duint z);
-  virtual void uniform3uiv(blink::WGC3Dint location,
-                           blink::WGC3Dsizei count,
-                           const blink::WGC3Duint* value);
-  virtual void uniform4ui(blink::WGC3Dint location,
-                          blink::WGC3Duint x,
-                          blink::WGC3Duint y,
-                          blink::WGC3Duint z,
-                          blink::WGC3Duint w);
-  virtual void uniform4uiv(blink::WGC3Dint location,
-                           blink::WGC3Dsizei count,
-                           const blink::WGC3Duint* value);
-  virtual void uniformBlockBinding(blink::WGC3Duint program,
-                                   blink::WGC3Duint uniformBlockIndex,
-                                   blink::WGC3Duint uniformBlockBinding);
-  virtual void uniformMatrix2x3fv(blink::WGC3Dint location,
-                                  blink::WGC3Dsizei count,
-                                  blink::WGC3Dboolean transpose,
-                                  const blink::WGC3Dfloat* value);
-  virtual void uniformMatrix2x4fv(blink::WGC3Dint location,
-                                  blink::WGC3Dsizei count,
-                                  blink::WGC3Dboolean transpose,
-                                  const blink::WGC3Dfloat* value);
-  virtual void uniformMatrix3x2fv(blink::WGC3Dint location,
-                                  blink::WGC3Dsizei count,
-                                  blink::WGC3Dboolean transpose,
-                                  const blink::WGC3Dfloat* value);
-  virtual void uniformMatrix3x4fv(blink::WGC3Dint location,
-                                  blink::WGC3Dsizei count,
-                                  blink::WGC3Dboolean transpose,
-                                  const blink::WGC3Dfloat* value);
-  virtual void uniformMatrix4x2fv(blink::WGC3Dint location,
-                                  blink::WGC3Dsizei count,
-                                  blink::WGC3Dboolean transpose,
-                                  const blink::WGC3Dfloat* value);
-  virtual void uniformMatrix4x3fv(blink::WGC3Dint location,
-                                  blink::WGC3Dsizei count,
-                                  blink::WGC3Dboolean transpose,
-                                  const blink::WGC3Dfloat* value);
-  virtual void vertexAttribI4i(blink::WGC3Duint index,
-                               blink::WGC3Dint x,
-                               blink::WGC3Dint y,
-                               blink::WGC3Dint z,
-                               blink::WGC3Dint w);
-  virtual void vertexAttribI4iv(blink::WGC3Duint index,
-                                const blink::WGC3Dint* v);
-  virtual void vertexAttribI4ui(blink::WGC3Duint index,
-                                blink::WGC3Duint x,
-                                blink::WGC3Duint y,
-                                blink::WGC3Duint z,
-                                blink::WGC3Duint w);
-  virtual void vertexAttribI4uiv(blink::WGC3Duint index,
-                                 const blink::WGC3Duint* v);
-  virtual void vertexAttribIPointer(blink::WGC3Duint index,
-                                    blink::WGC3Dint size,
-                                    blink::WGC3Denum type,
-                                    blink::WGC3Dsizei stride,
-                                    blink::WGC3Dintptr pointer);
-  // virtual void waitSync(blink::WebGLId sync, blink::WGC3Dbitfield flags,
-  //    blink::WGC3Duint64 timeout);
-
-  virtual GrGLInterface* createGrGLInterface();
-
-  ::gpu::gles2::GLES2Interface* GetGLInterface() {
-    return gl_;
-  }
-
-  // Convert WebGL context creation attributes into command buffer / EGL size
-  // requests.
-  static void ConvertAttributes(
-      const blink::WebGraphicsContext3D::Attributes& attributes,
-      ::gpu::gles2::ContextCreationAttribHelper* output_attribs);
-
- protected:
-  friend class WebGraphicsContext3DErrorMessageCallback;
-
-  WebGraphicsContext3DImpl();
-
-  ::gpu::gles2::GLES2ImplementationErrorMessageCallback*
-      getErrorMessageCallback();
-  virtual void OnErrorMessage(const std::string& message, int id);
-
-  void setGLInterface(::gpu::gles2::GLES2Interface* gl) {
-    gl_ = gl;
-  }
-
-  bool initialized_;
-  bool initialize_failed_;
-
-  WebGraphicsContext3D::WebGraphicsContextLostCallback* context_lost_callback_;
-  blink::WGC3Denum context_lost_reason_;
-
-  WebGraphicsContext3D::WebGraphicsErrorMessageCallback*
-      error_message_callback_;
-  scoped_ptr<WebGraphicsContext3DErrorMessageCallback>
-      client_error_message_callback_;
-
-  // Errors raised by synthesizeGLError().
-  std::vector<blink::WGC3Denum> synthetic_errors_;
-
-  ::gpu::gles2::GLES2Interface* gl_;
-  bool lose_context_when_out_of_memory_;
-  uint32_t flush_id_;
-};
-
-}  // namespace gpu_blink
-
-#endif  // GPU_BLINK_WEBGRAPHICSCONTEXT3D_IMPL_H_
diff --git a/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.cc b/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.cc
deleted file mode 100644
index cc7871c..0000000
--- a/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h"
-
-#include <GLES2/gl2.h>
-#ifndef GL_GLEXT_PROTOTYPES
-#define GL_GLEXT_PROTOTYPES 1
-#endif
-#include <GLES2/gl2ext.h>
-#include <GLES2/gl2extchromium.h>
-
-#include <string>
-
-#include "base/atomicops.h"
-#include "base/bind.h"
-#include "base/bind_helpers.h"
-#include "base/callback.h"
-#include "base/logging.h"
-#include "gpu/command_buffer/client/gles2_implementation.h"
-#include "gpu/command_buffer/common/gles2_cmd_utils.h"
-#include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h"
-#include "ui/gfx/geometry/size.h"
-#include "ui/gl/gl_implementation.h"
-
-using blink::WGC3Denum;
-using gpu::gles2::GLES2Implementation;
-using gpu::GLInProcessContext;
-
-namespace gpu_blink {
-
-// static
-scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
-WebGraphicsContext3DInProcessCommandBufferImpl::CreateViewContext(
-    const blink::WebGraphicsContext3D::Attributes& attributes,
-    bool lose_context_when_out_of_memory,
-    gfx::AcceleratedWidget window) {
-  DCHECK_NE(gfx::GetGLImplementation(), gfx::kGLImplementationNone);
-  bool is_offscreen = false;
-  return make_scoped_ptr(new WebGraphicsContext3DInProcessCommandBufferImpl(
-      scoped_ptr< ::gpu::GLInProcessContext>(),
-      attributes,
-      lose_context_when_out_of_memory,
-      is_offscreen,
-      window));
-}
-
-// static
-scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
-WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext(
-    const blink::WebGraphicsContext3D::Attributes& attributes,
-    bool lose_context_when_out_of_memory) {
-  bool is_offscreen = true;
-  return make_scoped_ptr(new WebGraphicsContext3DInProcessCommandBufferImpl(
-      scoped_ptr< ::gpu::GLInProcessContext>(),
-      attributes,
-      lose_context_when_out_of_memory,
-      is_offscreen,
-      gfx::kNullAcceleratedWidget));
-}
-
-scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
-WebGraphicsContext3DInProcessCommandBufferImpl::WrapContext(
-    scoped_ptr< ::gpu::GLInProcessContext> context,
-    const blink::WebGraphicsContext3D::Attributes& attributes) {
-  bool lose_context_when_out_of_memory = false;  // Not used.
-  bool is_offscreen = true;                      // Not used.
-  return make_scoped_ptr(new WebGraphicsContext3DInProcessCommandBufferImpl(
-      context.Pass(),
-      attributes,
-      lose_context_when_out_of_memory,
-      is_offscreen,
-      gfx::kNullAcceleratedWidget /* window. Not used. */));
-}
-
-WebGraphicsContext3DInProcessCommandBufferImpl::
-    WebGraphicsContext3DInProcessCommandBufferImpl(
-        scoped_ptr< ::gpu::GLInProcessContext> context,
-        const blink::WebGraphicsContext3D::Attributes& attributes,
-        bool lose_context_when_out_of_memory,
-        bool is_offscreen,
-        gfx::AcceleratedWidget window)
-    : share_resources_(attributes.shareResources),
-      webgl_context_(attributes.webGL),
-      is_offscreen_(is_offscreen),
-      window_(window),
-      context_(context.Pass()) {
-  ConvertAttributes(attributes, &attribs_);
-  attribs_.lose_context_when_out_of_memory = lose_context_when_out_of_memory;
-}
-
-WebGraphicsContext3DInProcessCommandBufferImpl::
-    ~WebGraphicsContext3DInProcessCommandBufferImpl() {
-}
-
-size_t WebGraphicsContext3DInProcessCommandBufferImpl::GetMappedMemoryLimit() {
-  return context_->GetMappedMemoryLimit();
-}
-
-bool WebGraphicsContext3DInProcessCommandBufferImpl::MaybeInitializeGL() {
-  if (initialized_)
-    return true;
-
-  if (initialize_failed_)
-    return false;
-
-  if (!context_) {
-    // TODO(kbr): More work will be needed in this implementation to
-    // properly support GPU switching. Like in the out-of-process
-    // command buffer implementation, all previously created contexts
-    // will need to be lost either when the first context requesting the
-    // discrete GPU is created, or the last one is destroyed.
-    gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
-    context_.reset(GLInProcessContext::Create(
-        NULL, /* service */
-        NULL, /* surface */
-        is_offscreen_,
-        window_,
-        gfx::Size(1, 1),
-        NULL, /* share_context */
-        share_resources_,
-        attribs_,
-        gpu_preference,
-        ::gpu::GLInProcessContextSharedMemoryLimits(),
-        nullptr,
-        nullptr));
-  }
-
-  if (context_) {
-    base::Closure context_lost_callback = base::Bind(
-        &WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost,
-        base::Unretained(this));
-    context_->SetContextLostCallback(context_lost_callback);
-  } else {
-    initialize_failed_ = true;
-    return false;
-  }
-
-  real_gl_ = context_->GetImplementation();
-  setGLInterface(real_gl_);
-
-  if (real_gl_ && webgl_context_)
-    real_gl_->EnableFeatureCHROMIUM("webgl_enable_glsl_webgl_validation");
-
-  initialized_ = true;
-  return true;
-}
-
-bool
-WebGraphicsContext3DInProcessCommandBufferImpl::InitializeOnCurrentThread() {
-  if (!MaybeInitializeGL())
-    return false;
-  return context_ && !isContextLost();
-}
-
-void WebGraphicsContext3DInProcessCommandBufferImpl::SetLock(base::Lock* lock) {
-  context_->SetLock(lock);
-}
-
-bool WebGraphicsContext3DInProcessCommandBufferImpl::isContextLost() {
-  return context_lost_reason_ != GL_NO_ERROR;
-}
-
-WGC3Denum WebGraphicsContext3DInProcessCommandBufferImpl::
-    getGraphicsResetStatusARB() {
-  return context_lost_reason_;
-}
-
-::gpu::ContextSupport*
-WebGraphicsContext3DInProcessCommandBufferImpl::GetContextSupport() {
-  return real_gl_;
-}
-
-void WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost() {
-  // TODO(kbr): improve the precision here.
-  context_lost_reason_ = GL_UNKNOWN_CONTEXT_RESET_ARB;
-  if (context_lost_callback_) {
-    context_lost_callback_->onContextLost();
-  }
-}
-
-}  // namespace gpu_blink
diff --git a/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h b/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h
deleted file mode 100644
index 32bcbbf..0000000
--- a/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef GPU_BLINK_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_
-#define GPU_BLINK_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_
-
-#include <vector>
-
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
-#include "gpu/blink/gpu_blink_export.h"
-#include "gpu/blink/webgraphicscontext3d_impl.h"
-#include "gpu/command_buffer/client/gl_in_process_context.h"
-#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-#include "ui/gfx/native_widget_types.h"
-
-namespace gpu {
-class ContextSupport;
-class GLInProcessContext;
-
-namespace gles2 {
-class GLES2Interface;
-class GLES2Implementation;
-struct ContextCreationAttribHelper;
-}
-}
-
-namespace gpu_blink {
-
-class GPU_BLINK_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
-    : public WebGraphicsContext3DImpl {
- public:
-  enum MappedMemoryReclaimLimit {
-    kNoLimit = 0,
-  };
-
-  static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
-      CreateViewContext(
-          const blink::WebGraphicsContext3D::Attributes& attributes,
-          bool lose_context_when_out_of_memory,
-          gfx::AcceleratedWidget window);
-
-  static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
-      CreateOffscreenContext(
-          const blink::WebGraphicsContext3D::Attributes& attributes,
-          bool lose_context_when_out_of_memory);
-
-  static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
-      WrapContext(
-          scoped_ptr< ::gpu::GLInProcessContext> context,
-          const blink::WebGraphicsContext3D::Attributes& attributes);
-
-  virtual ~WebGraphicsContext3DInProcessCommandBufferImpl();
-
-  size_t GetMappedMemoryLimit();
-
-  bool InitializeOnCurrentThread();
-  void SetLock(base::Lock* lock);
-
-  //----------------------------------------------------------------------
-  // WebGraphicsContext3D methods
-  virtual bool isContextLost();
-
-  virtual blink::WGC3Denum getGraphicsResetStatusARB();
-
-  ::gpu::ContextSupport* GetContextSupport();
-
-  ::gpu::gles2::GLES2Implementation* GetImplementation() {
-    return real_gl_;
-  }
-
- private:
-  WebGraphicsContext3DInProcessCommandBufferImpl(
-      scoped_ptr< ::gpu::GLInProcessContext> context,
-      const blink::WebGraphicsContext3D::Attributes& attributes,
-      bool lose_context_when_out_of_memory,
-      bool is_offscreen,
-      gfx::AcceleratedWidget window);
-
-  void OnContextLost();
-
-  bool MaybeInitializeGL();
-
-  // Used to try to find bugs in code that calls gl directly through the gl api
-  // instead of going through WebGraphicsContext3D.
-  void ClearContext();
-
-  ::gpu::gles2::ContextCreationAttribHelper attribs_;
-  bool share_resources_;
-  bool webgl_context_;
-
-  bool is_offscreen_;
-  // Only used when not offscreen.
-  gfx::AcceleratedWidget window_;
-
-  // The context we use for OpenGL rendering.
-  scoped_ptr< ::gpu::GLInProcessContext> context_;
-  // The GLES2Implementation we use for OpenGL rendering.
-  ::gpu::gles2::GLES2Implementation* real_gl_;
-};
-
-}  // namespace gpu_blink
-
-#endif  // GPU_BLINK_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_
diff --git a/gpu/command_buffer/command_buffer.gyp b/gpu/command_buffer/command_buffer.gyp
deleted file mode 100644
index 8ffd15b..0000000
--- a/gpu/command_buffer/command_buffer.gyp
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'variables': {
-    'chromium_code': 1,
-  },
-  'includes': [
-    'command_buffer.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'gles2_utils',
-      'type': '<(component)',
-      'variables': {
-        'gles2_utils_target': 1,
-      },
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../../third_party/khronos/khronos.gyp:khronos_headers',
-      ],
-      'export_dependent_settings': [
-        '../../base/base.gyp:base',
-      ],
-    },
-  ],
-}
-
diff --git a/gpu/command_buffer/command_buffer.gypi b/gpu/command_buffer/command_buffer.gypi
deleted file mode 100644
index 473da92..0000000
--- a/gpu/command_buffer/command_buffer.gypi
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'target_defaults': {
-    'variables': {
-      'gles2_utils_target': 0,
-    },
-    'target_conditions': [
-      # This part is shared between the targets defined below.
-      ['gles2_utils_target==1', {
-        'defines': [
-          'GLES2_UTILS_IMPLEMENTATION',
-        ],
-        'sources': [
-          'common/gles2_cmd_format.h',
-          'common/gles2_cmd_utils.cc',
-          'common/gles2_cmd_utils.h',
-          'common/gles2_utils_export.h',
-        ],
-      }],
-    ],
-  },
-}
diff --git a/gpu/command_buffer/command_buffer_nacl.gyp b/gpu/command_buffer/command_buffer_nacl.gyp
deleted file mode 100644
index 319fc67..0000000
--- a/gpu/command_buffer/command_buffer_nacl.gyp
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'variables': {
-    'chromium_code': 1,
-  },
-  'includes': [
-    '../../build/common_untrusted.gypi',
-    'command_buffer.gypi',
-  ],
-  'conditions': [
-    ['disable_nacl==0 and disable_nacl_untrusted==0', {
-      'targets': [
-        {
-          'target_name': 'gles2_utils_nacl',
-          'type': 'none',
-          'variables': {
-            'gles2_utils_target': 1,
-            'nacl_untrusted_build': 1,
-            'nlib_target': 'libgles2_utils_nacl.a',
-            'build_glibc': 0,
-            'build_newlib': 0,
-            'build_irt': 1,
-            'build_pnacl_newlib': 0,
-            'build_nonsfi_helper': 1,
-          },
-          'dependencies': [
-            '../../native_client/tools.gyp:prep_toolchain',
-            '../../base/base_nacl.gyp:base_nacl',
-            '../../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../../third_party/khronos/khronos.gyp:khronos_headers',
-          ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/gpu/command_buffer_client.gypi b/gpu/command_buffer_client.gypi
deleted file mode 100644
index 316cba1..0000000
--- a/gpu/command_buffer_client.gypi
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'include_dirs': [
-    '..',
-  ],
-  'all_dependent_settings': {
-    'include_dirs': [
-      '..',
-    ],
-  },
-  'dependencies': [
-    '../third_party/khronos/khronos.gyp:khronos_headers',
-  ],
-  'sources': [
-    'command_buffer/client/cmd_buffer_helper.cc',
-    'command_buffer/client/cmd_buffer_helper.h',
-    'command_buffer/client/fenced_allocator.cc',
-    'command_buffer/client/fenced_allocator.h',
-    'command_buffer/client/gpu_control.h',
-    'command_buffer/client/gpu_memory_buffer_manager.cc',
-    'command_buffer/client/gpu_memory_buffer_manager.h',
-    'command_buffer/client/mapped_memory.cc',
-    'command_buffer/client/mapped_memory.h',
-    'command_buffer/client/ring_buffer.cc',
-    'command_buffer/client/ring_buffer.h',
-    'command_buffer/client/transfer_buffer.cc',
-    'command_buffer/client/transfer_buffer.h',
-  ],
-}
diff --git a/gpu/command_buffer_common.gypi b/gpu/command_buffer_common.gypi
deleted file mode 100644
index d793b48..0000000
--- a/gpu/command_buffer_common.gypi
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'dependencies': [
-    '../third_party/khronos/khronos.gyp:khronos_headers',
-  ],
-  'sources': [
-    'command_buffer/common/bitfield_helpers.h',
-    'command_buffer/common/buffer.cc',
-    'command_buffer/common/buffer.h',
-    'command_buffer/common/capabilities.cc',
-    'command_buffer/common/capabilities.h',
-    'command_buffer/common/cmd_buffer_common.cc',
-    'command_buffer/common/cmd_buffer_common.h',
-    'command_buffer/common/command_buffer.h',
-    'command_buffer/common/constants.h',
-    'command_buffer/common/debug_marker_manager.cc',
-    'command_buffer/common/debug_marker_manager.h',
-    'command_buffer/common/gles2_cmd_format.cc',
-    'command_buffer/common/gles2_cmd_format.h',
-    'command_buffer/common/gles2_cmd_format_autogen.h',
-    'command_buffer/common/gles2_cmd_ids.h',
-    'command_buffer/common/gles2_cmd_ids_autogen.h',
-    'command_buffer/common/id_allocator.cc',
-    'command_buffer/common/id_allocator.h',
-    'command_buffer/common/mailbox.cc',
-    'command_buffer/common/mailbox.h',
-    'command_buffer/common/mailbox_holder.cc',
-    'command_buffer/common/mailbox_holder.h',
-    'command_buffer/common/thread_local.h',
-    'command_buffer/common/time.h',
-    'command_buffer/common/value_state.cc',
-    'command_buffer/common/value_state.h',
-  ],
-}
diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi
deleted file mode 100644
index 95a0aa2..0000000
--- a/gpu/command_buffer_service.gypi
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'include_dirs': [
-    '..',
-  ],
-  'all_dependent_settings': {
-    'include_dirs': [
-      '..',
-    ],
-  },
-  'dependencies': [
-    '../base/base.gyp:base',
-    '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-    '../crypto/crypto.gyp:crypto',
-    '../third_party/khronos/khronos.gyp:khronos_headers',
-    '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-    '../third_party/re2/re2.gyp:re2',
-    '../third_party/smhasher/smhasher.gyp:cityhash',
-    '../ui/gfx/gfx.gyp:gfx',
-    '../ui/gfx/gfx.gyp:gfx_geometry',
-    '../ui/gl/gl.gyp:gl',
-    '<(angle_path)/src/angle.gyp:translator',
-  ],
-  'sources': [
-    'command_buffer/service/async_pixel_transfer_delegate.cc',
-    'command_buffer/service/async_pixel_transfer_delegate.h',
-    'command_buffer/service/async_pixel_transfer_manager.cc',
-    'command_buffer/service/async_pixel_transfer_manager.h',
-    'command_buffer/service/async_pixel_transfer_manager_android.cc',
-    'command_buffer/service/async_pixel_transfer_manager_idle.cc',
-    'command_buffer/service/async_pixel_transfer_manager_idle.h',
-    'command_buffer/service/async_pixel_transfer_manager_linux.cc',
-    'command_buffer/service/async_pixel_transfer_manager_mac.cc',
-    'command_buffer/service/async_pixel_transfer_manager_share_group.cc',
-    'command_buffer/service/async_pixel_transfer_manager_share_group.h',
-    'command_buffer/service/async_pixel_transfer_manager_stub.cc',
-    'command_buffer/service/async_pixel_transfer_manager_stub.h',
-    'command_buffer/service/async_pixel_transfer_manager_sync.cc',
-    'command_buffer/service/async_pixel_transfer_manager_sync.h',
-    'command_buffer/service/async_pixel_transfer_manager_win.cc',
-    'command_buffer/service/buffer_manager.cc',
-    'command_buffer/service/buffer_manager.h',
-    'command_buffer/service/cmd_buffer_engine.h',
-    'command_buffer/service/cmd_parser.cc',
-    'command_buffer/service/cmd_parser.h',
-    'command_buffer/service/command_buffer_service.cc',
-    'command_buffer/service/command_buffer_service.h',
-    'command_buffer/service/common_decoder.cc',
-    'command_buffer/service/common_decoder.h',
-    'command_buffer/service/context_group.cc',
-    'command_buffer/service/context_group.h',
-    'command_buffer/service/context_state.cc',
-    'command_buffer/service/context_state.h',
-    'command_buffer/service/context_state_autogen.h',
-    'command_buffer/service/context_state_impl_autogen.h',
-    'command_buffer/service/error_state.cc',
-    'command_buffer/service/error_state.h',
-    'command_buffer/service/feature_info.cc',
-    'command_buffer/service/feature_info.h',
-    'command_buffer/service/framebuffer_manager.cc',
-    'command_buffer/service/framebuffer_manager.h',
-    'command_buffer/service/gl_context_virtual.cc',
-    'command_buffer/service/gl_context_virtual.h',
-    'command_buffer/service/gl_state_restorer_impl.cc',
-    'command_buffer/service/gl_state_restorer_impl.h',
-    'command_buffer/service/gl_utils.h',
-    'command_buffer/service/gles2_cmd_clear_framebuffer.cc',
-    'command_buffer/service/gles2_cmd_clear_framebuffer.h',
-    'command_buffer/service/gles2_cmd_copy_texture_chromium.cc',
-    'command_buffer/service/gles2_cmd_copy_texture_chromium.h',
-    'command_buffer/service/gles2_cmd_decoder.cc',
-    'command_buffer/service/gles2_cmd_decoder.h',
-    'command_buffer/service/gles2_cmd_decoder_autogen.h',
-    'command_buffer/service/gles2_cmd_validation.cc',
-    'command_buffer/service/gles2_cmd_validation.h',
-    'command_buffer/service/gles2_cmd_validation_autogen.h',
-    'command_buffer/service/gles2_cmd_validation_implementation_autogen.h',
-    'command_buffer/service/gpu_scheduler.cc',
-    'command_buffer/service/gpu_scheduler.h',
-    'command_buffer/service/gpu_scheduler_mock.h',
-    'command_buffer/service/gpu_state_tracer.cc',
-    'command_buffer/service/gpu_state_tracer.h',
-    'command_buffer/service/gpu_switches.cc',
-    'command_buffer/service/gpu_switches.h',
-    'command_buffer/service/gpu_tracer.cc',
-    'command_buffer/service/gpu_tracer.h',
-    'command_buffer/service/id_manager.cc',
-    'command_buffer/service/id_manager.h',
-    'command_buffer/service/image_factory.cc',
-    'command_buffer/service/image_factory.h',
-    'command_buffer/service/image_manager.cc',
-    'command_buffer/service/image_manager.h',
-    'command_buffer/service/in_process_command_buffer.cc',
-    'command_buffer/service/in_process_command_buffer.h',
-    'command_buffer/service/logger.cc',
-    'command_buffer/service/logger.h',
-    'command_buffer/service/mailbox_manager.h',
-    'command_buffer/service/mailbox_manager_impl.cc',
-    'command_buffer/service/mailbox_manager_impl.h',
-    'command_buffer/service/mailbox_manager_sync.cc',
-    'command_buffer/service/mailbox_manager_sync.h',
-    'command_buffer/service/memory_program_cache.cc',
-    'command_buffer/service/memory_program_cache.h',
-    'command_buffer/service/mocks.h',
-    'command_buffer/service/program_cache.cc',
-    'command_buffer/service/program_cache.h',
-    'command_buffer/service/program_manager.cc',
-    'command_buffer/service/program_manager.h',
-    'command_buffer/service/query_manager.cc',
-    'command_buffer/service/query_manager.h',
-    'command_buffer/service/renderbuffer_manager.cc',
-    'command_buffer/service/renderbuffer_manager.h',
-    'command_buffer/service/shader_manager.cc',
-    'command_buffer/service/shader_manager.h',
-    'command_buffer/service/shader_translator.cc',
-    'command_buffer/service/shader_translator.h',
-    'command_buffer/service/shader_translator_cache.cc',
-    'command_buffer/service/shader_translator_cache.h',
-    'command_buffer/service/stream_texture_manager_in_process_android.cc',
-    'command_buffer/service/stream_texture_manager_in_process_android.h',
-    'command_buffer/service/sync_point_manager.cc',
-    'command_buffer/service/sync_point_manager.h',
-    'command_buffer/service/texture_definition.cc',
-    'command_buffer/service/texture_definition.h',
-    'command_buffer/service/texture_manager.cc',
-    'command_buffer/service/texture_manager.h',
-    'command_buffer/service/transfer_buffer_manager.cc',
-    'command_buffer/service/transfer_buffer_manager.h',
-    'command_buffer/service/valuebuffer_manager.cc',
-    'command_buffer/service/valuebuffer_manager.h',
-    'command_buffer/service/vertex_array_manager.cc',
-    'command_buffer/service/vertex_array_manager.h',
-    'command_buffer/service/vertex_attrib_manager.cc',
-    'command_buffer/service/vertex_attrib_manager.h',
-  ],
-  'conditions': [
-    ['ui_compositor_image_transport==1', {
-      'include_dirs': [
-        '../third_party/khronos',
-      ],
-    }],
-    ['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', {
-      'sources': [
-        'command_buffer/service/async_pixel_transfer_manager_egl.cc',
-        'command_buffer/service/async_pixel_transfer_manager_egl.h',
-      ],
-    }],
-  ],
-}
diff --git a/gpu/config/DEPS b/gpu/config/DEPS
deleted file mode 100644
index 39b325a..0000000
--- a/gpu/config/DEPS
+++ /dev/null
@@ -1,4 +0,0 @@
-include_rules = [
-  "+third_party/libxml",  # For parsing WinSAT results files.
-  "+third_party/libXNVCtrl",  # For NV driver version query.
-]
diff --git a/gpu/gles2_cmd_helper.gypi b/gpu/gles2_cmd_helper.gypi
deleted file mode 100644
index 523a761..0000000
--- a/gpu/gles2_cmd_helper.gypi
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  # Library helps make GLES2 command buffers.
-  'sources': [
-    'command_buffer/client/gles2_cmd_helper.cc',
-    'command_buffer/client/gles2_cmd_helper.h',
-    'command_buffer/client/gles2_cmd_helper_autogen.h',
-  ],
-}
diff --git a/gpu/gles2_conform_support/DEPS b/gpu/gles2_conform_support/DEPS
deleted file mode 100644
index 45eed75..0000000
--- a/gpu/gles2_conform_support/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+third_party/gles2_conform",
-]
diff --git a/gpu/gles2_conform_support/gles2_conform.gypi b/gpu/gles2_conform_support/gles2_conform.gypi
deleted file mode 100644
index 6dcf277..0000000
--- a/gpu/gles2_conform_support/gles2_conform.gypi
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright (c) 2013 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.
-
-{
-  'variables': {
-    'gl2_extension_test_sources': [
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestCompressedETC1RGB8Texture.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestCompressedETC1RGB8Texture.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestCompressedPalettedTexture.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestCompressedPalettedTexture.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestConditionalQuery.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestConditionalQuery.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDataType1010102.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDataType1010102.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDebug.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDebug.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDepth24.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDepth24.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDepth32.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDepth32.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDepthTexture.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDepthTexture.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDepthTextureCubeMap.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDepthTextureCubeMap.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestEGLCreateContext.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestEGLCreateContext.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestEGLImage.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestEGLImage.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestEGLImageExternal.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestEGLImageExternal.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestElementIndexUINT.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestElementIndexUINT.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestFBORenderMipmap.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestFBORenderMipmap.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestFragmentPrecisionHigh.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestFragmentPrecisionHigh.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestFramebufferObject.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestFramebufferObject.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestMapBuffer.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestMapBuffer.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestOcclusionQuery.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestOcclusionQuery.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestPackedDepthStencil.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestPackedDepthStencil.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestPointSizeArray.c',
-      '<(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/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',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestStencil4.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestStencil8.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestStencil8.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestSurfacelessContext.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestSurfacelessContext.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTexture3D.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTexture3D.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTextureCompressionASTCLDR.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTextureCompressionASTCLDR.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTextureCompressionASTCLDRVectors.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTextureFloat.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTextureFloat.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTextureFloatLinear.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTextureFloatLinear.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTextureNPOT.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTextureNPOT.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestUtilp.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestUtilp.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestVertexArrayObject.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestVertexArrayObject.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestVertexHalfFloat.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestVertexHalfFloat.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestVisibilityQuery.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestVisibilityQuery.h',
-    ],
-    'gl2_fixed_test_sources': [
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBlend.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBlend.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBufferClear.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBufferClear.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBufferColor.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBufferColor.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBufferCorners.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBufferCorners.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBufferObjects.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBufferObjects.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestClip.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestClip.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestColorRamp.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestColorRamp.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestCopyTexture.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestCopyTexture.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestDepthBufferClear.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestDepthBufferClear.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestDepthBufferFunctions.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestDepthBufferFunctions.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestDither.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestDither.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestDivideByZero.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestDivideByZero.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestGets.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestGets.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestMipmapsInterpolation.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestMipmapsInterpolation.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestMipmapsSelection.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestMipmapsSelection.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestPointRasterization.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestPointRasterization.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestPointSprites.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestPointSprites.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestPolygonCull.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestPolygonCull.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestScissor.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestScissor.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestStencilPlaneClear.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestStencilPlaneClear.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestStencilPlaneCorners.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestStencilPlaneCorners.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestStencilPlaneFunction.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestStencilPlaneFunction.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestStencilPlaneOperation.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestStencilPlaneOperation.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestTextureEdgeClamp.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestTextureEdgeClamp.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestTransformViewport.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestTransformViewport.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestTriangleRasterization.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestTriangleRasterization.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestTriangleTiling.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestTriangleTiling.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestUserClipPlanes.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestUserClipPlanes.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestVertexOrder.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestVertexOrder.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestViewportClamp.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestViewportClamp.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedUtilg.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedUtilg.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedUtilr.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedUtilr.h',
-    ],
-    'gl2_test_sources': [
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestAttributeGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestAttributeGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestBindAllAttributes.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestBindAllAttributes.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestCreateObjectGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestCreateObjectGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestDetachGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestDetachGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestFixedDataType.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestFixedDataType.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestFramebufferObjects.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestFramebufferObjects.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetAttachedObjects.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetAttachedObjects.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetAttributeLocation.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetAttributeLocation.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetBIFD.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetBIFD.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetExtensions.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetExtensions.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetProgramInfoLog.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetProgramInfoLog.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetProgramiv.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetProgramiv.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetShaderInfoLog.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetShaderInfoLog.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetShaderiv.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetShaderiv.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetUniform.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetUniform.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetVertexAttrib.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetVertexAttrib.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestMaxVertexAttrib.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestMaxVertexAttrib.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestMultipleShaders.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestMultipleShaders.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestRelinkProgram.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestRelinkProgram.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestUniform.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestUniform.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestUniformQueryGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestUniformQueryGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestVertexAttribPointer.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestVertexAttribPointer.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestVertexAttributes.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestVertexAttributes.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestVertexProgramPointSize.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestVertexProgramPointSize.h',
-    ],
-    'gtf_es_sources': [
-      # Bootstrapping files commented out. We have different bootstrapping
-      # files for each platform.
-      # Note: FilesDATA.h, FilesDATA.c, and FilesTOC.c are generated
-      # by GTF_ES/glsl/GTF/mergeTestFilesToCSource.pl
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/FilesTOC.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/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/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',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFMain.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFMain.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFMatrix.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFMemFile.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFMemFile.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFModelData.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFModelData.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFPort.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFPort.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFString.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFStringUtils.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFStringUtils.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTest.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTest.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestBuildGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestBuildGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestCompareGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestCompareGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestComplexityGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestComplexityGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestCoverageGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestCoverageGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestDriver.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestDriver.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestElement.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestElement.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestExtension.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestExtension.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestFixedGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestFixedGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestGL2Test.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestGL2Test.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestRasterizationGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestRasterizationGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestShaderLoadGL.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestShaderLoadGL.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestUtil.c',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFTestUtil.h',
-      '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFVec.h',
-      '<(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/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/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)',
-    ],
-  },
-  # We cannot have any targets here because these tests are compiled against
-  # multiple platforms - ANGLE, CommandBufferService, and Pepper. Each platform
-  # has different EGL headers.
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp
deleted file mode 100644
index 3835c4b..0000000
--- a/gpu/gles2_conform_support/gles2_conform_support.gyp
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'variables': {
-    'chromium_code': 1,
-    # These are defined here because we want to be able to compile them on
-    # the buildbots without needed the OpenGL ES 2.0 conformance tests
-    # which are not open source.
-    'bootstrap_sources_native': [
-      'native/main.cc',
-    ],
-   'conditions': [
-     ['OS=="linux"', {
-       'bootstrap_sources_native': [
-         'native/egl_native.cc',
-         'native/egl_native_aura.cc',
-         'native/egl_native_x11.cc',
-       ],
-     }],
-     ['OS=="win"', {
-       'bootstrap_sources_native': [
-         'native/egl_native.cc',
-         'native/egl_native_win.cc',
-       ],
-     }],
-   ],
-
-  },
-  'targets': [
-    {
-      # GN version: //gpu/gles2_conform_support/egl
-      'target_name': 'egl_native',
-      'type': 'static_library',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../../gpu/gpu.gyp:command_buffer_service',
-        '../../gpu/gpu.gyp:gles2_implementation_no_check',
-        '../../gpu/gpu.gyp:gpu',
-        '../../third_party/khronos/khronos.gyp:khronos_headers',
-        '../../ui/base/ui_base.gyp:ui_base',
-        '../../ui/gfx/gfx.gyp:gfx',
-        '../../ui/gfx/gfx.gyp:gfx_geometry',
-        '../../ui/gl/gl.gyp:gl',
-      ],
-      'sources': [
-        'egl/config.cc',
-        'egl/config.h',
-        'egl/display.cc',
-        'egl/display.h',
-        'egl/egl.cc',
-        'egl/surface.cc',
-        'egl/surface.h',
-      ],
-      'defines': [
-        'EGLAPI=',
-        'EGLAPIENTRY=',
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4267, ],
-    },
-    {
-      # GN version: //gpu/gles2_conform_support/native
-      'target_name': 'egl_main_native',
-      'type': 'static_library',
-      'dependencies': [
-        'egl_native',
-        '../../third_party/khronos/khronos.gyp:khronos_headers',
-      ],
-      'sources': [
-        '<@(bootstrap_sources_native)',
-      ],
-      'defines': [
-        'GLES2_CONFORM_SUPPORT_ONLY',
-        'GTF_GLES20',
-        'EGLAPI=',
-        'EGLAPIENTRY=',
-      ],
-    },
-    {
-      # GN version: //gpu/gles2_conform_support/native:windowless
-      'target_name': 'egl_main_windowless',
-      'type': 'static_library',
-      'dependencies': [
-        'egl_native',
-        '../../third_party/khronos/khronos.gyp:khronos_headers',
-      ],
-      'sources': [
-        'native/egl_native.cc',
-        'native/egl_native_windowless.cc',
-        'native/main.cc',
-        '<@(bootstrap_sources_native)',
-      ],
-      'defines': [
-        'GLES2_CONFORM_SUPPORT_ONLY',
-        'GTF_GLES20',
-        'EGLAPI=',
-        'EGLAPIENTRY=',
-      ],
-    },
-    {
-      # GN version: //gpu/gles2_conform_support
-      'target_name': 'gles2_conform_support',
-      'type': 'executable',
-      'dependencies': [
-        'egl_native',
-        '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../../gpu/gpu.gyp:gles2_c_lib_nocheck',
-        '../../third_party/expat/expat.gyp:expat',
-      ],
-      'conditions': [
-        # See http://crbug.com/162998#c4 for why this is needed.
-        ['OS=="linux" and use_allocator!="none"', {
-          'dependencies': [
-            '../../base/allocator/allocator.gyp:allocator',
-          ],
-        }],
-      ],
-      'defines': [
-        'GLES2_CONFORM_SUPPORT_ONLY',
-        'GTF_GLES20',
-        'EGLAPI=',
-        'EGLAPIENTRY=',
-      ],
-      'sources': [
-        '<@(bootstrap_sources_native)',
-        'gles2_conform_support.c'
-      ],
-    },
-  ],
-}
diff --git a/gpu/gles2_conform_support/gles2_conform_test.gyp b/gpu/gles2_conform_support/gles2_conform_test.gyp
deleted file mode 100644
index 1f23efa..0000000
--- a/gpu/gles2_conform_support/gles2_conform_test.gyp
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright (c) 2013 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.
-
-{
-
-  'includes': [
-    'gles2_conform.gypi',
-  ],
-  'target_defaults': {
-    'msvs_disabled_warnings': [4005, 4013, 4018, 4101, 4716],
-     'include_dirs': [
-       '<(SHARED_INTERMEDIATE_DIR)/gles2_conform_test_embedded_data',
-       '../../third_party/gles2_conform/GTF_ES/glsl/GTF/Source',
-     ],
-  },
-  'targets': [
-    {
-      'target_name': 'gles2_conform_test',
-      'type': 'executable',
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/gpu/gpu.gyp:gpu',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-      ],
-      'sources': [
-        'gles2_conform_test.cc',
-      ],
-      'conditions': [
-        ['internal_gles2_conform_tests', {
-          'dependencies': [
-            'gles2_conform_test_windowless',
-          ],
-          'variables': {
-            'gles2_conform_test_output_dir': '<(SHARED_INTERMEDIATE_DIR)/gpu/gles2_conform_test',
-          },
-          'sources': [
-            '<(gles2_conform_test_output_dir)/gles2_conform_test_autogen.cc',
-          ],
-          'actions': [
-            {
-              'action_name': 'generate_gles2_conform_tests',
-              'inputs': [
-                'generate_gles2_conform_tests.py',
-                'gles2_conform_test.h',
-                '<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/mustpass_es20.run',
-              ],
-              'outputs': [
-                '<(gles2_conform_test_output_dir)/gles2_conform_test_autogen.cc',
-              ],
-              'action': [
-                'python',
-                'generate_gles2_conform_tests.py',
-                '<(gles2_conform_test_output_dir)',
-              ],
-            },
-          ],
-        }], # internal_gles2_conform_tests
-      ],
-    },
-    # TODO(alokp): Add gles2_conform_test_pepper target
-  ],
-  'conditions': [
-    ['internal_gles2_conform_tests', {
-      'targets': [
-        {
-          'target_name': 'gles2_conform_test_embedded_data',
-          'type': 'none',
-          'hard_dependency': 1,
-          'actions': [
-            {
-              'action_name': 'generate_gles2_conform_embedded_files',
-              'variables': {
-                'generator_path': 'generate_gles2_embedded_data.py',
-              },
-              'inputs': [
-                '<(generator_path)',
-                '<!@(python <(generator_path) ../../third_party/gles2_conform/GTF_ES/glsl/GTF)',
-              ],
-              'outputs': [
-                #'../../third_party/gles2_conform/GTF_ES/glsl/GTF/Source/FilesDATA.c',
-                #'../../third_party/gles2_conform/GTF_ES/glsl/GTF/Source/FilesDATA.h',
-                #'../../third_party/gles2_conform/GTF_ES/glsl/GTF/Source/FilesTOC.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',
-              ],
-              'action': [
-                'python',
-                '<(generator_path)',
-                '../../third_party/gles2_conform/GTF_ES/glsl/GTF',
-                '<(SHARED_INTERMEDIATE_DIR)/gles2_conform_test_embedded_data',
-              ],
-            },
-          ],
-        },
-        {
-          'target_name': 'gles2_conform_test_windowless',
-          'type': 'executable',
-          'dependencies': [
-            'gles2_conform_test_embedded_data',
-            '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_native',
-            '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_main_windowless',
-            '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib_nocheck',
-            '<(DEPTH)/third_party/expat/expat.gyp:expat',
-          ],
-          'conditions': [
-            ['OS=="linux"', {
-              'conditions': [
-                [ 'chromeos==0', {
-                  'dependencies': ['../../build/linux/system.gyp:gtk']
-                }],
-                [ 'clang==1', {
-                  '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'
-                  ]
-                }]
-              ],
-            }],
-            ['OS=="win"', {
-              'dependencies': [
-                '<(angle_path)/src/angle.gyp:libGLESv2',
-                '<(angle_path)/src/angle.gyp:libEGL',
-              ],
-              'defines': [
-                'EGLAPI=',
-                'EGLAPIENTRY=',
-              ],
-              'msvs_disabled_warnings': [
-                4018,  # signed/unsigned mismatch
-                4101,  # unreferenced local variable
-                4715,  # not all control paths return a value
-                4267,  # size_t/unsigned int conversion
-              ],
-              'defines!': [ 'NOMINMAX' ],
-            }],
-            ['OS=="mac"', {
-              'defines': [
-                '_STDINT',
-                '_STDINT_H',
-              ],
-              'conditions': [
-                [ 'clang==1', {
-                  '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',
-                    ],
-                  },
-                }],
-              ],
-            }],
-          ],
-          'defines': [
-            'GTF_API=GTF_GLES20',
-            'HKEMBEDDEDFILESYSTEM',
-          ],
-          'sources': [
-            '<@(gtf_es_sources)',
-            # Include a dummy c++ file to force linking of libstdc++.
-            '<(DEPTH)/gpu/gles2_conform_support/dummy.cc',
-          ],
-          'run_as': {
-            'conditions': [
-              ['OS=="win"', {
-                'action': [
-                  '$(TargetPath)',
-                  '-noimagefileio',
-                  '-run=<(DEPTH)/third_party/gles2_conform/GTF_ES/glsl/GTF/mustpass.run',
-                ],
-              }],
-            ],
-          },
-        },
-      ],
-    }], # internal_gles2_conform_tests
-    ['OS=="win" and internal_gles2_conform_tests', {
-      'targets': [
-        {
-          'target_name': 'gles2_conform_test_angle',
-          'type': 'executable',
-          'dependencies': [
-            'gles2_conform_test_embedded_data',
-            '<(DEPTH)/base/base.gyp:base',
-            '<(DEPTH)/third_party/expat/expat.gyp:expat',
-            '<(angle_path)/src/angle.gyp:libGLESv2',
-            '<(angle_path)/src/angle.gyp:libEGL',
-            '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_main_native',
-          ],
-          'defines': [
-            'GTF_API=GTF_GLES20',
-          ],
-          'include_dirs': [
-            '<(DEPTH)/third_party/angle_dx11/include',
-          ],
-          'sources': [
-            '<@(gtf_es_sources)',
-          ],
-        },
-      ],
-    }],
-
-    ['chromeos==1 and internal_gles2_conform_tests', {
-      'targets': [
-        {
-          'target_name': 'gles2_conform_test_chromeos',
-          'type': 'executable',
-          'dependencies': [
-            'gles2_conform_test_embedded_data',
-            '<(DEPTH)/base/base.gyp:*',
-            '<(DEPTH)/third_party/expat/expat.gyp:expat',
-            '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_main_native',
-          ],
-          'libraries': [
-            '-lEGL',
-            '-lGLESv2',
-          ],
-          'defines': [
-            'GTF_API=GTF_GLES20',
-            'CHROMEOS_GLES2_CONFORMANCE',
-          ],
-          'sources': [
-            '<@(gtf_es_sources)',
-          ],
-        },
-      ],
-    }],
-  ],
-}
-
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
deleted file mode 100644
index 0e31fb0..0000000
--- a/gpu/gpu.gyp
+++ /dev/null
@@ -1,744 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'variables': {
-    'nacl_win64_target': 0,
-  },
-  'includes': [
-    'gpu_common.gypi',
-  ],
-  'targets': [
-    {
-      # Library emulates GLES2 using command_buffers.
-      # GN version: //gpu/command_buffer/client:gles2_implementation
-      'target_name': 'gles2_implementation',
-      'type': '<(component)',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../third_party/khronos/khronos.gyp:khronos_headers',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        '../ui/gl/gl.gyp:gl',
-        'command_buffer/command_buffer.gyp:gles2_utils',
-        'gles2_cmd_helper',
-      ],
-      'defines': [
-        'GLES2_IMPL_IMPLEMENTATION',
-      ],
-      'sources': [
-        '<@(gles2_implementation_source_files)',
-      ],
-      'includes': [
-        # Disable LTO due to ELF section name out of range
-        # crbug.com/422251
-        '../build/android/disable_lto.gypi',
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [4267, ],
-    },
-    {
-      # GN version: //gpu/command_buffer/client:gl_in_process_context
-      'target_name': 'gl_in_process_context',
-      'type': '<(component)',
-      'dependencies': [
-        'command_buffer/command_buffer.gyp:gles2_utils',
-        'gles2_implementation',
-        'gpu',
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        '../ui/gl/gl.gyp:gl',
-      ],
-      'defines': [
-        'GL_IN_PROCESS_CONTEXT_IMPLEMENTATION',
-      ],
-      'sources': [
-        'command_buffer/client/gl_in_process_context.cc',
-        'command_buffer/client/gl_in_process_context.h',
-        'command_buffer/client/gl_in_process_context_export.h',
-      ],
-    },
-    {
-      # Library emulates GLES2 using command_buffers.
-      'target_name': 'gles2_implementation_no_check',
-      'type': '<(component)',
-      'defines': [
-        'GLES2_IMPL_IMPLEMENTATION',
-        'GLES2_CONFORMANCE_TESTS=1',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../third_party/khronos/khronos.gyp:khronos_headers',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        'command_buffer/command_buffer.gyp:gles2_utils',
-        'gles2_cmd_helper',
-      ],
-      'sources': [
-        '<@(gles2_implementation_source_files)',
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4267, ],
-    },
-    {
-      # Stub to expose gles2_implemenation in C instead of C++.
-      # so GLES2 C programs can work with no changes.
-      # GN version: //gpu/command_buffer/client:gles2_c_lib
-      'target_name': 'gles2_c_lib',
-      'type': '<(component)',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        'command_buffer/command_buffer.gyp:gles2_utils',
-        'command_buffer_client',
-      ],
-      'defines': [
-        'GLES2_C_LIB_IMPLEMENTATION',
-      ],
-      'sources': [
-        '<@(gles2_c_lib_source_files)',
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [4267, ],
-    },
-    {
-      # GN version: //gpu/command_buffer/client:gles2_c_lib_nocheck
-      # Same as gles2_c_lib except with no parameter checking. Required for
-      # OpenGL ES 2.0 conformance tests.
-      'target_name': 'gles2_c_lib_nocheck',
-      'type': '<(component)',
-      'defines': [
-        'GLES2_C_LIB_IMPLEMENTATION',
-        'GLES2_CONFORMANCE_TESTS=1',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        'command_buffer/command_buffer.gyp:gles2_utils',
-        'command_buffer_client',
-        'gles2_implementation_no_check',
-      ],
-      'sources': [
-        '<@(gles2_c_lib_source_files)',
-      ],
-    },
-    {
-      # GN version: //gpu:angle_unittests
-      # TODO(kbr): port this refactoring to the GN build.
-      'target_name': 'angle_unittests',
-      'type': '<(gtest_target_type)',
-      'includes': [
-        '../third_party/angle/build/common_defines.gypi',
-        '../third_party/angle/tests/angle_unittests.gypi',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-      ],
-      'include_dirs': [
-        '..',
-        '../third_party/angle/include',
-      ],
-      'sources':
-      [
-        'angle_unittest_main.cc',
-      ],
-    },
-    {
-      # GN version: //gpu:gpu_unittests
-      'target_name': 'gpu_unittests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        '<(angle_path)/src/angle.gyp:translator',
-        '../ui/gl/gl.gyp:gl',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        '../ui/gfx/gfx.gyp:gfx_test_support',
-        'command_buffer/command_buffer.gyp:gles2_utils',
-        'command_buffer_client',
-        'command_buffer_common',
-        'command_buffer_service',
-        'gpu',
-        'gpu_unittest_utils',
-        'gles2_implementation',
-        'gles2_cmd_helper',
-        'gles2_c_lib',
-      ],
-      'sources': [
-        # Note: sources list duplicated in GN build.
-        'command_buffer/client/buffer_tracker_unittest.cc',
-        'command_buffer/client/client_test_helper.cc',
-        'command_buffer/client/client_test_helper.h',
-        'command_buffer/client/cmd_buffer_helper_test.cc',
-        'command_buffer/client/fenced_allocator_test.cc',
-        'command_buffer/client/gles2_implementation_unittest.cc',
-        'command_buffer/client/mapped_memory_unittest.cc',
-        'command_buffer/client/program_info_manager_unittest.cc',
-        'command_buffer/client/query_tracker_unittest.cc',
-        'command_buffer/client/ring_buffer_test.cc',
-        'command_buffer/client/transfer_buffer_unittest.cc',
-        'command_buffer/client/vertex_array_object_manager_unittest.cc',
-        'command_buffer/common/bitfield_helpers_test.cc',
-        'command_buffer/common/command_buffer_mock.cc',
-        'command_buffer/common/command_buffer_mock.h',
-        'command_buffer/common/command_buffer_shared_test.cc',
-        'command_buffer/common/debug_marker_manager_unittest.cc',
-        'command_buffer/common/gles2_cmd_format_test.cc',
-        'command_buffer/common/gles2_cmd_format_test_autogen.h',
-        'command_buffer/common/gles2_cmd_utils_unittest.cc',
-        'command_buffer/common/id_allocator_test.cc',
-        'command_buffer/common/trace_event.h',
-        'command_buffer/common/unittest_main.cc',
-        'command_buffer/service/async_pixel_transfer_delegate_mock.cc',
-        'command_buffer/service/async_pixel_transfer_delegate_mock.h',
-        'command_buffer/service/async_pixel_transfer_manager_mock.cc',
-        'command_buffer/service/async_pixel_transfer_manager_mock.h',
-        'command_buffer/service/buffer_manager_unittest.cc',
-        'command_buffer/service/cmd_parser_test.cc',
-        'command_buffer/service/command_buffer_service_unittest.cc',
-        'command_buffer/service/common_decoder_unittest.cc',
-        'command_buffer/service/context_group_unittest.cc',
-        'command_buffer/service/feature_info_unittest.cc',
-        'command_buffer/service/framebuffer_manager_unittest.cc',
-        'command_buffer/service/gl_surface_mock.cc',
-        'command_buffer/service/gl_surface_mock.h',
-        'command_buffer/service/gles2_cmd_decoder_unittest.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest.h',
-        'command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h',
-        'command_buffer/service/gles2_cmd_decoder_unittest_1.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h',
-        'command_buffer/service/gles2_cmd_decoder_unittest_2.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h',
-        'command_buffer/service/gles2_cmd_decoder_unittest_3.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h',
-        'command_buffer/service/gles2_cmd_decoder_unittest_async_pixel.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_base.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_base.h',
-        'command_buffer/service/gles2_cmd_decoder_unittest_buffers.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_extensions_autogen.h',
-        'command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_programs.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_textures.cc',
-        'command_buffer/service/gles2_cmd_decoder_unittest_valuebuffer.cc',
-        'command_buffer/service/gpu_scheduler_unittest.cc',
-        'command_buffer/service/gpu_service_test.cc',
-        'command_buffer/service/gpu_service_test.h',
-        'command_buffer/service/gpu_tracer_unittest.cc',
-        'command_buffer/service/id_manager_unittest.cc',
-        'command_buffer/service/mailbox_manager_unittest.cc',
-        'command_buffer/service/memory_program_cache_unittest.cc',
-        'command_buffer/service/mocks.cc',
-        'command_buffer/service/mocks.h',
-        'command_buffer/service/program_cache_unittest.cc',
-        'command_buffer/service/program_manager_unittest.cc',
-        'command_buffer/service/query_manager_unittest.cc',
-        'command_buffer/service/renderbuffer_manager_unittest.cc',
-        'command_buffer/service/shader_manager_unittest.cc',
-        'command_buffer/service/shader_translator_cache_unittest.cc',
-        'command_buffer/service/shader_translator_unittest.cc',
-        'command_buffer/service/test_helper.cc',
-        'command_buffer/service/test_helper.h',
-        'command_buffer/service/texture_manager_unittest.cc',
-        'command_buffer/service/transfer_buffer_manager_unittest.cc',
-        'command_buffer/service/valuebuffer_manager_unittest.cc',
-        'command_buffer/service/vertex_array_manager_unittest.cc',
-        'command_buffer/service/vertex_attrib_manager_unittest.cc',
-        'config/gpu_blacklist_unittest.cc',
-        'config/gpu_control_list_entry_unittest.cc',
-        'config/gpu_control_list_number_info_unittest.cc',
-        'config/gpu_control_list_os_info_unittest.cc',
-        'config/gpu_control_list_unittest.cc',
-        'config/gpu_control_list_version_info_unittest.cc',
-        'config/gpu_driver_bug_list_unittest.cc',
-        'config/gpu_info_collector_unittest.cc',
-        'config/gpu_info_unittest.cc',
-        'config/gpu_test_config_unittest.cc',
-        'config/gpu_test_expectations_parser_unittest.cc',
-        'config/gpu_util_unittest.cc',
-      ],
-      'conditions': [
-        ['OS == "android"', {
-          'dependencies': [
-            '../testing/android/native_test.gyp:native_test_native_code',
-          ],
-        }],
-        # See http://crbug.com/162998#c4 for why this is needed.
-        ['OS=="linux" and use_allocator!="none"', {
-          'dependencies': [
-            '../base/allocator/allocator.gyp:allocator',
-          ],
-        }],
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4267, ],
-    },
-    {
-      # GN version: //gpu/gpu_perftests
-      'target_name': 'gpu_perftests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        '../testing/perf/perf_test.gyp:perf_test',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        '../ui/gl/gl.gyp:gl',
-        'command_buffer_service',
-      ],
-      'sources': [
-        'perftests/measurements.cc',
-        'perftests/run_all_tests.cc',
-        'perftests/texture_upload_perftest.cc',
-      ],
-      'conditions': [
-        ['OS == "android"',
-          {
-            'dependencies': [
-              '../testing/android/native_test.gyp:native_test_native_code',
-            ],
-          }
-        ],
-        # See http://crbug.com/162998#c4 for why this is needed.
-        ['OS=="linux" and use_allocator!="none"',
-          {
-            'dependencies': [
-              '../base/allocator/allocator.gyp:allocator',
-            ],
-          }
-        ],
-      ],
-    },
-    {
-      # GN version: //gpu:gl_tests
-      'target_name': 'gl_tests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        '<(angle_path)/src/angle.gyp:translator',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/gfx/gfx.gyp:gfx_test_support',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        '../ui/gl/gl.gyp:gl',
-        'command_buffer/command_buffer.gyp:gles2_utils',
-        'command_buffer_client',
-        'command_buffer_common',
-        'command_buffer_service',
-        'gpu',
-        'gpu_unittest_utils',
-        'gles2_implementation',
-        'gles2_cmd_helper',
-        'gles2_c_lib',
-        #'gl_unittests',
-      ],
-      'defines': [
-        'GL_GLEXT_PROTOTYPES',
-      ],
-      'sources': [
-        # Note: sources list duplicated in GN build.
-        'command_buffer/tests/compressed_texture_test.cc',
-        'command_buffer/tests/gl_bind_uniform_location_unittest.cc',
-        'command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc',
-        'command_buffer/tests/gl_chromium_path_rendering_unittest.cc',
-        'command_buffer/tests/gl_clear_framebuffer_unittest.cc',
-        'command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc',
-        'command_buffer/tests/gl_depth_texture_unittest.cc',
-        'command_buffer/tests/gl_gpu_memory_buffer_unittest.cc',
-        'command_buffer/tests/gl_lose_context_chromium_unittest.cc',
-        'command_buffer/tests/gl_manager.cc',
-        'command_buffer/tests/gl_manager.h',
-        'command_buffer/tests/gl_pointcoord_unittest.cc',
-        'command_buffer/tests/gl_program_unittest.cc',
-        'command_buffer/tests/gl_query_unittest.cc',
-        'command_buffer/tests/gl_readback_unittest.cc',
-        'command_buffer/tests/gl_shared_resources_unittest.cc',
-        'command_buffer/tests/gl_stream_draw_unittest.cc',
-        'command_buffer/tests/gl_test_utils.cc',
-        'command_buffer/tests/gl_test_utils.h',
-        'command_buffer/tests/gl_tests_main.cc',
-        'command_buffer/tests/gl_texture_mailbox_unittest.cc',
-        'command_buffer/tests/gl_texture_storage_unittest.cc',
-        'command_buffer/tests/gl_unittest.cc',
-        'command_buffer/tests/gl_unittests_android.cc',
-        'command_buffer/tests/gl_virtual_contexts_unittest.cc',
-        'command_buffer/tests/occlusion_query_unittest.cc',
-      ],
-      'conditions': [
-        ['OS == "android"', {
-          'dependencies': [
-            '../testing/android/native_test.gyp:native_test_native_code',
-          ],
-        }],
-        ['OS == "win"', {
-          'dependencies': [
-            '../third_party/angle/src/angle.gyp:libEGL',
-            '../third_party/angle/src/angle.gyp:libGLESv2',
-          ],
-        }],
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4267, ],
-    },
-    {
-      # GN version: //gpu:test_support
-      'target_name': 'gpu_unittest_utils',
-      'type': 'static_library',
-      'dependencies': [
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        '../third_party/khronos/khronos.gyp:khronos_headers',
-        '../ui/gl/gl.gyp:gl_unittest_utils',
-        'gpu',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'command_buffer/client/gles2_interface_stub.cc',
-        'command_buffer/client/gles2_interface_stub.h',
-        'command_buffer/service/error_state_mock.cc',
-        'command_buffer/service/gles2_cmd_decoder_mock.cc',
-      ],
-    },
-  ],
-  'conditions': [
-    ['component=="static_library"', {
-      'targets': [
-         {
-          # GN version: //gpu/command_buffer/service:disk_cache_proto
-          'target_name': 'disk_cache_proto',
-          'type': 'static_library',
-          'sources': [ 'command_buffer/service/disk_cache_proto.proto' ],
-          'variables': {
-            'proto_in_dir': 'command_buffer/service',
-            'proto_out_dir': 'gpu/command_buffer/service',
-          },
-          'includes': [ '../build/protoc.gypi' ],
-        },
-        {
-          # GN version: //gpu
-          'target_name': 'gpu',
-          'type': 'none',
-          'dependencies': [
-            'command_buffer_client',
-            'command_buffer_common',
-            'command_buffer_service',
-            'gles2_cmd_helper',
-            'gpu_config',
-            'gpu_ipc',
-          ],
-          'sources': [
-            'gpu_export.h',
-          ],
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [4267, ],
-        },
-        {
-          # GN version: //gpu/command_buffer/common
-          'target_name': 'command_buffer_common',
-          'type': 'static_library',
-          'includes': [
-            'command_buffer_common.gypi',
-          ],
-          'dependencies': [
-            '../base/base.gyp:base',
-            'command_buffer/command_buffer.gyp:gles2_utils',
-          ],
-          'export_dependent_settings': [
-            '../base/base.gyp:base',
-          ],
-        },
-        {
-          # Library helps make GLES2 command buffers.
-          # GN version: //gpu/command_buffer/client:gles2_cmd_helper
-          'target_name': 'gles2_cmd_helper',
-          'type': 'static_library',
-          'includes': [
-            'gles2_cmd_helper.gypi',
-          ],
-          'dependencies': [
-            'command_buffer_client',
-          ],
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [4267, ],
-        },
-        {
-          # GN version: //gpu/command_buffer/client
-          'target_name': 'command_buffer_client',
-          'type': 'static_library',
-          'includes': [
-            'command_buffer_client.gypi',
-          ],
-          'dependencies': [
-            'command_buffer_common',
-          ],
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [4267, ],
-        },
-        {
-          # GN version: //gpu/command_buffer/service
-          'target_name': 'command_buffer_service',
-          'type': 'static_library',
-          'includes': [
-            'command_buffer_service.gypi',
-            '../build/android/increase_size_for_speed.gypi',
-            # Disable LTO due to ELF section name out of range
-            # crbug.com/422251
-            '../build/android/disable_lto.gypi',
-          ],
-          'dependencies': [
-            'command_buffer_common',
-            'disk_cache_proto',
-          ],
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [4267, ],
-        },
-        {
-          # GN version: //gpu/ipc
-          'target_name': 'gpu_ipc',
-          'type': 'static_library',
-          'includes': [
-            'gpu_ipc.gypi',
-          ],
-          'dependencies': [
-            'command_buffer_common',
-          ],
-        },
-        {
-          'target_name': 'gpu_config',
-          'type': 'static_library',
-          'includes': [
-            'gpu_config.gypi',
-          ],
-        },
-      ],
-    },
-    { # component != static_library
-      'targets': [
-         {
-          # GN version: //gpu/command_buffer/service:disk_cache_proto
-          'target_name': 'disk_cache_proto',
-          'type': 'static_library',
-          'sources': [ 'command_buffer/service/disk_cache_proto.proto' ],
-          'variables': {
-            'proto_in_dir': 'command_buffer/service',
-            'proto_out_dir': 'gpu/command_buffer/service',
-          },
-          'includes': [ '../build/protoc.gypi' ],
-        },
-        {
-          # GN version: //gpu
-          'target_name': 'gpu',
-          'type': 'shared_library',
-          'includes': [
-            'command_buffer_client.gypi',
-            'command_buffer_common.gypi',
-            'command_buffer_service.gypi',
-            'gles2_cmd_helper.gypi',
-            'gpu_config.gypi',
-            'gpu_ipc.gypi',
-            '../build/android/increase_size_for_speed.gypi',
-          ],
-          'defines': [
-            'GPU_IMPLEMENTATION',
-          ],
-          'sources': [
-            'gpu_export.h',
-          ],
-          'dependencies': [
-            '../base/base.gyp:base',
-            'command_buffer/command_buffer.gyp:gles2_utils',
-            'disk_cache_proto',
-          ],
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [4267, ],
-        },
-        {
-          # GN version: //gpu/command_buffer/common
-          'target_name': 'command_buffer_common',
-          'type': 'none',
-          'dependencies': [
-            'gpu',
-          ],
-        },
-        {
-          # Library helps make GLES2 command buffers.
-          # GN version: //gpu/command_buffer/client:gles2_cmd_helper
-          'target_name': 'gles2_cmd_helper',
-          'type': 'none',
-          'dependencies': [
-            'gpu',
-          ],
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [4267, ],
-        },
-        {
-          # GN version: //gpu/command_buffer/client
-          'target_name': 'command_buffer_client',
-          'type': 'none',
-          'dependencies': [
-            'gpu',
-          ],
-        },
-        {
-          # GN version: //gpu/command_buffer/service
-          'target_name': 'command_buffer_service',
-          'type': 'none',
-          'dependencies': [
-            'gpu',
-          ],
-        },
-        {
-          # GN version: //gpu/ipc
-          'target_name': 'gpu_ipc',
-          'type': 'none',
-          'dependencies': [
-            'gpu',
-          ],
-        },
-      ],
-    }],
-    ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', {
-      'targets': [
-        {
-          'target_name': 'command_buffer_common_win64',
-          'type': 'static_library',
-          'variables': {
-            'nacl_win64_target': 1,
-          },
-          'includes': [
-            'command_buffer_common.gypi',
-          ],
-          'dependencies': [
-            '../base/base.gyp:base_win64',
-          ],
-          'defines': [
-            '<@(nacl_win64_defines)',
-            'GPU_IMPLEMENTATION',
-          ],
-          'configurations': {
-            'Common_Base': {
-              'msvs_target_platform': 'x64',
-            },
-          },
-        },
-        {
-          'target_name': 'gpu_ipc_win64',
-          'type': 'static_library',
-          'variables': {
-            'nacl_win64_target': 1,
-          },
-          'includes': [
-            'gpu_ipc.gypi',
-          ],
-          'dependencies': [
-            '../base/base.gyp:base_win64',
-            '../ipc/ipc.gyp:ipc_win64',
-            'command_buffer_common_win64',
-          ],
-          'defines': [
-            '<@(nacl_win64_defines)',
-            'GPU_IMPLEMENTATION',
-          ],
-          'configurations': {
-            'Common_Base': {
-              'msvs_target_platform': 'x64',
-            },
-          },
-        },
-      ],
-    }],
-    ['OS == "android"', {
-      'targets': [
-        {
-          'target_name': 'gl_tests_apk',
-          'type': 'none',
-          'dependencies': [
-            'gl_tests',
-          ],
-          'variables': {
-            'test_suite_name': 'gl_tests',
-          },
-          'includes': [
-            '../build/apk_test.gypi',
-          ],
-        },
-        {
-          'target_name': 'gpu_unittests_apk',
-          'type': 'none',
-          'dependencies': [
-            'gpu_unittests',
-          ],
-          'variables': {
-            'test_suite_name': 'gpu_unittests',
-          },
-          'includes': [ '../build/apk_test.gypi' ],
-        },
-        {
-          'target_name': 'gpu_perftests_apk',
-          'type': 'none',
-          'dependencies': [
-            'gpu_perftests',
-          ],
-          'variables': {
-            'test_suite_name': 'gpu_perftests',
-          },
-          'includes': [ '../build/apk_test.gypi' ],
-        },
-      ],
-    }],
-    ['OS == "win"', {
-      'targets': [
-        {
-          # TODO(kbr): port this target to the GN build.
-          'target_name': 'angle_end2end_tests',
-          'type': '<(gtest_target_type)',
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../base/base.gyp:test_support_base',
-          ],
-          'includes':
-          [
-            '../third_party/angle/build/common_defines.gypi',
-            '../third_party/angle/tests/angle_end2end_tests.gypi',
-          ],
-          'sources':
-          [
-            'angle_end2end_tests_main.cc',
-          ],
-        },
-      ],
-    }],
-    ['test_isolation_mode != "noop"', {
-      'targets': [
-        {
-          'target_name': 'gpu_unittests_run',
-          'type': 'none',
-          'dependencies': [
-            'gpu_unittests',
-          ],
-          'includes': [
-            '../build/isolate.gypi',
-          ],
-          'sources': [
-            'gpu_unittests.isolate',
-          ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi
deleted file mode 100644
index b66d5ea..0000000
--- a/gpu/gpu_common.gypi
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'variables': {
-    'chromium_code': 1,
-    # These are defined here because we need to build this library twice. Once
-    # with extra parameter checking. Once with no parameter checking to be 100%
-    # OpenGL ES 2.0 compliant for the conformance tests.
-    'gles2_c_lib_source_files': [
-      'command_buffer/client/gles2_c_lib.cc',
-      'command_buffer/client/gles2_c_lib_autogen.h',
-      'command_buffer/client/gles2_c_lib_export.h',
-      'command_buffer/client/gles2_lib.cc',
-      'command_buffer/client/gles2_lib.h',
-    ],
-    # These are defined here because we need to build this library twice. Once
-    # with without support for client side arrays and once with for pepper and
-    # the OpenGL ES 2.0 compliant for the conformance tests.
-    'gles2_implementation_source_files': [
-      'command_buffer/client/buffer_tracker.cc',
-      'command_buffer/client/buffer_tracker.h',
-      'command_buffer/client/client_context_state.cc',
-      'command_buffer/client/client_context_state.h',
-      'command_buffer/client/client_context_state_autogen.h',
-      'command_buffer/client/client_context_state_impl_autogen.h',
-      'command_buffer/client/gles2_impl_export.h',
-      'command_buffer/client/gles2_implementation.cc',
-      'command_buffer/client/gles2_implementation.h',
-      'command_buffer/client/gles2_implementation_autogen.h',
-      'command_buffer/client/gles2_implementation_impl_autogen.h',
-      'command_buffer/client/gles2_interface.h',
-      'command_buffer/client/gles2_trace_implementation.cc',
-      'command_buffer/client/gles2_trace_implementation.h',
-      'command_buffer/client/gles2_trace_implementation_autogen.h',
-      'command_buffer/client/gles2_trace_implementation_impl_autogen.h',
-      'command_buffer/client/gpu_switches.cc',
-      'command_buffer/client/gpu_switches.h',
-      'command_buffer/client/program_info_manager.cc',
-      'command_buffer/client/program_info_manager.h',
-      'command_buffer/client/query_tracker.cc',
-      'command_buffer/client/query_tracker.h',
-      'command_buffer/client/share_group.cc',
-      'command_buffer/client/share_group.h',
-      'command_buffer/client/vertex_array_object_manager.cc',
-      'command_buffer/client/vertex_array_object_manager.h',
-    ]
-  },
-}
diff --git a/gpu/gpu_config.gypi b/gpu/gpu_config.gypi
deleted file mode 100644
index 2b94403..0000000
--- a/gpu/gpu_config.gypi
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'dependencies': [
-    '../third_party/re2/re2.gyp:re2',
-    '../base/base.gyp:base',
-    '../ui/gl/gl.gyp:gl',
-  ],
-  'include_dirs': [
-    '..',
-  ],
-  'sources': [
-    'config/dx_diag_node.cc',
-    'config/dx_diag_node.h',
-    'config/gpu_blacklist.cc',
-    'config/gpu_blacklist.h',
-    'config/gpu_control_list.cc',
-    'config/gpu_control_list.h',
-    'config/gpu_control_list_jsons.h',
-    'config/gpu_driver_bug_list.cc',
-    'config/gpu_driver_bug_list.h',
-    'config/gpu_driver_bug_list_json.cc',
-    'config/gpu_driver_bug_workaround_type.h',
-    'config/gpu_dx_diagnostics_win.cc',
-    'config/gpu_feature_type.h',
-    'config/gpu_info.cc',
-    'config/gpu_info.h',
-    'config/gpu_info_collector.cc',
-    'config/gpu_info_collector.h',
-    'config/gpu_info_collector_android.cc',
-    'config/gpu_info_collector_linux.cc',
-    'config/gpu_info_collector_linux.h',
-    'config/gpu_info_collector_mac.mm',
-    'config/gpu_info_collector_ozone.cc',
-    'config/gpu_info_collector_win.cc',
-    'config/gpu_info_collector_x11.cc',
-    'config/gpu_test_config.cc',
-    'config/gpu_test_config.h',
-    'config/gpu_test_expectations_parser.cc',
-    'config/gpu_test_expectations_parser.h',
-    'config/gpu_util.cc',
-    'config/gpu_util.h',
-    'config/software_rendering_list_json.cc',
-  ],
-  'conditions': [
-    ['OS=="win"', {
-      'dependencies': [
-        '../third_party/libxml/libxml.gyp:libxml',
-      ],
-      'link_settings': {
-        'libraries': [
-          '-ldxguid.lib',
-          '-lsetupapi.lib',
-        ],
-      },
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4267, ],
-    }],
-    ['OS=="win" and branding=="Chrome" and buildtype=="Official"', {
-      'sources': [
-        '../third_party/amd/AmdCfxPxExt.h',
-        '../third_party/amd/amd_videocard_info_win.cc',
-      ],
-    }],
-    ['OS=="linux" and use_libpci==1 and (use_x11==1 or use_ozone==1)', {
-      'dependencies': [
-        '../build/linux/system.gyp:libpci',
-      ],
-    }],
-    ['OS=="linux" and use_x11==1', {
-      'dependencies': [
-        '../build/linux/system.gyp:x11',
-        '../build/linux/system.gyp:xext',
-        '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl',
-        '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
-      ],
-    }],
-  ],
-}
diff --git a/gpu/gpu_ipc.gypi b/gpu/gpu_ipc.gypi
deleted file mode 100644
index d1cb292..0000000
--- a/gpu/gpu_ipc.gypi
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'dependencies': [
-    '../ipc/ipc.gyp:ipc',
-    '../third_party/khronos/khronos.gyp:khronos_headers',
-  ],
-  'include_dirs': [
-    '..',
-  ],
-  'sources': [
-    'ipc/gpu_command_buffer_traits.cc',
-    'ipc/gpu_command_buffer_traits.h',
-  ],
-  'conditions': [
-    # This section applies to gpu_ipc_win64, used by the NaCl Win64 helper
-    # (nacl64.exe).
-    ['nacl_win64_target==1', {
-      # gpu_ipc_win64 must only link against the 64-bit ipc target.
-      'dependencies!': [
-        '../ipc/ipc.gyp:ipc',
-      ],
-    }],
-  ],
-}
diff --git a/gpu/gpu_nacl.gyp b/gpu/gpu_nacl.gyp
deleted file mode 100644
index 003f0af..0000000
--- a/gpu/gpu_nacl.gyp
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'variables': {
-    'chromium_code': 1,
-    # nacl_win64_target is for building the trusted Win64 NaCl broker.
-    'nacl_win64_target': 0,
-  },
-  'includes': [
-    '../build/common_untrusted.gypi',
-    'gpu_common.gypi',
-  ],
-  'conditions': [
-    ['disable_nacl==0 and disable_nacl_untrusted==0', {
-      'targets': [
-        {
-          'target_name': 'gles2_implementation_nacl',
-          'type': 'none',
-          'variables': {
-            'nacl_untrusted_build': 1,
-            'nlib_target': 'libgles2_implementation_nacl.a',
-            'build_glibc': 0,
-            'build_newlib': 0,
-            'build_irt': 1,
-            'build_pnacl_newlib': 0,
-            'build_nonsfi_helper': 1,
-          },
-          'defines': [
-            'GLES2_IMPL_IMPLEMENTATION',
-          ],
-          'sources': [
-            '<@(gles2_implementation_source_files)',
-          ],
-          'dependencies': [
-            '../base/base_nacl.gyp:base_nacl',
-            '../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
-            '../third_party/khronos/khronos.gyp:khronos_headers',
-            'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
-            'gles2_cmd_helper_nacl',
-          ],
-        },
-        {
-          'target_name': 'command_buffer_common_nacl',
-          'type': 'none',
-          'variables': {
-            'nacl_untrusted_build': 1,
-            'nlib_target': 'libcommand_buffer_common_nacl.a',
-            'build_glibc': 0,
-            'build_newlib': 0,
-            'build_irt': 1,
-            'build_pnacl_newlib': 0,
-            'build_nonsfi_helper': 1,
-          },
-          'includes': [
-            'command_buffer_common.gypi',
-          ],
-          'dependencies': [
-            '../base/base_nacl.gyp:base_nacl',
-            '../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
-            'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
-          ],
-        },
-        {
-          'target_name': 'gles2_cmd_helper_nacl',
-          'type': 'none',
-          'variables': {
-            'nacl_untrusted_build': 1,
-            'nlib_target': 'libgles2_cmd_helper_nacl.a',
-            'build_glibc': 0,
-            'build_newlib': 0,
-            'build_irt': 1,
-            'build_pnacl_newlib': 0,
-            'build_nonsfi_helper': 1,
-          },
-          'includes': [
-            'gles2_cmd_helper.gypi',
-          ],
-          'dependencies': [
-            '../base/base_nacl.gyp:base_nacl',
-            '../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
-            'command_buffer_client_nacl',
-          ],
-        },
-        {
-          'target_name': 'command_buffer_client_nacl',
-          'type': 'none',
-          'variables': {
-            'nacl_untrusted_build': 1,
-            'nlib_target': 'libcommand_buffer_client_nacl.a',
-            'build_glibc': 0,
-            'build_newlib': 0,
-            'build_irt': 1,
-            'build_pnacl_newlib': 0,
-            'build_nonsfi_helper': 1,
-          },
-          'includes': [
-            'command_buffer_client.gypi',
-          ],
-          'dependencies': [
-            '../base/base_nacl.gyp:base_nacl',
-            '../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
-            'command_buffer_common_nacl',
-          ],
-        },
-        {
-          'target_name': 'gpu_ipc_nacl',
-          'type': 'none',
-          'variables': {
-            'nacl_untrusted_build': 1,
-            'nlib_target': 'libgpu_ipc_nacl.a',
-            'build_glibc': 0,
-            'build_newlib': 0,
-            'build_irt': 1,
-            'build_pnacl_newlib': 0,
-            'build_nonsfi_helper': 1,
-          },
-          'includes': [
-            'gpu_ipc.gypi',
-          ],
-          'dependencies': [
-            '../base/base_nacl.gyp:base_nacl',
-            '../base/base_nacl.gyp:base_nacl_nonsfi',
-            '../native_client/tools.gyp:prep_toolchain',
-            'command_buffer_common_nacl',
-          ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/gpu/ipc/BUILD.gn b/gpu/ipc/BUILD.gn
deleted file mode 100644
index d11d685..0000000
--- a/gpu/ipc/BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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.
-
-source_set("ipc") {
-  sources = [
-    "gpu_command_buffer_traits.cc",
-    "gpu_command_buffer_traits.h",
-  ]
-
-  configs += [
-    "//gpu:gpu_implementation",
-    "//third_party/khronos:khronos_headers",
-  ]
-
-  deps = [
-    "//gpu/command_buffer/common",
-    "//ipc",
-  ]
-}
diff --git a/gpu/ipc/DEPS b/gpu/ipc/DEPS
deleted file mode 100644
index 9634ba4..0000000
--- a/gpu/ipc/DEPS
+++ /dev/null
@@ -1,4 +0,0 @@
-include_rules = [
-  "+base",
-  "+ipc",
-]
diff --git a/gpu/ipc/gpu_command_buffer_traits.cc b/gpu/ipc/gpu_command_buffer_traits.cc
deleted file mode 100644
index 1de3b41..0000000
--- a/gpu/ipc/gpu_command_buffer_traits.cc
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "gpu/ipc/gpu_command_buffer_traits.h"
-
-#include "gpu/command_buffer/common/mailbox_holder.h"
-#include "gpu/command_buffer/common/value_state.h"
-
-// Generate param traits write methods.
-#include "ipc/param_traits_write_macros.h"
-namespace IPC {
-#include "gpu/ipc/gpu_command_buffer_traits_multi.h"
-}  // namespace IPC
-
-// Generate param traits read methods.
-#include "ipc/param_traits_read_macros.h"
-namespace IPC {
-#include "gpu/ipc/gpu_command_buffer_traits_multi.h"
-}  // namespace IPC
-
-// Generate param traits log methods.
-#include "ipc/param_traits_log_macros.h"
-namespace IPC {
-#include "gpu/ipc/gpu_command_buffer_traits_multi.h"
-}  // namespace IPC
-
-namespace IPC {
-
-void ParamTraits<gpu::CommandBuffer::State> ::Write(Message* m,
-                                                    const param_type& p) {
-  WriteParam(m, p.get_offset);
-  WriteParam(m, p.token);
-  WriteParam(m, static_cast<int32>(p.error));
-  WriteParam(m, p.generation);
-}
-
-bool ParamTraits<gpu::CommandBuffer::State> ::Read(const Message* m,
-                                                   PickleIterator* iter,
-                                                   param_type* p) {
-  int32 temp;
-  if (ReadParam(m, iter, &p->get_offset) &&
-      ReadParam(m, iter, &p->token) &&
-      ReadParam(m, iter, &temp) &&
-      ReadParam(m, iter, &p->generation)) {
-    p->error = static_cast<gpu::error::Error>(temp);
-    return true;
-  } else {
-    return false;
-  }
-}
-
-void ParamTraits<gpu::CommandBuffer::State> ::Log(const param_type& p,
-                                                  std::string* l) {
-  l->append("<CommandBuffer::State>");
-}
-
-void ParamTraits<gpu::Mailbox>::Write(Message* m, const param_type& p) {
-  m->WriteBytes(p.name, sizeof(p.name));
-}
-
-bool ParamTraits<gpu::Mailbox>::Read(const Message* m,
-                                     PickleIterator* iter,
-                                     param_type* p) {
-  const char* bytes = NULL;
-  if (!iter->ReadBytes(&bytes, sizeof(p->name)))
-    return false;
-  DCHECK(bytes);
-  memcpy(p->name, bytes, sizeof(p->name));
-  return true;
-}
-
-void ParamTraits<gpu::Mailbox>::Log(const param_type& p, std::string* l) {
-  for (size_t i = 0; i < sizeof(p.name); ++i)
-    *l += base::StringPrintf("%02x", p.name[i]);
-}
-
-void ParamTraits<gpu::MailboxHolder>::Write(Message* m, const param_type& p) {
-  WriteParam(m, p.mailbox);
-  WriteParam(m, p.texture_target);
-  WriteParam(m, p.sync_point);
-}
-
-bool ParamTraits<gpu::MailboxHolder>::Read(const Message* m,
-                                           PickleIterator* iter,
-                                           param_type* p) {
-  if (!ReadParam(m, iter, &p->mailbox) ||
-      !ReadParam(m, iter, &p->texture_target) ||
-      !ReadParam(m, iter, &p->sync_point))
-    return false;
-  return true;
-}
-
-void ParamTraits<gpu::MailboxHolder>::Log(const param_type& p, std::string* l) {
-  ParamTraits<gpu::Mailbox>::Log(p.mailbox, l);
-  *l += base::StringPrintf(":%04x@%d", p.texture_target, p.sync_point);
-}
-
-void ParamTraits<gpu::ValueState>::Write(Message* m, const param_type& p) {
-  m->WriteData(reinterpret_cast<const char*>(&p),
-               sizeof(gpu::ValueState));
-}
-
-bool ParamTraits<gpu::ValueState>::Read(const Message* m,
-                                        PickleIterator* iter,
-                                        param_type* p) {
-  int length;
-  const char* data = NULL;
-  if (!iter->ReadData(&data, &length) || length != sizeof(gpu::ValueState))
-    return false;
-  DCHECK(data);
-  memcpy(p, data, sizeof(gpu::ValueState));
-  return true;
-}
-
-void ParamTraits<gpu::ValueState>::Log(const param_type& p, std::string* l) {
-  l->append("<ValueState (");
-  for (size_t i = 0; i < sizeof(p.int_value); ++i)
-    *l += base::StringPrintf("%i ", p.int_value[i]);
-  l->append(" int values ");
-  for (size_t i = 0; i < sizeof(p.float_value); ++i)
-    *l += base::StringPrintf("%f ", p.float_value[i]);
-  l->append(" float values)>");
-}
-
-}  // namespace IPC
diff --git a/gpu/ipc/gpu_command_buffer_traits.h b/gpu/ipc/gpu_command_buffer_traits.h
deleted file mode 100644
index 1c7e02e..0000000
--- a/gpu/ipc/gpu_command_buffer_traits.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef GPU_IPC_GPU_PARAM_TRAITS_H_
-#define GPU_IPC_GPU_PARAM_TRAITS_H_
-
-#include "gpu/command_buffer/common/command_buffer.h"
-#include "gpu/gpu_export.h"
-#include "gpu/ipc/gpu_command_buffer_traits_multi.h"
-#include "ipc/ipc_message_utils.h"
-
-namespace gpu {
-struct Mailbox;
-struct MailboxHolder;
-union ValueState;
-}
-
-namespace IPC {
-
-template <>
-struct GPU_EXPORT ParamTraits<gpu::CommandBuffer::State> {
-  typedef gpu::CommandBuffer::State param_type;
-  static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, PickleIterator* iter, param_type* p);
-  static void Log(const param_type& p, std::string* l);
-};
-
-template<>
-struct GPU_EXPORT ParamTraits<gpu::Mailbox> {
-  typedef gpu::Mailbox param_type;
-  static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, PickleIterator* iter, param_type* p);
-  static void Log(const param_type& p, std::string* l);
-};
-
-template <>
-struct GPU_EXPORT ParamTraits<gpu::MailboxHolder> {
-  typedef gpu::MailboxHolder param_type;
-  static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, PickleIterator* iter, param_type* p);
-  static void Log(const param_type& p, std::string* l);
-};
-
-template <>
-struct GPU_EXPORT ParamTraits<gpu::ValueState> {
-  typedef gpu::ValueState param_type;
-  static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, PickleIterator* iter, param_type* p);
-  static void Log(const param_type& p, std::string* l);
-};
-
-}  // namespace IPC
-
-#endif  // GPU_IPC_GPU_PARAM_TRAITS_H_
diff --git a/gpu/ipc/gpu_command_buffer_traits_multi.h b/gpu/ipc/gpu_command_buffer_traits_multi.h
deleted file mode 100644
index 810dbf8..0000000
--- a/gpu/ipc/gpu_command_buffer_traits_multi.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// 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.
-
-// Multiply-included message file, hence no include guard here.
-#include "gpu/command_buffer/common/capabilities.h"
-#include "gpu/gpu_export.h"
-#include "ipc/ipc_message_utils.h"
-#include "ipc/param_traits_macros.h"
-
-#undef IPC_MESSAGE_EXPORT
-#define IPC_MESSAGE_EXPORT GPU_EXPORT
-
-IPC_STRUCT_TRAITS_BEGIN(gpu::Capabilities::ShaderPrecision)
-  IPC_STRUCT_TRAITS_MEMBER(min_range)
-  IPC_STRUCT_TRAITS_MEMBER(max_range)
-  IPC_STRUCT_TRAITS_MEMBER(precision)
-IPC_STRUCT_TRAITS_END()
-
-IPC_STRUCT_TRAITS_BEGIN(gpu::Capabilities::PerStagePrecisions)
-  IPC_STRUCT_TRAITS_MEMBER(low_int)
-  IPC_STRUCT_TRAITS_MEMBER(medium_int)
-  IPC_STRUCT_TRAITS_MEMBER(high_int)
-  IPC_STRUCT_TRAITS_MEMBER(low_float)
-  IPC_STRUCT_TRAITS_MEMBER(medium_float)
-  IPC_STRUCT_TRAITS_MEMBER(high_float)
-IPC_STRUCT_TRAITS_END()
-
-IPC_STRUCT_TRAITS_BEGIN(gpu::Capabilities)
-  IPC_STRUCT_TRAITS_MEMBER(vertex_shader_precisions)
-  IPC_STRUCT_TRAITS_MEMBER(fragment_shader_precisions)
-  IPC_STRUCT_TRAITS_MEMBER(max_combined_texture_image_units)
-  IPC_STRUCT_TRAITS_MEMBER(max_cube_map_texture_size)
-  IPC_STRUCT_TRAITS_MEMBER(max_fragment_uniform_vectors)
-  IPC_STRUCT_TRAITS_MEMBER(max_renderbuffer_size)
-  IPC_STRUCT_TRAITS_MEMBER(max_texture_image_units)
-  IPC_STRUCT_TRAITS_MEMBER(max_texture_size)
-  IPC_STRUCT_TRAITS_MEMBER(max_varying_vectors)
-  IPC_STRUCT_TRAITS_MEMBER(max_vertex_attribs)
-  IPC_STRUCT_TRAITS_MEMBER(max_vertex_texture_image_units)
-  IPC_STRUCT_TRAITS_MEMBER(max_vertex_uniform_vectors)
-  IPC_STRUCT_TRAITS_MEMBER(num_compressed_texture_formats)
-  IPC_STRUCT_TRAITS_MEMBER(num_shader_binary_formats)
-  IPC_STRUCT_TRAITS_MEMBER(bind_generates_resource_chromium)
-  IPC_STRUCT_TRAITS_MEMBER(max_transform_feedback_separate_attribs)
-  IPC_STRUCT_TRAITS_MEMBER(max_uniform_buffer_bindings)
-  IPC_STRUCT_TRAITS_MEMBER(uniform_buffer_offset_alignment)
-  IPC_STRUCT_TRAITS_MEMBER(post_sub_buffer)
-  IPC_STRUCT_TRAITS_MEMBER(egl_image_external)
-  IPC_STRUCT_TRAITS_MEMBER(texture_format_atc)
-  IPC_STRUCT_TRAITS_MEMBER(texture_format_bgra8888)
-  IPC_STRUCT_TRAITS_MEMBER(texture_format_dxt1)
-  IPC_STRUCT_TRAITS_MEMBER(texture_format_dxt5)
-  IPC_STRUCT_TRAITS_MEMBER(texture_format_etc1)
-  IPC_STRUCT_TRAITS_MEMBER(texture_format_etc1_npot)
-  IPC_STRUCT_TRAITS_MEMBER(texture_rectangle)
-  IPC_STRUCT_TRAITS_MEMBER(iosurface)
-  IPC_STRUCT_TRAITS_MEMBER(texture_usage)
-  IPC_STRUCT_TRAITS_MEMBER(texture_storage)
-  IPC_STRUCT_TRAITS_MEMBER(discard_framebuffer)
-  IPC_STRUCT_TRAITS_MEMBER(sync_query)
-  IPC_STRUCT_TRAITS_MEMBER(image)
-  IPC_STRUCT_TRAITS_MEMBER(blend_equation_advanced)
-  IPC_STRUCT_TRAITS_MEMBER(blend_equation_advanced_coherent)
-  IPC_STRUCT_TRAITS_MEMBER(texture_rg)
-IPC_STRUCT_TRAITS_END()
diff --git a/gpu/khronos_glcts_support/DEPS b/gpu/khronos_glcts_support/DEPS
deleted file mode 100644
index 9d9bc74..0000000
--- a/gpu/khronos_glcts_support/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+third_party/khronos_glcts",
-]
diff --git a/gpu/khronos_glcts_support/khronos_glcts.gypi b/gpu/khronos_glcts_support/khronos_glcts.gypi
deleted file mode 100644
index 07d9cd1..0000000
--- a/gpu/khronos_glcts_support/khronos_glcts.gypi
+++ /dev/null
@@ -1,518 +0,0 @@
-# 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.
-
-{
-  'target_defaults': {
-    'defines': [
-      'DEQP_TARGET_NAME="chrome-gpu-command-buffer"',
-      'DEQP_SUPPORT_GLES2=1',
-      'DEQP_SUPPORT_EGL=1',
-      'GTF_API=GTF_GLES20',
-    ],
-    'conditions': [
-      ['OS=="linux"', {
-        'defines': [
-          '_XOPEN_SOURCE=500',
-        ],
-        'cflags!': [
-          '-fno-exceptions',
-        ],
-        'cflags_cc!': [
-          '-fno-exceptions',
-        ],
-        'target_conditions': [
-          ['_type=="static_library"', {
-            'cflags_cc!': [
-              '-fno-rtti',
-            ],
-          }],
-        ],
-      }],
-    ],
-  },
-  'variables': {
-
-    # WA: Suppress [chromium-style] enforcement errors when compiled with
-    # clang.  The third_party/khronos_glcts sourcecode does not comply with
-    # the chromium-style standards.
-    'clang_use_chrome_plugins': 0,
-
-    'glcts_data_dirs': [
-      '<(DEPTH)/third_party/khronos_glcts/cts/data',
-    ],
-    'glcts_gtf_data_dirs': [
-        '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/GL',
-        '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/GL2ExtensionTests',
-        '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/GL2FixedTests',
-        '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/GL2Tests',
-        '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/GLCoverage',
-    ],
-    'glcts_gtf_runfiles': [
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/mustpass_es20.run',
-    ],
-    'gtf_core_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFArguments.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFFileReader.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFLog.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFMemFile.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFModelData.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFPort.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFStringUtils.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFTest.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFTestCompareGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFTestDriver.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFTestElement.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFTestUtil.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFgl.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/MIMG.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/XmlUtils.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/eglu.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/eglut.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/gl2Native.c',
-    ],
-    'gtf_gl_core_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL/GTFAttDataGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL/GTFDepthRangeParamGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL/GTFModelDataGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL/GTFPointParamGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL/GTFReadPixelsGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL/GTFShaderDataGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL/GTFShaderTextGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL/GTFStateDataGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL/GTFTestTextureFloatBase.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL/GTFTexDataGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL/GTFTexParamGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL/GTFUniDataGL.c',
-    ],
-    'gtf_gles2_srcs': [
-      # Base
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestAttributeGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestBindAllAttributes.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestCreateObjectGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestDetachGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestFixedDataType.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestFramebufferObjects.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetAttachedObjects.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetAttributeLocation.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetBIFD.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetExtensions.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetProgramInfoLog.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetProgramiv.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetShaderInfoLog.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetShaderiv.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetUniform.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestGetVertexAttrib.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestMaxVertexAttrib.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestMultipleShaders.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestRelinkProgram.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestUniform.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestUniformQueryGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestVertexAttribPointer.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestVertexAttributes.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2Tests/GTFGL2TestVertexProgramPointSize.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFTestGL2Test.c',
-
-      # Build
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFTestBuildGL.c',
-
-      # Shader load
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFTestShaderLoadGL.c',
-
-      # Rasterization
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFTestRasterizationGL.c',
-
-      # Complexity
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFTestComplexityGL.c',
-
-      # Coverage
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFCoverageDict.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFCoverageGL.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFTestCoverageGL.c',
-
-      # Fixed-function
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBlend.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBufferClear.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBufferColor.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBufferCorners.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestBufferObjects.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestClip.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestColorRamp.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestCopyTexture.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestDepthBufferClear.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestDepthBufferFunctions.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestDither.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestDivideByZero.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestGets.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestMipmapsInterpolation.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestMipmapsSelection.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestPointRasterization.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestPointSprites.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestPolygonCull.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestScissor.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestStencilPlaneClear.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestStencilPlaneCorners.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestStencilPlaneFunction.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestStencilPlaneOperation.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestTextureEdgeClamp.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestTransformViewport.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestTriangleRasterization.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestTriangleTiling.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestUserClipPlanes.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestVertexOrder.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedTestViewportClamp.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedUtilg.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2FixedTests/GTFFixedUtilr.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFTestFixedGL.c',
-
-      # Extensions
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestConditionalQuery.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDataType1010102.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDebug.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDepth24.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDepth32.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDepthTexture.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestDepthTextureCubeMap.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestElementIndexUINT.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestFBORenderMipmap.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestFragmentPrecisionHigh.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestFramebufferObject.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestMapBuffer.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestOcclusionQuery.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestPackedDepthStencil.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestPointSizeArray.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestPointSprite.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestReadFormat.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestStencil1.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestStencil4.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestStencil8.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTexture3D.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTextureCompressionASTCLDR.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTextureFloat.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTextureFloatLinear.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestTextureNPOT.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestUtilp.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestVertexArrayObject.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestVertexHalfFloat.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GTFTestExtension.c',
-    ],
-    'gtf_gles2_es_only_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestCompressedETC1RGB8Texture.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestCompressedPalettedTexture.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestEGLCreateContext.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestEGLImage.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestEGLImageExternal.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestRGB8RGBA8.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestRequiredInternalformat.c',
-      '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source/GL2ExtensionTests/GTFExtensionTestSurfacelessContext.c',
-    ],
-    'glcts_common_sources': [
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcConfigList.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcConfigList.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcConfigListCase.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcConfigListCase.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcConfigPackage.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcConfigPackage.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcContext.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcContext.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcFragDepthTests.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcFragDepthTests.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcInfoTests.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcInfoTests.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderIndexingTests.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderIndexingTests.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderIntegerMixTests.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderIntegerMixTests.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderLibrary.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderLibrary.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderLibraryCase.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderLibraryCase.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderLoopTests.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderLoopTests.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderRenderCase.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderRenderCase.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderStructTests.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderStructTests.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderSwitchTests.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcShaderSwitchTests.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcTestCase.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcTestCase.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcTestCaseWrapper.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcTestCaseWrapper.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcTestPackage.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcTestPackage.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcTestSubcase.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcTestSubcase.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcUniformBlockCase.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcUniformBlockCase.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcUniformBlockTests.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/common/glcUniformBlockTests.hpp',
-    ],
-    'glcts_es2_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/cts/gles2/es2cTestPackage.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/gles2/es2cTestPackage.hpp',
-    ],
-    'glcts_gtf_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/cts/gtf/gtfTestCase.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/gtf/gtfTestCase.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/gtf/gtfTestGroup.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/gtf/gtfTestGroup.hpp',
-    ],
-    'glcts_gtf_wrapper_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/cts/gtf/gtfTestContext.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/gtf/gtfTestContext.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/gtf/gtfWrapper.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/gtf/gtfWrapper.h',
-    ],
-    'glcts_runner_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/cts/runner/glcTestRunner.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/cts/runner/glcTestRunner.hpp',
-    ],
-    'qphelper_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/framework/qphelper/qpCommandLine.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/qphelper/qpCommandLine.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/qphelper/qpCrashHandler.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/qphelper/qpCrashHandler.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/qphelper/qpDebugOut.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/qphelper/qpDebugOut.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/qphelper/qpInfo.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/qphelper/qpInfo.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/qphelper/qpTestLog.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/qphelper/qpTestLog.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/qphelper/qpWatchDog.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/qphelper/qpWatchDog.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/qphelper/qpXmlWriter.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/qphelper/qpXmlWriter.h',
-    ],
-    'tcutil_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuApp.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuApp.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuCommandLine.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuCommandLine.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuCompressedTexture.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuCompressedTexture.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuDefs.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuDefs.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuFloat.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuFormatUtil.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuFuzzyImageCompare.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuFuzzyImageCompare.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuImageCompare.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuImageCompare.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuImageIO.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuImageIO.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuMatrix.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuMatrixUtil.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuPixelFormat.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuPlatform.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuPlatform.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuRandomValueIterator.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuRandomValueIterator.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuRenderTarget.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuRenderTarget.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuResource.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuResource.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuRGBA.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuRGBA.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuStringTemplate.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuStringTemplate.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuSurface.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuSurface.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTestCase.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTestCase.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTestCaseWrapper.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTestCaseWrapper.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTestContext.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTestContext.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTestExecutor.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTestExecutor.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTestLog.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTestLog.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTestPackage.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTestPackage.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTexture.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTexture.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTextureUtil.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuTextureUtil.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuVector.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuVectorType.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/common/tcuVectorUtil.hpp',
-      # Not used by anything...
-      #'<(DEPTH)/third_party/khronos_glcts/framework/common/tcuZipResource.cpp',
-      #'<(DEPTH)/third_party/khronos_glcts/framework/common/tcuZipResource.hpp',
-    ],
-    'glutil_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluCallLogWrapper.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluCallLogWrapper.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluContextInfo.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluContextInfo.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluDefs.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluDefs.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluDrawUtil.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluDrawUtil.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluFboRenderContext.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluFboRenderContext.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluPixelTransfer.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluPixelTransfer.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluPlatform.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluProgram.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluProgram.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluRenderContext.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluRenderContext.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluShaderUtil.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluShaderUtil.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluStateReset.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluStateReset.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluStrUtil.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluStrUtil.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluTexture.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluTexture.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluTextureUtil.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluTextureUtil.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluVarType.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluVarType.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluVarTypeUtil.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/gluVarTypeUtil.hpp',
-    ],
-    'glwrapper_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/wrapper/glw.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/wrapper/glwDefs.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/wrapper/glwDefs.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/wrapper/glwEnums.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/wrapper/glwFunctionLoader.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/wrapper/glwFunctions.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/wrapper/glwFunctions.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/wrapper/glwInitES20Direct.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/wrapper/glwInitES20Direct.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/wrapper/glwInitFunctions.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/wrapper/glwInitFunctions.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/wrapper/glwWrapper.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/opengl/wrapper/glwWrapper.hpp',
-    ],
-    'tcutil_egl_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/framework/egl/tcuEgl.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/egl/tcuEgl.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/egl/tcuEglCallLogWrapper.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/egl/tcuEglCallLogWrapper.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/egl/tcuEglConfigFilter.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/egl/tcuEglConfigFilter.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/egl/tcuEglConfigInfo.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/egl/tcuEglConfigInfo.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/egl/tcuEglPlatform.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/egl/tcuEglPlatform.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/egl/tcuEglStrUtil.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/egl/tcuEglStrUtil.hpp',
-    ],
-    'debase_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deDefs.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deDefs.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deFloat16.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deFloat16.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deInt32.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deInt32.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deInt32Test.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deMath.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deMath.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deMemory.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deMemory.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deRandom.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deRandom.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deString.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase/deString.h',
-    ],
-    'depool_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/deMemPool.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/deMemPool.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolArray.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolArray.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolHash.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolHash.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolHashArray.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolHashArray.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolHashSet.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolHashSet.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolHeap.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolHeap.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolMultiSet.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolMultiSet.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolSet.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolSet.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolStringBuilder.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolStringBuilder.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolTest.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool/dePoolTest.h',
-    ],
-    'dethread_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/dethread/deAtomic.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/dethread/deAtomic.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/dethread/deMutex.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/dethread/deSemaphore.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/dethread/deThread.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/dethread/deThreadLocal.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/dethread/deThreadTest.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/dethread/deThreadTest.h',
-    ],
-    'dethread_unix_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/dethread/unix/deMutexUnix.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/dethread/unix/deSemaphoreUnix.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/dethread/unix/deThreadLocalUnix.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/dethread/unix/deThreadUnix.c',
-    ],
-    'deutil_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deClock.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deClock.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deCommandLine.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deCommandLine.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deDynamicLibrary.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deDynamicLibrary.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deFile.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deFile.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deProcess.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deProcess.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deSocket.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deSocket.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deTimer.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deTimer.h',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deTimerTest.c',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil/deTimerTest.h',
-    ],
-    'decpp_srcs': [
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deBlockBuffer.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deBlockBuffer.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deDefs.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deDefs.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deDirectoryIterator.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deDirectoryIterator.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deDynamicLibrary.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deDynamicLibrary.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deFilePath.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deFilePath.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deMemPool.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deMemPool.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deMutex.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deMutex.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/dePoolArray.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/dePoolArray.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/dePoolString.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/dePoolString.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deRandom.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deRandom.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deRingBuffer.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deRingBuffer.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deSemaphore.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deSemaphore.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deSharedPtr.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deSharedPtr.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deSocket.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deSocket.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deStringUtil.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deStringUtil.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deThread.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deThread.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deThreadSafeRingBuffer.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deThreadSafeRingBuffer.hpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deUniquePtr.cpp',
-      '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp/deUniquePtr.hpp',
-    ],
-  }
-}
diff --git a/gpu/khronos_glcts_support/khronos_glcts_cts.gyp b/gpu/khronos_glcts_support/khronos_glcts_cts.gyp
deleted file mode 100644
index 560deec..0000000
--- a/gpu/khronos_glcts_support/khronos_glcts_cts.gyp
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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.
-
-{
-  'includes': [
-    'khronos_glcts.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'glcts_common',
-      'type': 'static_library',
-      'conditions': [
-        ['OS=="linux"', {
-          'cflags_cc': [
-            # WA: Suppress "implicit conversion turns string literal into
-            # bool" compile warning from glcShaderIndexingTests.cpp,
-            # glcShaderLibraryCase.cpp and glcShaderLoopTests.cpp during
-            # Debug build
-            # TODO(uartie) fix.
-            '-Wno-string-conversion',
-          ],
-        }],
-      ],
-      'dependencies': [
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:delibs',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:tcutil',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:glutil',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:tcutil_egl',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/cts/common',
-        ],
-      },
-      'sources': [
-        '<@(glcts_common_sources)',
-      ],
-    },
-    {
-      'target_name': 'glcts_gtf_wrapper',
-      'type': 'static_library',
-      'dependencies': [
-        'glcts_common',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:delibs',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:tcutil',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:glutil',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:tcutil_egl',
-      ],
-      'include_dirs': [
-        '<(DEPTH)/third_party/khronos_glcts/cts/gtf',
-        '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source'
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/cts/gtf',
-        ],
-      },
-      'sources': [
-        '<@(glcts_gtf_wrapper_srcs)',
-      ],
-    },
-    {
-      'target_name': 'glcts_gtf',
-      'type': 'static_library',
-      'dependencies': [
-        'glcts_common', 'glcts_gtf_wrapper',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_gtf.gyp:gtf_es',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:delibs',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:tcutil',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:glutil',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/cts/gtf',
-        ],
-      },
-      'sources': [
-        '<@(glcts_gtf_srcs)',
-      ],
-    },
-    {
-      'target_name': 'glcts_es2',
-      'type': 'static_library',
-      'dependencies': [
-        'glcts_common', 'glcts_gtf',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:delibs',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:tcutil',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:glutil',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/cts/gles2',
-        ],
-      },
-      'export_dependent_settings': [
-        'glcts_common',
-      ],
-      'sources': [
-        '<@(glcts_es2_srcs)',
-      ],
-    },
-  ],
-}
diff --git a/gpu/khronos_glcts_support/khronos_glcts_framework.gyp b/gpu/khronos_glcts_support/khronos_glcts_framework.gyp
deleted file mode 100644
index 578794f..0000000
--- a/gpu/khronos_glcts_support/khronos_glcts_framework.gyp
+++ /dev/null
@@ -1,247 +0,0 @@
-# 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.
-
-{
-  'includes': [
-    'khronos_glcts.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'khronos_glcts_framework',
-      'type': 'static_library',
-      'dependencies': [
-        'delibs', 'qphelper', 'tcutil', 'glutil', 'tcutil_egl',
-      ],
-      'export_dependent_settings': [
-        'delibs', 'qphelper', 'tcutil', 'glutil', 'tcutil_egl',
-      ],
-    },
-    {
-      'target_name': 'delibs',
-      'type': 'static_library',
-      'dependencies': [
-        'debase', 'depool', 'dethread', 'deutil', 'decpp',
-      ],
-      'export_dependent_settings': [
-        'debase', 'depool', 'dethread', 'deutil', 'decpp',
-      ],
-    },
-    {
-      'target_name': 'debase',
-      'type': 'static_library',
-      'conditions': [
-        ['OS=="linux"', {
-          'cflags': [
-            # WA: Suppress "implicit declaration of function '__assert_fail'
-            # is invalid in C99" warning from deDefs.c for Release compiles.
-            # TODO(uartie) fix.
-            '-Wno-implicit-function-declaration',
-          ],
-        }],
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/framework/delibs/debase',
-        ],
-      },
-      'sources': [
-        '<@(debase_srcs)',
-      ],
-    },
-    {
-      'target_name': 'depool',
-      'type': 'static_library',
-      'dependencies': [
-        'debase',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/framework/delibs/depool',
-        ],
-      },
-      'sources': [
-        '<@(depool_srcs)',
-      ],
-    },
-    {
-      'target_name': 'dethread',
-      'type': 'static_library',
-      'dependencies': [
-        'debase',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/framework/delibs/dethread',
-        ],
-      },
-      'sources': [
-        '<@(dethread_srcs)',
-      ],
-      'conditions': [
-        ['OS=="linux"', {
-          'sources': [
-            '<@(dethread_unix_srcs)',
-          ],
-          'include_dirs': [
-            '<(DEPTH)/third_party/khronos_glcts/framework/delibs/dethread',
-          ],
-        }],
-      ]
-    },
-    {
-      'target_name': 'deutil',
-      'type': 'static_library',
-      'dependencies': [
-        'debase', 'depool', 'dethread',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/framework/delibs/deutil',
-        ],
-      },
-      'sources': [
-        '<@(deutil_srcs)',
-      ],
-    },
-    {
-      'target_name': 'decpp',
-      'type': 'static_library',
-      'dependencies': [
-        'debase', 'depool', 'dethread', 'deutil',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/framework/delibs/decpp',
-        ],
-      },
-      'sources': [
-        '<@(decpp_srcs)',
-      ],
-    },
-    {
-      'target_name': 'qphelper',
-      'type': 'static_library',
-      'defines': [
-        'QP_SUPPORT_PNG',
-      ],
-      'dependencies': [
-        'debase', 'depool', 'dethread', 'deutil',
-        '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/framework/qphelper',
-        ],
-      },
-      'sources': [
-        '<@(qphelper_srcs)',
-      ],
-    },
-    {
-      'target_name': 'tcutil',
-      'type': 'static_library',
-      'conditions': [
-        ['OS=="linux"', {
-          'cflags_cc': [
-            # WA: Suppress "cast to 'const unsigned char *' from smaller
-            # integer type 'deUint32' (aka 'unsigned int')" compile warning
-            # from tcuRandomValueIterator.hpp.
-            # TODO(uartie) fix.
-            '-Wno-int-to-pointer-cast',
-          ],
-        }],
-      ],
-      'dependencies': [
-        'delibs', 'qphelper',
-        '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
-      ],
-      'include_dirs': [
-        '<(DEPTH)/third_party/khronos_glcts/framework/delibs/libpng', #png.hpp
-      ],
-      'export_dependent_settings': [
-        'qphelper',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/framework/common',
-        ],
-      },
-      'sources': [
-        '<@(tcutil_srcs)',
-      ],
-    },
-    {
-      'target_name': 'glwrapper',
-      'type': 'static_library',
-      'dependencies': [
-        'delibs',
-        '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib_nocheck',
-        '<(DEPTH)/gpu/gpu.gyp:command_buffer_service',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/framework/opengl/wrapper',
-        ],
-      },
-      'sources': [
-        '<@(glwrapper_srcs)',
-      ],
-    },
-    {
-      'target_name': 'glutil',
-      'type': 'static_library',
-      'dependencies': [
-        'glwrapper', 'delibs', 'tcutil',
-      ],
-      'export_dependent_settings': [
-        'glwrapper',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/framework/opengl',
-        ],
-      },
-      'sources': [
-        '<@(glutil_srcs)',
-      ],
-    },
-    {
-      'target_name': 'tcutil_egl',
-      'type': 'static_library',
-      'conditions': [
-        ['OS=="linux"', {
-          'cflags_cc': [
-            # WA: Suppress "cast to 'void *' from smaller
-            # integer type 'glw::GLuint' (aka 'unsigned int')" compile
-            # warning from tcuEglPlatform.cpp.
-            # TODO(uartie) fix.
-            '-Wno-int-to-void-pointer-cast',
-          ],
-        }],
-      ],
-      'dependencies': [
-        'delibs', 'tcutil', 'glwrapper',
-        # TODO: We may want to phase out the old gles2_conform support in preference
-        # of this implementation.  So eventually we'll need to move the egl_native
-        # stuff here or to a shareable location/path.
-        '<(DEPTH)/gpu/gles2_conform_support/gles2_conform_support.gyp:egl_native',
-        '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers',
-      ],
-      'include_dirs': [
-        '<(DEPTH)/third_party/khronos_glcts/framework/opengl',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/framework/egl',
-        ],
-      },
-      'export_dependent_settings': [
-        '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers',
-      ],
-      'sources': [
-        '<@(tcutil_egl_srcs)',
-      ],
-    },
-  ],
-}
diff --git a/gpu/khronos_glcts_support/khronos_glcts_gtf.gyp b/gpu/khronos_glcts_support/khronos_glcts_gtf.gyp
deleted file mode 100644
index 246ab07..0000000
--- a/gpu/khronos_glcts_support/khronos_glcts_gtf.gyp
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.
-
-{
-  'includes': [
-    'khronos_glcts.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'gtf_es',
-      'type': 'static_library',
-      'conditions': [
-        ['OS=="linux"', {
-          'cflags': [
-            # WA: Suppress "control reaches end of non-void function" compile
-            # warning from GTFTestDriver.c.
-            # TODO(uartie) fix.
-            '-Wno-return-type',
-
-            # WA: Suppress "incompatible pointer types passing to parameter"
-            # compile warning from GTFTestExtension.c.
-            # TODO(uartie) fix.
-            '-Wno-incompatible-pointer-types',
-
-            # WA: Suppress "passing 'GLint [15]' to parameter of type
-            # 'GLuint *' (aka 'unsigned int') converts between pointers to
-            # integer types with different sign" compile warning from
-            # GTFGL2TestGetAttachedObjects.c
-            # TODO(uartie) fix.
-            '-Wno-pointer-sign',
-
-            # WA: Suppress "comparison of unsigned expression >= 0 is always
-            # true" compile warning from GTFgl.c
-            # TODO(uartie) fix.
-            '-Wno-tautological-compare',
-
-            # WA: Suppress "equality comparison with extraneous parentheses"
-            # compile warning from GTFgl.c
-            # TODO(uartie) fix.
-            '-Wno-parentheses-equality',
-          ],
-        }],
-      ],
-      'dependencies': [
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:debase',
-        '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_cts.gyp:glcts_gtf_wrapper',
-        '<(DEPTH)/third_party/expat/expat.gyp:expat',
-      ],
-      'include_dirs': [
-        '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(DEPTH)/third_party/khronos_glcts/GTF_ES/glsl/GTF/Source',
-        ],
-      },
-      'sources': [
-        '<@(gtf_core_srcs)',
-        '<@(gtf_gl_core_srcs)',
-        '<@(gtf_gles2_srcs)',
-        '<@(gtf_gles2_es_only_srcs)',
-      ],
-    },
-  ],
-}
diff --git a/gpu/khronos_glcts_support/khronos_glcts_test.gyp b/gpu/khronos_glcts_support/khronos_glcts_test.gyp
deleted file mode 100644
index 70b1932..0000000
--- a/gpu/khronos_glcts_support/khronos_glcts_test.gyp
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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.
-
-{
-  'includes': [
-    'khronos_glcts.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'khronos_glcts_test',
-      'type': 'executable',
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/gpu/gpu.gyp:gpu',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-      ],
-      'sources': [
-        'khronos_glcts_test.cc',
-      ],
-      'conditions': [
-        ['internal_khronos_glcts_tests', {
-          'dependencies': [
-            'khronos_glcts_test_windowless',
-          ],
-          'variables': {
-            'khronos_glcts_test_output_dir': '<(SHARED_INTERMEDIATE_DIR)/gpu/khronos_glcts_test',
-          },
-          'sources': [
-            '<(khronos_glcts_test_output_dir)/khronos_glcts_test_autogen.cc',
-          ],
-          'actions': [
-            {
-              'action_name': 'generate_khronos_glcts_tests',
-              'inputs': [
-                'generate_khronos_glcts_tests.py',
-                'khronos_glcts_test.h',
-                '<@(glcts_gtf_runfiles)',
-              ],
-              'outputs': [
-                '<(khronos_glcts_test_output_dir)/khronos_glcts_test_autogen.cc',
-              ],
-              'action': [
-                'python',
-                'generate_khronos_glcts_tests.py',
-                '--outdir=<(khronos_glcts_test_output_dir)',
-                '<@(glcts_gtf_runfiles)',
-              ],
-            },
-          ],
-        }],
-      ],
-    },
-  ],
-  'conditions': [
-    ['internal_khronos_glcts_tests', {
-      'targets': [
-        {
-          'target_name': 'tcutil_platform_windowless',
-          'type': 'static_library',
-          'dependencies': [
-            '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:khronos_glcts_framework',
-          ],
-          'sources': [
-            'native/egl_native_windowless.cc',
-          ],
-        },
-        {
-          'target_name': 'khronos_glcts_test_windowless',
-          'type': 'executable',
-          'dependencies': [
-            'tcutil_platform_windowless',
-            '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_framework.gyp:khronos_glcts_framework',
-            '<(DEPTH)/gpu/khronos_glcts_support/khronos_glcts_cts.gyp:glcts_es2',
-          ],
-          'copies': [
-            {
-              'destination': '<(PRODUCT_DIR)/khronos_glcts_data/gl_cts',
-              'files': [
-                '<@(glcts_data_dirs)',
-              ],
-            },
-            {
-              'destination': '<(PRODUCT_DIR)/khronos_glcts_data/gl_cts/GTF',
-              'files': [
-                '<@(glcts_gtf_data_dirs)',
-                '<@(glcts_gtf_runfiles)',
-              ],
-            },
-          ],
-          'sources': [
-            '<(DEPTH)/third_party/khronos_glcts/cts/glcTestPackageEntry.cpp',
-            '<(DEPTH)/third_party/khronos_glcts/cts/glcTestPackageRegistry.cpp',
-            '<(DEPTH)/third_party/khronos_glcts/cts/glcTestPackageRegistry.hpp',
-            'native/main.cc',
-          ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/gpu/skia_bindings/DEPS b/gpu/skia_bindings/DEPS
deleted file mode 100644
index 3e2b989..0000000
--- a/gpu/skia_bindings/DEPS
+++ /dev/null
@@ -1,4 +0,0 @@
-include_rules = [
-  "+third_party/khronos",
-  "+third_party/skia",
-]
diff --git a/gpu/skia_bindings/skia_bindings.gyp b/gpu/skia_bindings/skia_bindings.gyp
deleted file mode 100644
index 3e844c4..0000000
--- a/gpu/skia_bindings/skia_bindings.gyp
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2013 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.
-
-{
-  'variables': {
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      # GN version: //gpu/skia_bindings
-      'target_name': 'gpu_skia_bindings',
-      'type': 'static_library',
-      'dependencies': [
-        '../gpu.gyp:gles2_c_lib',
-        '../../skia/skia.gyp:skia',
-      ],
-      'sources': [
-        'gl_bindings_skia_cmd_buffer.cc',
-        'gl_bindings_skia_cmd_buffer.h',
-      ],
-    }
-  ]
-}
diff --git a/gpu/tools/tools.gyp b/gpu/tools/tools.gyp
deleted file mode 100644
index 4ea41b7..0000000
--- a/gpu/tools/tools.gyp
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'variables': {
-    'chromium_code': 1,
-  },
-  'targets': [
-  ],
-  'conditions': [
-    ['OS == "linux" and target_arch != "arm" and use_x11==1', {
-      'targets': [
-        {
-          # GN: //gpu:compositor_model_bench
-          'target_name': 'compositor_model_bench',
-          'type': 'executable',
-          'dependencies': [
-            '../../base/base.gyp:base',
-            '../../build/linux/system.gyp:x11',
-            '../../ui/gl/gl.gyp:gl',
-          ],
-          'libraries': [
-            '-lGL',
-            '-ldl',
-          ],
-          'sources': [
-            'compositor_model_bench/compositor_model_bench.cc',
-            'compositor_model_bench/forward_render_model.cc',
-            'compositor_model_bench/render_model_utils.cc',
-            'compositor_model_bench/render_models.cc',
-            'compositor_model_bench/render_tree.cc',
-            'compositor_model_bench/shaders.cc',
-          ],
-        },
-      ],
-    }],
-  ],
-}