Cleanup gfx::Canvas now that 10562027 has landed

chrome/browser/ui/gtk/infobars/extension_infobar_gtk.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/browser/ui/gtk/infobars/extension_infobar_gtk.h"
 
 #include "base/debug/trace_event.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/platform_util.h"
@@ skipping 67 matching lines @@
   else
     icon = image.ToSkBitmap();
 
   SkBitmap* drop_image = rb.GetBitmapNamed(IDR_APP_DROPARROW);
 
   int image_size = ExtensionIconSet::EXTENSION_ICON_BITTY;
   // The margin between the extension icon and the drop-down arrow bitmap.
   static const int kDropArrowLeftMargin = 3;
   scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas(
       gfx::Size(image_size + kDropArrowLeftMargin + drop_image->width(),
-                image_size), false));
+                image_size), ui::SCALE_FACTOR_100P, false));
   canvas->DrawImageInt(*icon, 0, 0, icon->width(), icon->height(), 0, 0,
                        image_size, image_size, false);
   canvas->DrawImageInt(*drop_image, image_size + kDropArrowLeftMargin,
                        image_size / 2);
 
-  SkBitmap bitmap = canvas->ExtractBitmap();
+  SkBitmap bitmap = canvas->ExtractImageRep().sk_bitmap();
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(bitmap);
   gtk_image_set_from_pixbuf(GTK_IMAGE(icon_), pixbuf);
   g_object_unref(pixbuf);
 }
 
 void ExtensionInfoBarGtk::BuildWidgets() {
   button_ = gtk_chrome_button_new();
   gtk_chrome_button_set_use_gtk_rendering(GTK_CHROME_BUTTON(button_), FALSE);
   g_object_set_data(G_OBJECT(button_), "left-align-popup",
                     reinterpret_cast<void*>(true));
@@ skipping 92 matching lines @@
   // We also need to draw our infobar arrows over the renderer.
   static_cast<InfoBarContainerGtk*>(container())->
       PaintInfobarBitsOn(sender, event, this);
 
   return FALSE;
 }
 
 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarTabHelper* owner) {
   return new ExtensionInfoBarGtk(owner, this);
 }