Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed

chrome/browser/ui/views/tabs/tab.cc

Index: chrome/browser/ui/views/tabs/tab.cc
===================================================================
--- chrome/browser/ui/views/tabs/tab.cc	(revision 147935)
+++ chrome/browser/ui/views/tabs/tab.cc	(working copy)
@@ -565,7 +565,7 @@
   gfx::Canvas background_canvas(size(), canvas->scale_factor(), false);
   PaintInactiveTabBackground(&background_canvas);
 
-  gfx::ImageSkia background_image(background_canvas.ExtractImageRep());
+  gfx::ImageSkia background_image(background_canvas.ExtractImageSkiaRep());
 
   // Draw a radial gradient to hover_canvas.
   gfx::Canvas hover_canvas(size(), canvas->scale_factor(), false);
@@ -595,7 +595,7 @@
 
   // Draw the radial gradient clipped to the background into hover_image.
   gfx::ImageSkia hover_image = gfx::ImageSkiaOperations::CreateMaskedImage(
-      gfx::ImageSkia(hover_canvas.ExtractImageRep()), background_image);
+      gfx::ImageSkia(hover_canvas.ExtractImageSkiaRep()), background_image);
 
   // Draw the tab background to the canvas.
   canvas->DrawImageInt(background_image, 0, 0);
@@ -677,11 +677,11 @@
      height() - drop_shadow_height() - kToolbarOverlap - tab_image->y_offset);
 
   canvas->DrawImageInt(
-      gfx::ImageSkia(background_canvas.ExtractImageRep()), 0, 0);
+      gfx::ImageSkia(background_canvas.ExtractImageSkiaRep()), 0, 0);
 
   if (!GetThemeProvider()->HasCustomImage(tab_id) &&
       hover_controller().ShouldDraw()) {
-    hover_controller().Draw(canvas, background_canvas.ExtractImageRep());
+    hover_controller().Draw(canvas, background_canvas.ExtractImageSkiaRep());
   }
 
   // Now draw the highlights/shadows around the tab edge.