Refactor screen/monitor so that gfx::Screen returns monitor object.

ui/ui_unittests.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'ui_test_support',
       'dependencies': [
         '../base/base.gyp:base',
@@ skipping 71 matching lines @@
         'gfx/codec/png_codec_unittest.cc',
         'gfx/color_analysis_unittest.cc',
         'gfx/color_utils_unittest.cc',
         'gfx/font_list_unittest.cc',
         'gfx/font_unittest.cc',
         'gfx/image/image_mac_unittest.mm',
         'gfx/image/image_unittest.cc',
         'gfx/image/image_unittest_util.cc',
         'gfx/image/image_unittest_util.h',
         'gfx/insets_unittest.cc',
+        'gfx/monitor_unittest.cc',
         'gfx/rect_unittest.cc',
         'gfx/screen_unittest.cc',
         'gfx/shadow_value_unittest.cc',
         'gfx/skbitmap_operations_unittest.cc',
         'gfx/skia_util_unittest.cc',
         'gfx/transform_util_unittest.cc',
         'test/run_all_unittests.cc',
         'test/test_suite.cc',
         'test/test_suite.h',
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
@@ skipping 90 matching lines @@
         }],
         ['use_aura==1 or toolkit_views==1', {
           'sources': [
             'base/gestures/velocity_calculator_unittest.cc',
           ],
         }],
       ],
     },
   ],
 }