[WIP] ui/window: Master CL.

content/content_tests.gypi

 # Copyright (c) 2013 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.
 
 {
   'targets': [
     {
       'target_name': 'layouttest_support_content',
       'type': 'static_library',
       'conditions': [
@@ skipping 1417 matching lines @@
                 ],
               }],
               ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
                 'include_dirs': [
                   '<(DEPTH)/third_party/libva',
                 ],
               }],
               ['use_x11==1', {
                 'dependencies': [
                   '../build/linux/system.gyp:x11',  # Used by rendering_helper.cc
-                  '../ui/gfx/gfx.gyp:gfx_x11',
+                  '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
                 ],
               }],
             ],
             # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
             'msvs_disabled_warnings': [ 4267, ],
           },
         ]
     }],
     ['chromeos==1 and use_x11 == 1 and target_arch != "arm"', {
       'targets': [
@@ skipping 378 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }