Move icon fallbacks into ExtensionAction.

chrome/browser/ui/gtk/location_bar_view_gtk.h

Index: chrome/browser/ui/gtk/location_bar_view_gtk.h
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.h b/chrome/browser/ui/gtk/location_bar_view_gtk.h
index 8ecfa8461d1601528b71f055a955254406af95d4..f0eb3a5fb106be7889929c8b7122105c2e061154 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.h
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h
@@ -303,14 +303,7 @@ class LocationBarViewGtk : public OmniboxEditController,
     ExtensionAction* page_action_;
 
     // A cache of all the different icon paths associated with this page action.
-    typedef std::map<std::string, GdkPixbuf*> PixbufMap;
-    PixbufMap pixbufs_;
-
-    // A cache of the last dynamically generated bitmap and the pixbuf that
-    // corresponds to it. We keep track of both so we can free old pixbufs as
-    // their icons are replaced.
-    SkBitmap last_icon_skbitmap_;
-    GdkPixbuf* last_icon_pixbuf_;
+    ExtensionAction::PathToIconCache loaded_icons_;
 
     // The object that is waiting for the image loading to complete
     // asynchronously.