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

chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/infobars/extension_infobar_controller.h"
 
 #include <cmath>
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
@@ skipping 87 matching lines @@
       icon = rb.GetBitmapNamed(IDR_EXTENSIONS_SECTION);
     else
       icon = image.ToSkBitmap();
 
     SkBitmap* drop_image = rb.GetBitmapNamed(IDR_APP_DROPARROW);
 
     const int image_size = ExtensionIconSet::EXTENSION_ICON_BITTY;
     scoped_ptr<gfx::Canvas> canvas(
         new gfx::Canvas(
             gfx::Size(image_size + kDropArrowLeftMarginPx + drop_image->width(),
-                      image_size), ui::SCALE_FACTOR_100P, false));
+                      image_size), false));
     canvas->DrawImageInt(*icon,
                          0, 0, icon->width(), icon->height(),
                          0, 0, image_size, image_size,
                          false);
     canvas->DrawImageInt(*drop_image,
                          image_size + kDropArrowLeftMarginPx,
                          image_size / 2);
-    [owner_ setButtonImage:gfx::SkBitmapToNSImage(
-        canvas->ExtractImageRep().sk_bitmap())];
+    [owner_ setButtonImage:gfx::SkBitmapToNSImage(canvas->ExtractBitmap())];
   }
 
   // Overridden from ExtensionInfoBarDelegate::DelegateObserver:
   virtual void OnDelegateDeleted() {
     delegate_ = NULL;
   }
 
  private:
   // Weak. Owns us.
   ExtensionInfoBarController* owner_;
@@ skipping 145 matching lines @@
 
 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarTabHelper* owner) {
   NSWindow* window =
       [(NSView*)owner->web_contents()->GetContentNativeView() window];
   ExtensionInfoBarController* controller =
       [[ExtensionInfoBarController alloc] initWithDelegate:this
                                                      owner:owner
                                                     window:window];
   return new InfoBar(controller, this);
 }