[Extensions UI] Clean up extension icon generation

chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm

Index: chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
index 062152c93474d72c44921d3b45df2e40cee8af65..3caf2fae397b79032ced801632a211c904e44901 100644
--- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
@@ -93,14 +93,14 @@ void PageActionDecoration::UpdateVisibility(WebContents* contents) {
     SetToolTip(viewController_->GetTooltip(contents));
 
     // Set the image.
-    gfx::Image icon = viewController_->GetIcon(contents);
+    gfx::Size size(ExtensionAction::kPageActionIconMaxSize,
+                   ExtensionAction::kPageActionIconMaxSize);
+    gfx::Image icon = viewController_->GetIcon(contents, size);
     if (!icon.IsEmpty()) {
       SetImage(icon.ToNSImage());
     } else if (!GetImage()) {
-      const NSSize default_size = NSMakeSize(
-          ExtensionAction::kPageActionIconMaxSize,
-          ExtensionAction::kPageActionIconMaxSize);
-      SetImage([[[NSImage alloc] initWithSize:default_size] autorelease]);
+      NSSize ns_size = NSMakeSize(size.width(), size.height());

[Avi (use Gerrit), 2015/07/02 00:33:23]

Hmm. NSSizeFromCGSize(size.ToCGSize()), though that might force a linewrap.

[Devlin, 2015/07/06 19:16:07]

Done.

+      SetImage([[[NSImage alloc] initWithSize:ns_size] autorelease]);
     }
   }