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

chrome/common/badge_util.cc

Index: chrome/common/badge_util.cc
===================================================================
--- chrome/common/badge_util.cc	(revision 147935)
+++ chrome/common/badge_util.cc	(working copy)
@@ -84,8 +84,8 @@
     badge_width--;
 
   // Render the badge bitmap and overlay into a canvas.
-  scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas(
-      gfx::Size(badge_width, icon.height()), ui::SCALE_FACTOR_100P, false));
+  scoped_ptr<gfx::Canvas> canvas(
+      new gfx::Canvas(gfx::Size(badge_width, icon.height()), false));
   canvas->DrawImageInt(icon, 0, 0);
 
   // Draw the text overlay centered horizontally and vertically. Skia expects
@@ -97,7 +97,7 @@
       badge_text.c_str(), badge_text.size(), x, y, *paint);
 
   // Return the generated image.
-  return canvas->ExtractImageRep().sk_bitmap();
+  return canvas->ExtractBitmap();
 }
 
 }  // namespace badge_util