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

Applies the same renaming as http://crrev.com/142523003 and also removes obsolete methods.

Renamed methods:
- DeriveFont(size_delta, style) => Derive(size_delta, style)

Removed methods:
- DeriveFont(size_delta)
- GetAverageCharacterWidth()
  # Use GetExpectedTextWidth(1) instead.
- GetStringWidth(text)
  # Use gfx::GetStringWidth(text, font_list) instead.

BUG=265485
TEST=Run ui_unittests, views_unittests.

Review URL: https://codereview.chromium.org/138013004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251028 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 0 deletions

diff --git a/ui/gfx/text_utils_unittest.cc b/ui/gfx/text_utils_unittest.cc
index 74c3ad4..bc4953f 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