[WIP] ui/window: Master CL.

ui/compositor/compositor.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,
   },
   'targets': [
     {
@@ skipping 103 matching lines @@
         'test/test_layers.h',
         'test/test_suite.cc',
         'test/test_suite.h',
         'test/test_utils.cc',
         'test/test_utils.h',
       ],
       'conditions': [
         ['use_x11==1', {
           'dependencies': [
             '<(DEPTH)/build/linux/system.gyp:x11',
-            '<(DEPTH)/ui/gfx/gfx.gyp:gfx_x11',
+            '<(DEPTH)/ui/gfx/x/gfx_x11.gyp:gfx_x11',
           ]
         }]
       ]
     },
     {
       'target_name': 'compositor_unittests',
       'type': 'executable',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:test_support_base',
@@ skipping 32 matching lines @@
               'dependencies': [
                 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
       ],
     },
   ],
 }