ChromeFont->gfx::Font...

views/controls/label_unittest.cc

 // Copyright (c) 2006-2008 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/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/border.h"
 #include "views/controls/label.h"
 
 namespace views {
 
 // All text sizing measurements (width and height) should be greater than this.
 const int kMinTextDimension = 4;
 
 TEST(LabelTest, FontProperty) {
   Label label;
   std::wstring font_name(L"courier");
-  ChromeFont font = ChromeFont::CreateFont(font_name, 30);
+  gfx::Font font = gfx::Font::CreateFont(font_name, 30);
   label.SetFont(font);
-  ChromeFont font_used = label.GetFont();
+  gfx::Font font_used = label.GetFont();
   EXPECT_STREQ(font_name.c_str(), font_used.FontName().c_str());
   EXPECT_EQ(30, font_used.FontSize());
 }
 
 TEST(LabelTest, TextProperty) {
   Label label;
   std::wstring test_text(L"A random string.");
   label.SetText(test_text);
   EXPECT_STREQ(test_text.c_str(), label.GetText().c_str());
 }
@@ skipping 399 matching lines @@
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_STREQ(test_text.c_str(), paint_text.c_str());
   EXPECT_EQ(center_bounds.x() + border.left(), text_bounds.x());
   EXPECT_EQ(center_bounds.y() + border.top(), text_bounds.y());
   EXPECT_EQ(center_bounds.width(), text_bounds.width());
   EXPECT_EQ(center_bounds.height(), text_bounds.height());
   EXPECT_EQ(ChromeCanvas::MULTI_LINE | ChromeCanvas::TEXT_ALIGN_CENTER, flags);
 }
 
 }  // namespace views