Normalize the top-level ui/ module.

gpu/gpu.gyp

 # Copyright (c) 2011 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.
@@ skipping 162 matching lines @@
       'all_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'dependencies': [
         'command_buffer_common',
         'gpu_common',
         '../app/app.gyp:app_base',
         '../base/base.gyp:base',
-        '../ui/gfx/gfx.gyp:gfx',
+        '../ui/ui.gyp:ui_gfx',
         '../third_party/angle/src/build_angle.gyp:translator_glsl',
       ],
       'sources': [
         'command_buffer/service/buffer_manager.h',
         'command_buffer/service/buffer_manager.cc',
         'command_buffer/service/framebuffer_manager.h',
         'command_buffer/service/framebuffer_manager.cc',
         'command_buffer/service/cmd_buffer_engine.h',
         'command_buffer/service/cmd_parser.cc',
         'command_buffer/service/cmd_parser.h',
@@ skipping 207 matching lines @@
       },
     ],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: