Move DisplayUtils methods into gfx::Screen.

ui/ui_unittests.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'ui_test_support',
       'dependencies': [
         '../base/base.gyp:base',
@@ skipping 60 matching lines @@
         'gfx/color_analysis_unittest.cc',
         'gfx/color_utils_unittest.cc',
         'gfx/font_unittest.cc',
         'gfx/image/image_mac_unittest.mm',
         'gfx/image/image_unittest.cc',
         'gfx/image/image_unittest_util.h',
         'gfx/image/image_unittest_util.cc',
         'gfx/insets_unittest.cc',
         'gfx/rect_unittest.cc',
         'gfx/run_all_unittests.cc',
+        'gfx/screen_unittest.cc',
         'gfx/skbitmap_operations_unittest.cc',
         'gfx/skia_util_unittest.cc',
         'gfx/test_suite.cc',
         'gfx/test_suite.h',
         'views/rendering/border_unittest.cc',
         'views/view_unittest.cc',
         'views/widget/native_widget_win_unittest.cc',
         'views/widget/root_view_unittest.cc',
         'views/widget/widget_test_util.cc',
         'views/widget/widget_test_util.h',
@@ skipping 78 matching lines @@
           'sources': [
             'gfx/render_text_unittest.cc',
           ],
         }],
         ['use_aura==1 and OS!="win"', {
           'sources!': [
             # aura does not yet have clipboard support. http://crbug.com/97845
             'base/clipboard/clipboard_unittest.cc',
           ],
         }],
+        ['use_aura==1', {

[dhollowa, 2011/10/27 02:09:10]

This dependency causes a circularity between aura.gyp and ui.gyp.  This
currently only breaks Mac builds with use_aura=1.  But we're trying to eliminate
circularities where possible.

To be clear, the circularity is not between targets themselves, only .gyp files.

Is there a good way to break the cycle?

Here's the breakage I see on Mac:

Updating projects from gyp files...
Using overrides found in /Users/dhollowa/.gyp/include.gypi
Traceback (most recent call last):
  File "src/build/gyp_chromium", line 171, in <module>
    sys.exit(gyp.main(args))
  File "/Volumes/Code/code107/chromium.git/src/tools/gyp/pylib/gyp/__init__.py",
line 465, in main
    options.circular_check)
  File "/Volumes/Code/code107/chromium.git/src/tools/gyp/pylib/gyp/__init__.py",
line 101, in Load
    depth, generator_input_info, check, circular_check)
  File "/Volumes/Code/code107/chromium.git/src/tools/gyp/pylib/gyp/input.py",
line 2296, in Load
    VerifyNoGYPFileCircularDependencies(targets)
  File "/Volumes/Code/code107/chromium.git/src/tools/gyp/pylib/gyp/input.py",
line 1474, in VerifyNoGYPFileCircularDependencies
    ' '.join(bad_files)
gyp.input.CircularException: Some files not reachable, cycle in .gyp file
dependency graph detected involving some or all of:
src/webkit/support/webkit_support.gyp src/ui/gfx/surface/surface.gyp
src/gpu/gles2_conform_support/gles2_conform_support.gyp src/ui/gfx/gl/gl.gyp
src/printing/printing.gyp src/ui/ui.gyp
src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp
src/webkit/webkit.gyp src/gpu/demos/demos.gyp
src/chrome/default_plugin/default_plugin.gyp src/views/views.gyp
src/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp
src/tools/imagediff/image_diff.gyp src/ui/aura_shell/aura_shell.gyp
src/remoting/remoting.gyp src/build/all.gyp src/ui/gfx/compositor/compositor.gyp
src/gpu/gpu.gyp src/third_party/gles2_book/gles2_book.gyp src/chrome/chrome.gyp
src/content/content.gyp src/chrome/browser/sync/tools/sync_tools.gyp
src/media/media.gyp src/ui/aura/aura.gyp src/ppapi/ppapi_internal.gyp
Error: Command /usr/bin/python src/build/gyp_chromium returned non-zero exit
status 1 in /Volumes/Code/code107/chromium.git

+          'dependencies': [
+            'aura/aura.gyp:aura',
+          ],
+        }],
       ],
     },
   ],
 }