Clean-up: Renames gfx::Font's methods and removes its obsolete methods.

ui/gfx/text_utils_unittest.cc

Index: ui/gfx/text_utils_unittest.cc
diff --git a/ui/gfx/text_utils_unittest.cc b/ui/gfx/text_utils_unittest.cc
index 74c3ad4dc8f17844f5d934bfd3ff0ad25d1c92fb..bc4953fbd583733a8543f5f37c3c37cd74cd1e18 100644
--- a/ui/gfx/text_utils_unittest.cc
+++ b/ui/gfx/text_utils_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/font_list.h"
 
 namespace gfx {
 namespace {
@@ -59,5 +60,16 @@ TEST(TextUtilsTest, RemoveAcceleratorChar) {
   }
 }
 
+TEST(TextUtilsTest, GetStringWidth) {
+  FontList font_list;
+  EXPECT_EQ(GetStringWidth(base::string16(), font_list), 0);
+  EXPECT_GT(GetStringWidth(base::ASCIIToUTF16("a"), font_list),
+            GetStringWidth(base::string16(), font_list));
+  EXPECT_GT(GetStringWidth(base::ASCIIToUTF16("ab"), font_list),
+            GetStringWidth(base::ASCIIToUTF16("a"), font_list));
+  EXPECT_GT(GetStringWidth(base::ASCIIToUTF16("abc"), font_list),
+            GetStringWidth(base::ASCIIToUTF16("ab"), font_list));
+}
+
 }  // namespace
 }  // namespace gfx