| Index: ui/gfx/font_fallback_mac_unittest.cc
|
| diff --git a/ui/gfx/font_fallback_mac_unittest.cc b/ui/gfx/font_fallback_mac_unittest.cc
|
| index 8bdea86c271df1b7ee0c3109c0a8378a41f5493d..ed0c7390cd34d58f73ad8567bd1b6405ffff0d97 100644
|
| --- a/ui/gfx/font_fallback_mac_unittest.cc
|
| +++ b/ui/gfx/font_fallback_mac_unittest.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "ui/gfx/font_fallback.h"
|
|
|
| -#include "base/strings/utf_string_conversions.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/gfx/font.h"
|
|
|
| @@ -13,7 +12,7 @@
|
| // A targeted test for GetFallbackFonts on Mac. It uses a system API that
|
| // only became publicly available in the 10.8 SDK. This test is to ensure it
|
| // behaves sensibly on all supported OS versions.
|
| -TEST(FontFallbackMacTest, GetFallbackFonts) {
|
| +GTEST_TEST(FontFallbackMacTest, GetFallbackFonts) {
|
| Font font("Arial", 12);
|
| std::vector<Font> fallback_fonts = GetFallbackFonts(font);
|
| // If there is only one fallback, it means the only fallback is the font
|
| @@ -21,20 +20,4 @@
|
| EXPECT_LT(1u, fallback_fonts.size());
|
| }
|
|
|
| -// Sanity check GetFallbackFont() behavior on Mac. This test makes assumptions
|
| -// about font properties and availability on specific macOS versions.
|
| -TEST(FontFallbackMacTest, GetFallbackFont) {
|
| - Font arial("Helvetica", 12);
|
| - const base::string16 ascii = base::ASCIIToUTF16("abc");
|
| - const base::string16 hebrew = base::WideToUTF16(L"\x5d0\x5d1\x5d2");
|
| - const base::string16 emoji = base::UTF8ToUTF16("😋");
|
| -
|
| - gfx::Font fallback;
|
| - EXPECT_FALSE(GetFallbackFont(arial, ascii.data(), ascii.size(), &fallback));
|
| - EXPECT_TRUE(GetFallbackFont(arial, hebrew.data(), hebrew.size(), &fallback));
|
| - EXPECT_EQ("Lucida Grande", fallback.GetFontName());
|
| - EXPECT_TRUE(GetFallbackFont(arial, emoji.data(), emoji.size(), &fallback));
|
| - EXPECT_EQ("Apple Color Emoji", fallback.GetFontName());
|
| -}
|
| -
|
| } // namespace gfx
|
|
|