Clean-up: Replaces Font with FontList in ui/message_center.

ui/message_center/views/bounded_label_unittest.cc

 // Copyright 2013 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/message_center/views/bounded_label.h"
 
 #include <limits>
 
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/font.h"
+#include "ui/gfx/font_list.h"
+#include "ui/gfx/text_utils.h"
 #include "ui/views/controls/label.h"
 
 namespace message_center {
 
 namespace test {
 
 /* Test fixture ***************************************************************/
 
 class BoundedLabelTest : public testing::Test {
  public:
   BoundedLabelTest() {
-    digit_pixels_ = font_.GetStringWidth(UTF8ToUTF16("0"));
-    space_pixels_ = font_.GetStringWidth(UTF8ToUTF16(" "));
-    ellipsis_pixels_ = font_.GetStringWidth(UTF8ToUTF16("\xE2\x80\xA6"));
+    digit_pixels_ = gfx::GetStringWidth(UTF8ToUTF16("0"), font_list_);
+    space_pixels_ = gfx::GetStringWidth(UTF8ToUTF16(" "), font_list_);
+    ellipsis_pixels_ = gfx::GetStringWidth(UTF8ToUTF16("\xE2\x80\xA6"),
+                                           font_list_);
   }
 
   virtual ~BoundedLabelTest() {}
 
   // Replaces all occurences of three periods ("...") in the specified string
   // with an ellipses character (UTF8 "\xE2\x80\xA6") and returns a string16
   // with the results. This allows test strings to be specified as ASCII const
   // char* strings, making tests more readable and easier to write.
   string16 ToString(const char* string) {
     const string16 periods = UTF8ToUTF16("...");
@@ skipping 17 matching lines @@
            ellipsis_pixels_ * (width % 10);
   }
 
   // Exercise BounderLabel::GetWrappedText() using the fixture's test label.
   string16 GetWrappedText(int width) {
     return label_->GetWrappedTextForTest(width, lines_);
   }
 
   // Exercise BounderLabel::GetLinesForWidthAndLimit() using the test label.
   int GetLinesForWidth(int width) {
-    label_->SetBounds(0, 0, width, font_.GetHeight() * lines_);
+    label_->SetBounds(0, 0, width, font_list_.GetHeight() * lines_);
     return label_->GetLinesForWidthAndLimit(width, lines_);
   }
 
  protected:
   // Creates a label to test with. Returns this fixture, which can be used to
   // test the newly created label using the exercise methods above.
   BoundedLabelTest& Label(string16 text, int lines) {
     lines_ = lines;
-    label_.reset(new BoundedLabel(text, font_));
+    label_.reset(new BoundedLabel(text, font_list_));
     label_->SetLineLimit(lines_);
     return *this;
   }
 
  private:
-  gfx::Font font_;  // The default font, which will be used for tests.
+  // The default font list, which will be used for tests.
+  gfx::FontList font_list_;
   int digit_pixels_;
   int space_pixels_;
   int ellipsis_pixels_;
   scoped_ptr<BoundedLabel> label_;
   int lines_;
 };
 
 /* Test macro *****************************************************************/
 
 #define TEST_WRAP(expected, text, width, lines) \
@@ skipping 117 matching lines @@
 
 // TODO(dharcourt): Add test cases to verify that:
 // - SetMaxLines() affects the return values of some methods but not others.
 // - Bound changes affects GetPreferredLines(), GetTextSize(), and
 //   GetWrappedText() return values.
 // - GetTextFlags are as expected.
 
 }  // namespace test
 
 }  // namespace message_center