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)
-// 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);
+  gfx::Font font(font_name, 26);

[msw, 2012/04/26 21:04:42]

Is this test fragile wrt the font size? If so, please comment.

[Alexei Svitkine (slow), 2012/04/26 21:45:56]

Done. It also turns out that the Linux failure was not just because of the size
- the font name also gets mapped to "Sans" instead of keeping "Courier", so I've
reverted the ifdef to make it Windows specific. :\

   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());
   EXPECT_EQ(30, font_used.GetFontSize());
 }
@@ skipping 807 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