Make FontList description-parsing public.

ui/base/resource/resource_bundle_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "ui/base/resource/resource_bundle.h"
 
 #include "base/base_paths.h"
 #include "base/big_endian.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 360 matching lines @@
   MockResourceBundleDelegate delegate;
   ResourceBundle* resource_bundle = CreateResourceBundle(&delegate);
 
   // Should be called once for each font type. When we return NULL the default
   // font will be created.
   gfx::Font* test_font = nullptr;
   EXPECT_CALL(delegate, GetFontMock(_))
       .Times(16)
       .WillRepeatedly(Return(test_font));
 
-  std::string expected = "test font, 12px";
   EXPECT_CALL(delegate, GetLocalizedStringMock(IDS_UI_FONT_FAMILY_CROS))
-      .WillOnce(Return(base::UTF8ToUTF16(expected)));
+      .WillOnce(Return(base::UTF8ToUTF16("test font, 12px")));
+  resource_bundle->ReloadFonts();
+  // Don't test the font name; it'll get mapped to something else by Fontconfig.
+  EXPECT_EQ(12, gfx::FontList().GetPrimaryFont().GetFontSize());
+  EXPECT_EQ(gfx::Font::NORMAL, gfx::FontList().GetPrimaryFont().GetStyle());
 
+  EXPECT_CALL(delegate, GetLocalizedStringMock(IDS_UI_FONT_FAMILY_CROS))
+      .WillOnce(Return(base::UTF8ToUTF16("test font 2, Bold 10px")));
   resource_bundle->ReloadFonts();
-  EXPECT_EQ(expected, gfx::FontList().GetFontDescriptionString());
-
-  expected = "test font 2, 12px";
-  EXPECT_CALL(delegate, GetLocalizedStringMock(IDS_UI_FONT_FAMILY_CROS))
-      .WillOnce(Return(base::UTF8ToUTF16(expected)));
-
-  resource_bundle->ReloadFonts();
-  EXPECT_EQ(expected, gfx::FontList().GetFontDescriptionString());
+  EXPECT_EQ(10, gfx::FontList().GetPrimaryFont().GetFontSize());
+  EXPECT_EQ(gfx::Font::BOLD, gfx::FontList().GetPrimaryFont().GetStyle());
 }
 #endif
 
 TEST_F(ResourceBundleTest, LocaleDataPakExists) {
   ResourceBundle* resource_bundle = CreateResourceBundle(NULL);
 
   // Check that ResourceBundle::LocaleDataPakExists returns the correct results.
   EXPECT_TRUE(resource_bundle->LocaleDataPakExists("en-US"));
   EXPECT_FALSE(resource_bundle->LocaleDataPakExists("not_a_real_locale"));
 }
@@ skipping 242 matching lines @@
   resource_bundle->AddDataPackFromPath(data_default_path, SCALE_FACTOR_NONE);
 
   gfx::ImageSkia* image_skia = resource_bundle->GetImageSkiaNamed(3);
   EXPECT_EQ(1u, image_skia->image_reps().size());
   EXPECT_TRUE(image_skia->image_reps()[0].unscaled());
   EXPECT_EQ(ui::SCALE_FACTOR_100P,
             GetSupportedScaleFactor(image_skia->image_reps()[0].scale()));
 }
 
 }  // namespace ui