GTK: Move CairoCachedSurface from being owned by GtkThemeService to gfx::Image.

chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h

Index: chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h
diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h
index a40f4c1376e1c72a3581b4f84d981b15cc7ce255..40769fb6752ad787a9e403fcbf7dfd111fd957f9 100644
--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h
+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h
@@ -13,7 +13,6 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
-#include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -22,13 +21,14 @@
 #include "ui/base/gtk/owned_widget_gtk.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/rect.h"
 
 namespace gfx {
+class CairoCachedSurface;
 class Size;
 }  // namespace gfx
 
-class CairoCachedSurface;
 class CustomDrawButton;
 class TabContents;
 class GtkThemeService;
@@ -242,7 +242,7 @@ class TabRendererGtk : public ui::AnimationDelegate,
     ~TabData();
 
     SkBitmap favicon;
-    CairoCachedSurface cairo_favicon;
+    gfx::CairoCachedSurface cairo_favicon;
     bool is_default_favicon;
     string16 title;
     bool loading;
@@ -300,7 +300,7 @@ class TabRendererGtk : public ui::AnimationDelegate,
   // sides for the rounded tab shape.
   void DrawTabBackground(cairo_t* cr,
                          GtkWidget* widget,
-                         CairoCachedSurface* tab_bg,
+                         gfx::CairoCachedSurface* tab_bg,
                          int offset_x,
                          int offset_y);