Move ui.gyp into ui/base/ directory.

gpu/gles2_conform_support/gles2_conform_support.gyp

 # 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.
@@ skipping 17 matching lines @@
      }],
    ],
 
   },
   'targets': [
     {
       'target_name': 'egl_native',
       'type': 'static_library',
       'dependencies': [
         '../../base/base.gyp:base',
+        '../../gpu/gpu.gyp:command_buffer_service',
+        '../../gpu/gpu.gyp:gles2_implementation_client_side_arrays_no_check',
         '../../gpu/gpu.gyp:gpu',
-        '../../gpu/gpu.gyp:gles2_implementation_client_side_arrays_no_check',
-        '../../gpu/gpu.gyp:command_buffer_service',
         '../../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',
-        '../../ui/ui.gyp:ui',
       ],
       'sources': [
         'egl/config.cc',
         'egl/config.h',
         'egl/display.cc',
         'egl/display.h',
         'egl/egl.cc',
         'egl/surface.cc',
         'egl/surface.h',
       ],
@@ skipping 78 matching lines @@
         'EGLAPI=',
         'EGLAPIENTRY=',
       ],
       'sources': [
         '<@(bootstrap_sources_native)',
         'gles2_conform_support.c'
       ],
     },
   ],
 }