Rework gfx::Font by moving platform-specific code into inner classes....

chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc

 // Copyright (c) 2010 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/autocomplete/autocomplete_popup_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 267 matching lines @@
   // doing RTL or anything yet, so it shouldn't be important now.
   layout_ = gtk_widget_create_pango_layout(window_, NULL);
   // We don't want the layout of search results depending on their language.
   pango_layout_set_auto_dir(layout_, FALSE);
   // We always ellipsize when drawing our text runs.
   pango_layout_set_ellipsize(layout_, PANGO_ELLIPSIZE_END);
   // TODO(deanm): We might want to eventually follow what Windows does and
   // plumb a gfx::Font through.  This is because popup windows have a
   // different font size, although we could just derive that font here.
   // For now, force the font size.
-  gfx::Font font = gfx::Font::CreateFont(
-      gfx::Font().FontName(), browser_defaults::kAutocompletePopupFontSize);
-  PangoFontDescription* pfd = gfx::Font::PangoFontFromGfxFont(font);
+  gfx::Font font(gfx::Font().GetFontName(),
+                 browser_defaults::kAutocompletePopupFontSize);
+  PangoFontDescription* pfd = font.GetNativeFont();
   pango_layout_set_font_description(layout_, pfd);
   pango_font_description_free(pfd);
 
   gtk_widget_add_events(window_, GDK_BUTTON_MOTION_MASK |
                                  GDK_POINTER_MOTION_MASK |
                                  GDK_BUTTON_PRESS_MASK |
                                  GDK_BUTTON_RELEASE_MASK);
   g_signal_connect(window_, "motion-notify-event",
                    G_CALLBACK(&HandleMotionThunk), this);
   g_signal_connect(window_, "button-press-event",
@@ skipping 347 matching lines @@
                           (text_width - actual_content_width -
                            (actual_description_width / PANGO_SCALE)),
                       content_y, layout_);
     }
   }
 
   g_object_unref(gc);
 
   return TRUE;
 }