Mac: Fix PlatformFontMac::DeriveFont for underline font style.

ui/gfx/font_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/gfx/font.h"
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 140 matching lines @@
       << "Your test environment seems to be missing Symbol font, which is "
       << "needed for unittests.  Check if Symbol font is installed.\n"
       << "********";
 
   const char* const invalid_font_name = "no_such_font_name";
   Font fallback_font(invalid_font_name, 16);
   EXPECT_NE(invalid_font_name,
             base::ToLowerASCII(fallback_font.GetActualFontNameForTesting()));
 }
 
+TEST_F(FontTest, DeriveFont) {

[karandeepb, 2016/08/05 11:03:07]

All the other tests seem to be disabled on Android but the try bots pass. Should
this be disabled on Android as well?

[Avi (use Gerrit), 2016/08/05 14:54:58]

Perhaps you'll find out on the trybots :)

+  Font cf("Arial", 8);
+  const int kSizeDelta = 2;
+  Font cf_underlined =
+      cf.Derive(0, cf.GetStyle() | gfx::Font::UNDERLINE, cf.GetWeight());
+  Font cf_underlined_resized = cf_underlined.Derive(
+      kSizeDelta, cf_underlined.GetStyle(), cf_underlined.GetWeight());
+  EXPECT_EQ(cf.GetStyle() | gfx::Font::UNDERLINE,

[karandeepb, 2016/08/05 11:03:07]

This fails on Mac currently. The derived font does not have underline set.

[Avi (use Gerrit), 2016/08/05 14:54:59]

As long as it passes with the other changes in the CL...

+            cf_underlined_resized.GetStyle());
+  EXPECT_EQ(cf.GetFontSize() + kSizeDelta, cf_underlined_resized.GetFontSize());
+  EXPECT_EQ(cf.GetWeight(), cf_underlined_resized.GetWeight());
+}
+
 #if defined(OS_WIN)
 TEST_F(FontTest, DeriveResizesIfSizeTooSmall) {
   Font cf("Arial", 8);
   // The minimum font size is set to 5 in browser_main.cc.
   ScopedMinimumFontSizeCallback minimum_size(5);
 
   Font derived_font = cf.Derive(-4, cf.GetStyle(), cf.GetWeight());
   EXPECT_EQ(5, derived_font.GetFontSize());
 }
 
 TEST_F(FontTest, DeriveKeepsOriginalSizeIfHeightOk) {
   Font cf("Arial", 8);
   // The minimum font size is set to 5 in browser_main.cc.
   ScopedMinimumFontSizeCallback minimum_size(5);
 
   Font derived_font = cf.Derive(-2, cf.GetStyle(), cf.GetWeight());
   EXPECT_EQ(6, derived_font.GetFontSize());
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace
 }  // namespace gfx