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

chrome/common/badge_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/badge_util.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkTypeface.h"
@@ skipping 66 matching lines @@
   }
 
   // When centering the text, we need to make sure there are an equal number
   // of pixels on each side as otherwise the text looks off-center. So if the
   // padding would be uneven, clip one pixel off the right side.
   int badge_width = icon.width();
   if ((SkScalarRound(text_width) % 1) != (badge_width % 1))
     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
   // us to specify the lower left coordinate of the text box, which is why we
   // add 'font_size - 1' to the height.
   SkScalar x = (badge_width - text_width)/2;
   SkScalar y = (icon.height() - font_size)/2 + font_size - 1;
   canvas->sk_canvas()->drawText(
       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