GTK: Port omnibox drawing from GdkGC interface to cairo.

chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h

Index: chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h
diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h b/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h
index fc5f0cbe8c9572165bccb42da3e5777734b5bca4..f8d137bd8a710255e57a7ee382da5505516c84bc 100644
--- a/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h
+++ b/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h
@@ -28,6 +28,10 @@ class GtkThemeService;
 class OmniboxView;
 class SkBitmap;
 
+namespace gfx {
+class Image;
+}
+
 class OmniboxPopupViewGtk : public AutocompletePopupView,
                             public content::NotificationObserver {
  public:
@@ -75,7 +79,7 @@ class OmniboxPopupViewGtk : public AutocompletePopupView,
   // Accept a line of the results, for example, when the user clicks a line.
   void AcceptLine(size_t line, WindowOpenDisposition disposition);
 
-  GdkPixbuf* IconForMatch(const AutocompleteMatch& match, bool selected);
+  const gfx::Image* IconForMatch(const AutocompleteMatch& match, bool selected);
 
   CHROMEGTK_CALLBACK_1(OmniboxPopupViewGtk, gboolean, HandleMotion,
                        GdkEventMotion*);
@@ -108,8 +112,8 @@ class OmniboxPopupViewGtk : public AutocompletePopupView,
 
   // Used to cache GdkPixbufs and map them from the SkBitmaps they were created
   // from.
-  typedef std::map<const SkBitmap*, GdkPixbuf*> PixbufMap;
-  PixbufMap pixbufs_;
+  typedef std::map<const SkBitmap*, gfx::Image*> ImageMap;
+  ImageMap images_;
 
   // A list of colors which we should use for drawing the popup. These change
   // between gtk and normal mode.