ui: Move canvas tests into gfx_unittests target.

Pretty straightforward, nothing really blocks it, so we can move it
easily from ui_unittests target to gfx_unittests now.

BUG=331829
TEST=ui_unittests, gfx_unittests with/out --test-launcher-bot-mode
TBR=danakj@chromium.org,ben@chromium.org

Review URL: https://codereview.chromium.org/332353004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277978 0039d316-1c4b-4281-b951-d872f2087c98

build/android/pylib/gtest/filter/gfx_unittests_disabled

+CanvasTest.StringSizeEmptyString
+CanvasTest.StringWidth
 FontListTest.FontDescString_Derive
 FontListTest.FontDescString_FromFont
 FontListTest.FontDescString_FromFontNamesStyleAndSize

build/android/pylib/gtest/filter/ui_unittests_disabled

-CanvasTest.StringSizeEmptyString
-CanvasTest.StringWidth
 ResourceBundleTest.DelegateGetFontList

ui/gfx/gfx_tests.gyp

@@ -34,6 +34,7 @@
         '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',
@@ -110,6 +111,7 @@
         }],
         ['use_ozone==1 and use_pango==0', {
           'sources!': [
+            'canvas_unittest.cc',
             'font_list_unittest.cc',
             'font_unittest.cc',
             'text_elider_unittest.cc',

ui/ui_unittests.gyp

@@ -66,7 +66,6 @@
         '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',
@@ -210,7 +209,6 @@
         }],
         ['use_ozone==1 and use_pango==0', {
           'sources!': [
-            'gfx/canvas_unittest.cc',
             'gfx/render_text_unittest.cc',
           ],
         }],