Clean-up: Replaces obsolete Font/FontList methods.

chrome/browser/ui/gtk/tabs/tab_gtk.cc

 // Copyright (c) 2012 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/gtk/tabs/tab_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/memory/singleton.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/gtk/accelerators_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_input_event_box.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/gtk/tabs/tab_strip_menu_controller.h"
 #include "chrome/browser/ui/tabs/tab_menu_model.h"
 #include "chrome/browser/ui/tabs/tab_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "ui/base/gtk/scoped_region.h"
+#include "ui/gfx/font_list.h"
 #include "ui/gfx/path.h"
+#include "ui/gfx/text_utils.h"
 
 using content::WebContents;
 
 namespace {
 
 // Returns the width of the title for the current font, in pixels.
 int GetTitleWidth(gfx::Font* font, base::string16 title) {
   DCHECK(font);
   if (title.empty())
     return 0;
 
-  return font->GetStringWidth(title);
+  return gfx::GetStringWidth(title, gfx::FontList(*font));
 }
 
 }  // namespace
 
 class TabGtk::TabGtkObserverHelper {
  public:
   explicit TabGtkObserverHelper(TabGtk* tab)
       : tab_(tab) {
     base::MessageLoopForUI::current()->AddObserver(tab_);
   }
@@ skipping 328 matching lines @@
     gdk_event_free(last_mouse_down_);
     last_mouse_down_ = NULL;
   }
 
   // Notify the drag helper that we're done with any potential drag operations.
   // Clean up the drag helper, which is re-created on the next mouse press.
   delegate_->EndDrag(canceled);
 
   observer_.reset();
 }