Fix CJK font linking size on Windows XP.

ui/views/controls/label_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 "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 
 namespace views {
 
 // All text sizing measurements (width and height) should be greater than this.
 const int kMinTextDimension = 4;
 
 #if defined(OS_WIN)

[msw, 2012/04/26 22:14:13]

Can't we just make the font name check Win specific (with a comment) and still
check the size on Linux?

[Alexei Svitkine (slow), 2012/04/26 22:22:29]

Yes, I think so.

[Alexei Svitkine (slow), 2012/04/27 15:15:27]

Done.

 // Courier is failing on linux because it's non scalable.
 TEST(LabelTest, FontPropertyCourier) {
   Label label;
   std::string font_name("courier");
-  gfx::Font font(font_name, 30);
+  // Note: This test is size dependent since Courier does not support all sizes.
+  gfx::Font font(font_name, 26);
   label.SetFont(font);
   gfx::Font font_used = label.font();
   EXPECT_EQ(font_name, font_used.GetFontName());
-  EXPECT_EQ(30, font_used.GetFontSize());
+  EXPECT_EQ(26, font_used.GetFontSize());
 }
 #endif
 
 TEST(LabelTest, FontPropertyArial) {
   Label label;
   std::string font_name("arial");
   gfx::Font font(font_name, 30);
   label.SetFont(font);
   gfx::Font font_used = label.font();
   EXPECT_EQ(font_name, font_used.GetFontName());
@@ skipping 809 matching lines @@
   EXPECT_EQ(
       0, label.ComputeDrawStringFlags() & gfx::Canvas::NO_SUBPIXEL_RENDERING);
 
   label.SetBackgroundColor(SkColorSetARGB(64, 255, 255, 255));
   EXPECT_EQ(
       gfx::Canvas::NO_SUBPIXEL_RENDERING,
       label.ComputeDrawStringFlags() & gfx::Canvas::NO_SUBPIXEL_RENDERING);
 }
 
 }  // namespace views