Add RenderText::SetFont() function to simplify some call sites.

ui/gfx/render_text_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 "ui/gfx/render_text.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 984 matching lines @@
   EXPECT_GT(string_size.width(), 0);
   EXPECT_GT(string_size.height(), 0);
 }
 
 // TODO(asvitkine): This test fails because PlatformFontMac uses point font
 //                  sizes instead of pixel sizes like other implementations.
 #if !defined(OS_MACOSX)
 TEST_F(RenderTextTest, StringSizeEmptyString) {
   const Font font;
   scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
-  render_text->SetFontList(FontList(font));
+  render_text->SetFont(font);
 
   render_text->SetText(string16());
   EXPECT_EQ(font.GetHeight(), render_text->GetStringSize().height());
   EXPECT_EQ(0, render_text->GetStringSize().width());
 
   render_text->SetText(UTF8ToUTF16(" "));
   EXPECT_EQ(font.GetHeight(), render_text->GetStringSize().height());
 }
 #endif  // !defined(OS_MACOSX)
 
+TEST_F(RenderTextTest, SetFont) {
+  scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
+  render_text->SetFont(Font("Arial", 12));
+  EXPECT_EQ("Arial", render_text->GetFont().GetFontName());
+  EXPECT_EQ(12, render_text->GetFont().GetFontSize());
+}
+
 TEST_F(RenderTextTest, StringSizeBoldWidth) {
   scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
   render_text->SetText(UTF8ToUTF16("Hello World"));
 
   const int plain_width = render_text->GetStringSize().width();
   EXPECT_GT(plain_width, 0);
 
   // Apply a bold style and check that the new width is greater.
   StyleRange bold;
   bold.font_style |= Font::BOLD;
@@ skipping 23 matching lines @@
     { WideToUTF16(L"\x0915\x093f") },  // Hindi
     { WideToUTF16(L"\x05e0\x05b8") },  // Hebrew
   };
 
   Font default_font;
   Font larger_font = default_font.DeriveFont(24, default_font.GetStyle());
   EXPECT_GT(larger_font.GetHeight(), default_font.GetHeight());
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) {
     scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
-    render_text->SetFontList(FontList(default_font));
+    render_text->SetFont(default_font);
     render_text->SetText(cases[i].text);
 
     const int height1 = render_text->GetStringSize().height();
     EXPECT_GT(height1, 0);
 
     // Check that setting the larger font increases the height.
-    render_text->SetFontList(FontList(larger_font));
+    render_text->SetFont(larger_font);
     const int height2 = render_text->GetStringSize().height();
     EXPECT_GT(height2, height1);
   }
 }
 
 TEST_F(RenderTextTest, GetBaselineSanity) {
   scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
   render_text->SetText(UTF8ToUTF16("Hello World"));
   const int baseline = render_text->GetBaseline();
   EXPECT_GT(baseline, 0);
@@ skipping 220 matching lines @@
   EXPECT_EQ(render_text->display_rect().width() - width - 1,
             render_text->GetUpdatedCursorBounds().x());
 
   // Reset the application default text direction to LTR.
   SetRTL(was_rtl);
   EXPECT_EQ(was_rtl, base::i18n::IsRTL());
 }
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace gfx