Allow various font weights in gfx.

ui/gfx/platform_font_linux_unittest.cc

Index: ui/gfx/platform_font_linux_unittest.cc
diff --git a/ui/gfx/platform_font_linux_unittest.cc b/ui/gfx/platform_font_linux_unittest.cc
index 86216b10cddd8159d594811748bdc9982416a373..fee2f9c518ea76659d71e09975baa8e6d1c3f7de 100644
--- a/ui/gfx/platform_font_linux_unittest.cc
+++ b/ui/gfx/platform_font_linux_unittest.cc
@@ -21,26 +21,30 @@ namespace gfx {
 // description on Linux.
 class TestFontDelegate : public LinuxFontDelegate {
  public:
-  TestFontDelegate() : size_pixels_(0), style_(gfx::Font::NORMAL) {}
+  TestFontDelegate()
+      : size_pixels_(0), italic_(false), weight_(Font::Weight::NORMAL) {}
   ~TestFontDelegate() override {}
 
   void set_family(const std::string& family) { family_ = family; }
   void set_size_pixels(int size_pixels) { size_pixels_ = size_pixels; }
-  void set_style(int style) { style_ = style; }
+  void set_italic(int italic) { italic_ = italic; }
+  void set_weight(gfx::Font::Weight weight) { weight_ = weight; }
   void set_params(const FontRenderParams& params) { params_ = params; }
 
   FontRenderParams GetDefaultFontRenderParams() const override {
     NOTIMPLEMENTED();
     return FontRenderParams();
   }
-  void GetDefaultFontDescription(
-      std::string* family_out,
-      int* size_pixels_out,
-      int* style_out,
-      FontRenderParams* params_out) const override {
+
+  void GetDefaultFontDescription(std::string* family_out,
+                                 int* size_pixels_out,
+                                 bool* italic_out,
+                                 Font::Weight* weight_out,
+                                 FontRenderParams* params_out) const override {
     *family_out = family_;
     *size_pixels_out = size_pixels_;
-    *style_out = style_;
+    *italic_out = italic_;
+    *weight_out = weight_;
     *params_out = params_;
   }
 
@@ -48,7 +52,8 @@ class TestFontDelegate : public LinuxFontDelegate {
   // Default values to be returned.
   std::string family_;
   int size_pixels_;
-  int style_;
+  bool italic_;
+  gfx::Font::Weight weight_;

[Alexei Svitkine (slow), 2016/04/05 16:38:52]

Remove gfx::

   FontRenderParams params_;
 
   DISALLOW_COPY_AND_ASSIGN(TestFontDelegate);
@@ -89,7 +94,7 @@ TEST_F(PlatformFontLinuxTest, DefaultFont) {
 #else
   test_font_delegate_.set_family("Arial");
   test_font_delegate_.set_size_pixels(13);
-  test_font_delegate_.set_style(gfx::Font::NORMAL);
+  test_font_delegate_.set_italic(false);
   FontRenderParams params;
   params.antialiasing = false;
   params.hinting = FontRenderParams::HINTING_FULL;
@@ -112,13 +117,15 @@ TEST_F(PlatformFontLinuxTest, DefaultFont) {
 #else
   test_font_delegate_.set_family("Times New Roman");
   test_font_delegate_.set_size_pixels(15);
-  test_font_delegate_.set_style(gfx::Font::BOLD);
+  test_font_delegate_.set_italic(true);
+  test_font_delegate_.set_weight(gfx::Font::Weight::BOLD);
 #endif
   PlatformFontLinux::ReloadDefaultFont();
   scoped_refptr<gfx::PlatformFontLinux> font2(new gfx::PlatformFontLinux());
   EXPECT_EQ("Times New Roman", font2->GetFontName());
   EXPECT_EQ(15, font2->GetFontSize());
-  EXPECT_EQ(gfx::Font::BOLD, font2->GetStyle());
+  EXPECT_NE(font2->GetStyle() & Font::ITALIC, 0);
+  EXPECT_EQ(gfx::Font::Weight::BOLD, font2->GetWeight());
 }
 
 }  // namespace gfx