ui: Move canvas tests into gfx_unittests target.

ui/gfx/gfx_tests.gyp

 # Copyright 2014 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 16 matching lines @@
       ],
       'all_sources': [
         '<@(_common_sources)',
         'animation/animation_container_unittest.cc',
         'animation/animation_unittest.cc',
         'animation/multi_animation_unittest.cc',
         'animation/slide_animation_unittest.cc',
         'animation/tween_unittest.cc',
         'blit_unittest.cc',
         'break_list_unittest.cc',
+        'canvas_unittest.cc',
         'codec/jpeg_codec_unittest.cc',
         'codec/png_codec_unittest.cc',
         'color_analysis_unittest.cc',
         'color_utils_unittest.cc',
         'display_unittest.cc',
         'font_list_unittest.cc',
         'geometry/box_unittest.cc',
         'geometry/cubic_bezier_unittest.cc',
         'geometry/insets_unittest.cc',
         'geometry/matrix3_unittest.cc',
@@ skipping 56 matching lines @@
           'conditions': [
             ['use_allocator!="none"', {
               'dependencies': [
                 '../../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
         ['use_ozone==1 and use_pango==0', {
           'sources!': [
+            'canvas_unittest.cc',
             'font_list_unittest.cc',
             'font_unittest.cc',
             'text_elider_unittest.cc',
           ],
         }],
         ['OS == "android"', {
           'dependencies': [
             '../../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
@@ skipping 12 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'gfx_unittests',
           },
           'includes': [ '../../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }