Revert r118525 / Re-land r118240 - the build failure was a flake.

gpu/gles2_conform_support/gles2_conform_support.gyp

Index: gpu/gles2_conform_support/gles2_conform_support.gyp
diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp
index c9881d7858542f5e424f7a85712d21df04b3ca71..2341657b0561d7eae5ffb09f9fcd3739558854d1 100644
--- a/gpu/gles2_conform_support/gles2_conform_support.gyp
+++ b/gpu/gles2_conform_support/gles2_conform_support.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# 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.
 
@@ -31,6 +31,7 @@
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
         '<(DEPTH)/gpu/gpu.gyp:command_buffer_service',
       ],
       'include_dirs': ['<(DEPTH)/third_party/khronos'],