Commit f802c349 authored by tfarina@chromium.org's avatar tfarina@chromium.org

ui: Move font_list tests into gfx_unittests target.

This test depends on the initialization of ResourceBundle, now that we
have GfxTestSuite initializating it we can move it into gfx_unittests
target.

BUG=331829
TEST=ui_unittests, gfx_unittests
TBR=danakj@chromium.org,ben@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272848 0039d316-1c4b-4281-b951-d872f2087c98
parent 9e7d8be3
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
'color_analysis_unittest.cc', 'color_analysis_unittest.cc',
'color_utils_unittest.cc', 'color_utils_unittest.cc',
'display_unittest.cc', 'display_unittest.cc',
'font_list_unittest.cc',
'geometry/box_unittest.cc', 'geometry/box_unittest.cc',
'geometry/cubic_bezier_unittest.cc', 'geometry/cubic_bezier_unittest.cc',
'geometry/insets_unittest.cc', 'geometry/insets_unittest.cc',
...@@ -109,6 +110,7 @@ ...@@ -109,6 +110,7 @@
}], }],
['use_ozone==1 and use_pango==0', { ['use_ozone==1 and use_pango==0', {
'sources!': [ 'sources!': [
'font_list_unittest.cc',
'font_unittest.cc', 'font_unittest.cc',
'text_elider_unittest.cc', 'text_elider_unittest.cc',
], ],
......
...@@ -69,7 +69,6 @@ ...@@ -69,7 +69,6 @@
'base/webui/web_ui_util_unittest.cc', 'base/webui/web_ui_util_unittest.cc',
'gfx/canvas_unittest.cc', 'gfx/canvas_unittest.cc',
'gfx/canvas_unittest_mac.mm', 'gfx/canvas_unittest_mac.mm',
'gfx/font_list_unittest.cc',
'gfx/platform_font_mac_unittest.mm', 'gfx/platform_font_mac_unittest.mm',
'gfx/render_text_unittest.cc', 'gfx/render_text_unittest.cc',
], ],
...@@ -201,7 +200,6 @@ ...@@ -201,7 +200,6 @@
['use_ozone==1 and use_pango==0', { ['use_ozone==1 and use_pango==0', {
'sources!': [ 'sources!': [
'gfx/canvas_unittest.cc', 'gfx/canvas_unittest.cc',
'gfx/font_list_unittest.cc',
'gfx/render_text_unittest.cc', 'gfx/render_text_unittest.cc',
], ],
}], }],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment