ui: Move canvas tests into gfx_unittests target.

ui/ui_unittests.gyp

 # Copyright 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 48 matching lines @@
         'base/cocoa/nsgraphics_context_additions_unittest.mm',
         'base/cocoa/tracking_area_unittest.mm',
         'base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc',
         'base/models/list_model_unittest.cc',
         'base/models/list_selection_model_unittest.cc',
         'base/models/tree_node_model_unittest.cc',
         'base/test/data/resource.h',
         'base/text/bytes_formatting_unittest.cc',
         'base/view_prop_unittest.cc',
         'base/webui/web_ui_util_unittest.cc',
-        'gfx/canvas_unittest.cc',
         'gfx/canvas_unittest_mac.mm',
         'gfx/platform_font_mac_unittest.mm',
         'gfx/render_text_unittest.cc',
       ],
       'includes': [
         'display/display_unittests.gypi',
       ],
       'include_dirs': [
         '../',
       ],
@@ skipping 123 matching lines @@
             'gfx/screen_unittest.cc',
           ],
         }],
         ['use_ozone==1', {
           'dependencies': [
             'gfx/ozone/gfx_ozone.gyp:gfx_ozone',
           ],
         }],
         ['use_ozone==1 and use_pango==0', {
           'sources!': [
-            'gfx/canvas_unittest.cc',
             'gfx/render_text_unittest.cc',
           ],
         }],
         ['chromeos==1', {
           'dependencies': [
             '../chromeos/chromeos.gyp:chromeos',
             'aura/aura.gyp:aura_test_support',
             'chromeos/ui_chromeos.gyp:ui_chromeos',
             'events/events.gyp:gesture_detection',
           ],
@@ skipping 40 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'ui_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }