Removes obsolete gfx::ElideEmail (gfx::Font version).

gfx::ElideEmail() which takes gfx::Font is obsolete.  Remove the method.

BUG=265485
TEST=Run ui_unittests.

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

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

4 files changed, 7 insertions, 17 deletions

diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc
index 1ad7944..a8760af 100644
--- a/chrome/browser/signin/signin_ui_util.cc
+++ b/chrome/browser/signin/signin_ui_util.cc
@@ -16,7 +16,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/font.h"
+#include "ui/gfx/font_list.h"
 #include "ui/gfx/text_elider.h"
 
 namespace {
@@ -76,8 +76,8 @@ string16 GetSigninMenuLabel(Profile* profile) {
       username = signin_manager->GetAuthenticatedUsername();
     if (!username.empty() && !signin_manager->AuthInProgress()) {
       string16 elided_username = gfx::ElideEmail(UTF8ToUTF16(username),
-                                                gfx::Font(),
-                                                kUsernameMaxWidth);
+                                                 gfx::FontList(),
+                                                 kUsernameMaxWidth);
       return l10n_util::GetStringFUTF16(IDS_SYNC_MENU_SYNCED_LABEL,
                                         elided_username);
     }
diff --git a/ui/gfx/text_elider.cc b/ui/gfx/text_elider.cc
index e8df5dc..0c1e07b 100644
--- a/ui/gfx/text_elider.cc
+++ b/ui/gfx/text_elider.cc
@@ -206,12 +206,6 @@ string16 ElideEmail(const string16& email,
   return username + kAtSignUTF16 + domain;
 }
 
-string16 ElideEmail(const string16& email,
-                    const Font& font,
-                    float available_pixel_width) {
-  return ElideEmail(email, FontList(font), available_pixel_width);
-}
-
 // TODO(pkasting): http://crbug.com/77883 This whole function gets
 // kerning/ligatures/etc. issues potentially wrong by assuming that the width of
 // a rendered string is always the sum of the widths of its substrings.  Also I
diff --git a/ui/gfx/text_elider.h b/ui/gfx/text_elider.h
index 6299535..5302e93 100644
--- a/ui/gfx/text_elider.h
+++ b/ui/gfx/text_elider.h
@@ -42,10 +42,6 @@ GFX_EXPORT extern const char16 kEllipsisUTF16[];
 GFX_EXPORT string16 ElideEmail(const string16& email,
                                const gfx::FontList& font_list,
                                float available_pixel_width);
-// Obsolete version.  Use the above version which takes gfx::FontList.
-GFX_EXPORT string16 ElideEmail(const string16& email,
-                               const gfx::Font& font,
-                               float available_pixel_width);
 
 // This function takes a GURL object and elides it. It returns a string
 // which composed of parts from subdomain, domain, path, filename and query.
diff --git a/ui/gfx/text_elider_unittest.cc b/ui/gfx/text_elider_unittest.cc
index 6b1a4e3..5fa74cb 100644
--- a/ui/gfx/text_elider_unittest.cc
+++ b/ui/gfx/text_elider_unittest.cc
@@ -133,14 +133,14 @@ TEST(TextEliderTest, ElideEmailMoreSpace) {
       "supermegalongusername@withasuperlonnnggggdomain.gouv.qc.ca",
   };
 
-  const Font font;
+  const FontList font_list;
   for (size_t i = 0; i < arraysize(test_width_factors); ++i) {
-    const int test_width = test_width_factors[i] *
-                           font.GetAverageCharacterWidth();
+    const int test_width =
+        font_list.GetExpectedTextWidth(test_width_factors[i]);
     for (size_t j = 0; j < arraysize(test_emails); ++j) {
       // Extra space is available: the email should not be elided.
       const string16 test_email = UTF8ToUTF16(test_emails[j]);
-      EXPECT_EQ(test_email, ElideEmail(test_email, font, test_width));
+      EXPECT_EQ(test_email, ElideEmail(test_email, font_list, test_width));
     }
   }
 }