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

gpu/gles2_conform_support/gles2_conform_support.gyp

-# 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.
 
 {
   'variables': {
     # 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',
@@ skipping 12 matching lines @@
         ],
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'egl_native',
       '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'],
       'sources': [
         'egl/config.cc',
         'egl/config.h',
         'egl/display.cc',
         'egl/display.h',
         'egl/egl.cc',
         'egl/surface.cc',
@@ skipping 51 matching lines @@
         'EGLAPI=',
         'EGLAPIENTRY=',
       ],
       'sources': [
         '<@(bootstrap_sources_native)',
         'gles2_conform_support.c'
       ],
     },
   ],
 }