Clean-up: Replaces obsolete Font/FontList methods.

chrome/browser/ui/gtk/validation_message_bubble_gtk.cc

 // Copyright (c) 2013 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 "chrome/browser/ui/validation_message_bubble.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
@@ skipping 91 matching lines @@
   GtkWidget* label = gtk_label_new(base::UTF16ToUTF8(main_text).c_str());
   const gfx::Font& main_font = bundle.GetFont(ResourceBundle::MediumFont);
   gtk_util::ForceFontSizePixels(label, main_font.GetHeight());
   gtk_box_pack_start(
       GTK_BOX(text_box), gtk_util::LeftAlignMisc(label), TRUE, TRUE, 0);
 
   if (!sub_text.empty()) {
     GtkWidget* sub_label = gtk_label_new(base::UTF16ToUTF8(sub_text).c_str());
     const gfx::Font& sub_font = bundle.GetFont(ResourceBundle::BaseFont);
     gtk_util::ForceFontSizePixels(sub_label, sub_font.GetHeight());
-    int max_characters = kTextMaxWidth / sub_font.GetAverageCharacterWidth();
+    int max_characters = kTextMaxWidth / sub_font.GetExpectedTextWidth(1);
     if (sub_text.length() > static_cast<size_t>(max_characters))
       gtk_util::SetLabelWidth(sub_label, kTextMaxWidth);
     gtk_box_pack_start(
         GTK_BOX(text_box), gtk_util::LeftAlignMisc(sub_label), TRUE, TRUE, 0);
   }
   gtk_container_add(GTK_CONTAINER(icon_text_box), text_box);
 
   GtkWidget* content = gtk_alignment_new(0, 0, 0, 0);
   gtk_alignment_set_padding(
       GTK_ALIGNMENT(content), kPadding, kPadding, kPadding, kPadding);
   gtk_container_add(GTK_CONTAINER(content), icon_text_box);
   return content;
 }
 
 }  // namespace
 
 namespace chrome {
 
 scoped_ptr<ValidationMessageBubble> ValidationMessageBubble::CreateAndShow(
     content::RenderWidgetHost* widget_host,
     const gfx::Rect& anchor_in_root_view,
     const base::string16& main_text,
     const base::string16& sub_text) {
   return scoped_ptr<ValidationMessageBubble>(new ValidationMessageBubbleGtk(
       widget_host, anchor_in_root_view, main_text, sub_text)).Pass();
 }
 
 }  // namespace chrome