1 files changed, 40 insertions, 30 deletions
diff --git a/chromium/ui/views/controls/table/table_utils_unittest.cc b/chromium/ui/views/controls/table/table_utils_unittest.cc
index e6c6369d0b8..98b1fd2f786 100644
--- a/chromium/ui/views/controls/table/table_utils_unittest.cc
+++ b/chromium/ui/views/controls/table/table_utils_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/strings/string_number_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/font.h"
+#include "ui/gfx/font_list.h"
 #include "ui/views/controls/table/test_table_model.h"
 
 using ui::TableColumn;
@@ -40,17 +40,19 @@ TEST(TableUtilsTest, SetWidthHonored) {
   std::vector<TableColumn> columns;
   columns.push_back(CreateTableColumnWithWidth(20));
   columns.push_back(CreateTableColumnWithWidth(30));
-  gfx::Font font;
-  std::vector<int> result(
-      CalculateTableColumnSizes(100, 0, font, font, 0, 0, columns, &model));
+  gfx::FontList font_list;
+  std::vector<int> result(CalculateTableColumnSizes(
+      100, 0, font_list, font_list, 0, 0, columns, &model));
   EXPECT_EQ("20,30", IntVectorToString(result));
 
   // Same with some padding, it should be ignored.
-  result = CalculateTableColumnSizes(100, 0, font, font, 2, 0, columns, &model);
+  result = CalculateTableColumnSizes(
+      100, 0, font_list, font_list, 2, 0, columns, &model);
   EXPECT_EQ("20,30", IntVectorToString(result));
 
   // Same with not enough space, it shouldn't matter.
-  result = CalculateTableColumnSizes(10, 0, font, font, 2, 0, columns, &model);
+  result = CalculateTableColumnSizes(
+      10, 0, font_list, font_list, 2, 0, columns, &model);
   EXPECT_EQ("20,30", IntVectorToString(result));
 }
 
@@ -61,11 +63,12 @@ TEST(TableUtilsTest, LastColumnGetsAllSpace) {
   std::vector<TableColumn> columns;
   columns.push_back(ui::TableColumn());
   columns.push_back(ui::TableColumn());
-  gfx::Font font;
-  std::vector<int> result(
-      CalculateTableColumnSizes(500, 0, font, font, 0, 0, columns, &model));
+  gfx::FontList font_list;
+  std::vector<int> result(CalculateTableColumnSizes(
+      500, 0, font_list, font_list, 0, 0, columns, &model));
   EXPECT_NE(0, result[0]);
-  EXPECT_GE(result[1], WidthForContent(font, font, 0, 0, columns[1], &model));
+  EXPECT_GE(result[1],
+            WidthForContent(font_list, font_list, 0, 0, columns[1], &model));
   EXPECT_EQ(500, result[0] + result[1]);
 }
 
@@ -77,38 +80,45 @@ TEST(TableUtilsTest, SingleResizableColumn) {
   columns.push_back(ui::TableColumn());
   columns.push_back(ui::TableColumn());
   columns[2].percent = 1.0f;
-  gfx::Font font;
-  std::vector<int> result(
-      CalculateTableColumnSizes(500, 0, font, font, 0, 0, columns, &model));
-  EXPECT_EQ(result[0], WidthForContent(font, font, 0, 0, columns[0], &model));
-  EXPECT_EQ(result[1], WidthForContent(font, font, 0, 0, columns[1], &model));
+  gfx::FontList font_list;
+  std::vector<int> result(CalculateTableColumnSizes(
+      500, 0, font_list, font_list, 0, 0, columns, &model));
+  EXPECT_EQ(result[0],
+            WidthForContent(font_list, font_list, 0, 0, columns[0], &model));
+  EXPECT_EQ(result[1],
+            WidthForContent(font_list, font_list, 0, 0, columns[1], &model));
   EXPECT_EQ(500 - result[0] - result[1], result[2]);
 
   // The same with a slightly larger width passed in.
-  result =
-      CalculateTableColumnSizes(1000, 0, font, font, 0, 0, columns, &model);
-  EXPECT_EQ(result[0], WidthForContent(font, font, 0, 0, columns[0], &model));
-  EXPECT_EQ(result[1], WidthForContent(font, font, 0, 0, columns[1], &model));
+  result = CalculateTableColumnSizes(
+      1000, 0, font_list, font_list, 0, 0, columns, &model);
+  EXPECT_EQ(result[0],
+            WidthForContent(font_list, font_list, 0, 0, columns[0], &model));
+  EXPECT_EQ(result[1],
+            WidthForContent(font_list, font_list, 0, 0, columns[1], &model));
   EXPECT_EQ(1000 - result[0] - result[1], result[2]);
 
   // Verify padding for the first column is honored.
-  result =
-      CalculateTableColumnSizes(1000, 10, font, font, 0, 0, columns, &model);
+  result = CalculateTableColumnSizes(
+      1000, 10, font_list, font_list, 0, 0, columns, &model);
   EXPECT_EQ(result[0],
-            WidthForContent(font, font, 0, 0, columns[0], &model) + 10);
-  EXPECT_EQ(result[1], WidthForContent(font, font, 0, 0, columns[1], &model));
+            WidthForContent(font_list, font_list, 0, 0, columns[0], &model)
+                + 10);
+  EXPECT_EQ(result[1],
+            WidthForContent(font_list, font_list, 0, 0, columns[1], &model));
   EXPECT_EQ(1000 - result[0] - result[1], result[2]);
 
   // Just enough space to show the first two columns. Should force last column
   // to min size.
-  result =
-      CalculateTableColumnSizes(1000, 0, font, font, 0, 0, columns, &model);
-  result = CalculateTableColumnSizes(result[0] + result[1], 0, font, font, 0, 0,
-                                     columns, &model);
-  EXPECT_EQ(result[0], WidthForContent(font, font, 0, 0, columns[0], &model));
-  EXPECT_EQ(result[1], WidthForContent(font, font, 0, 0, columns[1], &model));
+  result = CalculateTableColumnSizes(
+      1000, 0, font_list, font_list, 0, 0, columns, &model);
+  result = CalculateTableColumnSizes(
+      result[0] + result[1], 0, font_list, font_list, 0, 0, columns, &model);
+  EXPECT_EQ(result[0],
+            WidthForContent(font_list, font_list, 0, 0, columns[0], &model));
+  EXPECT_EQ(result[1],
+            WidthForContent(font_list, font_list, 0, 0, columns[1], &model));
   EXPECT_EQ(kUnspecifiedColumnWidth, result[2]);
 }
 
 }  // namespace views
-