Normalize the top-level ui/ module.

remoting/remoting.gyp

 # Copyright (c) 2010 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,
   },
 
   'target_defaults': {
@@ skipping 106 matching lines @@
             '../media/base/yuv_row_posix.cc',
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'chromoting_plugin'
 
     {
       'target_name': 'chromoting_base',
       'type': '<(library)',
       'dependencies': [
-        '../ui/gfx/gfx.gyp:gfx',
+        '../ui/ui.gyp:ui_gfx',
         '../media/media.gyp:media',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../third_party/libvpx/libvpx.gyp:libvpx_include',
         '../third_party/zlib/zlib.gyp:zlib',
         'chromoting_jingle_glue',
         'proto/chromotocol.gyp:chromotocol_proto_lib',
         'proto/trace.gyp:trace_proto_lib',
         # TODO(hclam): Enable VP8 in the build.
         #'third_party/on2/on2.gyp:vp8',
       ],
@@ skipping 367 matching lines @@
       'type': 'executable',
       'dependencies': [
         'chromoting_base',
         'chromoting_client',
         'chromoting_host',
         'chromoting_jingle_glue',
         'chromoting_protocol',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
-        '../ui/gfx/gfx.gyp:gfx',
+        '../ui/ui.gyp:ui_gfx',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '../testing/gmock/include',
       ],
       'sources': [
         'base/codec_test.cc',
         'base/codec_test.h',
         'base/compound_buffer_unittest.cc',
@@ skipping 82 matching lines @@
       ],  # end of 'conditions'
     },  # end of target 'chromoting_unittests'
   ],  # end of targets
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: