Rework gfx::Font by moving platform-specific code into inner classes....

views/controls/label_unittest.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/border.h"
@@ skipping 13 matching lines @@
   label.SetFont(font);
   gfx::Font font_used = label.font();
   EXPECT_EQ(font_name, font_used.FontName());
   EXPECT_EQ(30, font_used.FontSize());
 }
 #endif
 
 TEST(LabelTest, FontPropertyArial) {
   Label label;
   std::wstring font_name(L"arial");
-  gfx::Font font = gfx::Font::CreateFont(font_name, 30);
+  gfx::Font font(font_name, 30);
   label.SetFont(font);
   gfx::Font font_used = label.font();
-  EXPECT_EQ(font_name, font_used.FontName());
-  EXPECT_EQ(30, font_used.FontSize());
+  EXPECT_EQ(font_name, font_used.GetFontName());
+  EXPECT_EQ(30, font_used.GetFontSize());
 }
 
 TEST(LabelTest, TextProperty) {
   Label label;
   std::wstring test_text(L"A random string.");
   label.SetText(test_text);
   EXPECT_EQ(test_text, label.GetText());
 }
 
 TEST(LabelTest, UrlProperty) {
@@ skipping 762 matching lines @@
       gfx::Canvas::TEXT_ALIGN_LEFT |
       gfx::Canvas::NO_ELLIPSIS,
       flags);
 #endif
 
   // Reset Locale
   base::i18n::SetICUDefaultLocale(locale);
 }
 
 }  // namespace views