Supports FontList in Textfield.

ui/base/resource/resource_bundle_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/base/resource/resource_bundle.h"
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 65 matching lines @@
                                   ui::ScaleFactor scale_factor,
                                   base::StringPiece* value) OVERRIDE {
     *value = GetRawDataResourceMock(resource_id, scale_factor);
     return true;
   }
   MOCK_METHOD1(GetLocalizedStringMock, string16(int message_id));
   virtual bool GetLocalizedString(int message_id, string16* value) OVERRIDE {
     *value = GetLocalizedStringMock(message_id);
     return true;
   }
-  MOCK_METHOD1(GetFontMock, gfx::Font*(ui::ResourceBundle::FontStyle style));
-  virtual scoped_ptr<gfx::Font> GetFont(
+  MOCK_METHOD1(GetFontListMock,
+               gfx::FontList*(ui::ResourceBundle::FontStyle style));
+  virtual scoped_ptr<gfx::FontList> GetFontList(
       ui::ResourceBundle::FontStyle style) OVERRIDE {
-    return scoped_ptr<gfx::Font>(GetFontMock(style));
+    return scoped_ptr<gfx::FontList>(GetFontListMock(style));
   }
 };
 
 // Returns |bitmap_data| with |custom_chunk| inserted after the IHDR chunk.
 void AddCustomChunk(const base::StringPiece& custom_chunk,
                     std::vector<unsigned char>* bitmap_data) {
   EXPECT_LT(arraysize(kPngMagic) + kPngChunkMetadataSize, bitmap_data->size());
   EXPECT_TRUE(std::equal(
       bitmap_data->begin(),
       bitmap_data->begin() + arraysize(kPngMagic),
@@ skipping 200 matching lines @@
   int resource_id = 5;
 
   EXPECT_CALL(delegate, GetLocalizedStringMock(resource_id))
       .Times(1)
       .WillOnce(Return(data));
 
   string16 result = resource_bundle->GetLocalizedString(resource_id);
   EXPECT_EQ(data, result);
 }
 
-TEST_F(ResourceBundleTest, DelegateGetFont) {
+TEST_F(ResourceBundleTest, DelegateGetFontList) {
   MockResourceBundleDelegate delegate;
   ResourceBundle* resource_bundle = CreateResourceBundle(&delegate);
 
   // Should be called once for each font type. When we return NULL the default
-  // font will be created.
-  gfx::Font* test_font = NULL;
-  EXPECT_CALL(delegate, GetFontMock(_))
+  // font list will be created.
+  gfx::FontList* test_font_list = NULL;
+  EXPECT_CALL(delegate, GetFontListMock(_))
       .Times(8)
-      .WillRepeatedly(Return(test_font));
+      .WillRepeatedly(Return(test_font_list));
+
+  const gfx::FontList* font_list =
+      &resource_bundle->GetFontList(ui::ResourceBundle::BaseFont);
+  EXPECT_TRUE(font_list);
 
   const gfx::Font* font =
       &resource_bundle->GetFont(ui::ResourceBundle::BaseFont);
   EXPECT_TRUE(font);
 }
 
 TEST_F(ResourceBundleTest, LocaleDataPakExists) {
   ResourceBundle* resource_bundle = CreateResourceBundle(NULL);
 
   // Check that ResourceBundle::LocaleDataPakExists returns the correct results.
@@ skipping 209 matching lines @@
   ResourceBundle* resource_bundle = CreateResourceBundleWithEmptyLocalePak();
   resource_bundle->AddDataPackFromPath(data_default_path, SCALE_FACTOR_NONE);
 
   gfx::ImageSkia* image_skia = resource_bundle->GetImageSkiaNamed(3);
   EXPECT_EQ(1u, image_skia->image_reps().size());
   EXPECT_EQ(ui::SCALE_FACTOR_100P,
             image_skia->image_reps()[0].scale_factor());
 }
 
 }  // namespace ui