4 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/gtk/bookmark_utils_gtk.cc b/chrome/browser/gtk/bookmark_utils_gtk.cc
index 85ebd8d..38c16df 100644
--- a/chrome/browser/gtk/bookmark_utils_gtk.cc
+++ b/chrome/browser/gtk/bookmark_utils_gtk.cc
@@ -197,7 +197,7 @@ GtkWidget* GetDragRepresentation(GdkPixbuf* pixbuf,
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
     gtk_widget_set_size_request(window, kDragRepresentationWidth,
-                                base_font.height());
+                                base_font.GetHeight());
   } else {
     if (!provider->UseGtkTheme()) {
       // TODO(erg): Theme wise, which color should I be picking here?
diff --git a/chrome/browser/gtk/options/fonts_page_gtk.cc b/chrome/browser/gtk/options/fonts_page_gtk.cc
index abb544d..f9c254a 100644
--- a/chrome/browser/gtk/options/fonts_page_gtk.cc
+++ b/chrome/browser/gtk/options/fonts_page_gtk.cc
@@ -22,8 +22,8 @@ std::string MakeFontName(std::string family_name, int pixel_size) {
   // The given font might not be available (the default fonts we use are not
   // installed by default on some distros).  So figure out which font we are
   // actually falling back to and display that.  (See crbug.com/31381.)
-  std::wstring actual_family_name = gfx::Font::CreateFont(
-      UTF8ToWide(family_name), pixel_size).FontName();
+  std::wstring actual_family_name = gfx::Font(
+      UTF8ToWide(family_name), pixel_size).GetFontName();
   std::string fontname;
   // TODO(mattm): We can pass in the size in pixels (px), and the font button
   // actually honors it, but when you open the selector it interprets it as
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
index eac4a38..4dc40a7 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
@@ -1078,8 +1078,8 @@ void TabRendererGtk::InitResources() {
   // Force the font size to 9pt, which matches Windows' default font size
   // (taken from the system).
   const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
-  title_font_ = new gfx::Font(gfx::Font::CreateFont(base_font.FontName(), 9));
-  title_font_height_ = title_font_->height();
+  title_font_ = new gfx::Font(base_font.GetFontName(), 9);
+  title_font_height_ = title_font_->GetHeight();
 
   crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
 
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/gtk/tabs/tab_renderer_gtk.h
index 0a03a8a6..092843d 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.h
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.h
@@ -13,6 +13,7 @@
 #include "app/gtk_signal.h"
 #include "app/slide_animation.h"
 #include "base/basictypes.h"
+#include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/gtk/owned_widget_gtk.h"
 #include "chrome/common/notification_observer.h"