[Extensions UI] Clean up extension icon generation

chrome/browser/ui/views/location_bar/page_action_image_view.cc

Index: chrome/browser/ui/views/location_bar/page_action_image_view.cc
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
index 34ce3d5c06a7720ecd1c6cba81c12652833cc41a..ac29230dd6a43f3be9070a55351c52fe9fa067b7 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
@@ -104,23 +104,13 @@ void PageActionImageView::UpdateVisibility(content::WebContents* contents) {
   SetTooltipText(base::UTF8ToUTF16(tooltip_));
 
   // Set the image.
-  gfx::Image icon = view_controller_->GetIcon(contents);
+  gfx::Image icon = view_controller_->GetIcon(contents, GetPreferredSize());
   if (!icon.IsEmpty())
     SetImage(*icon.ToImageSkia());
 
   SetVisible(true);
 }
 
-void PageActionImageView::PaintChildren(const ui::PaintContext& context) {
-  View::PaintChildren(context);
-  int tab_id = SessionTabHelper::IdForTab(GetCurrentWebContents());
-  if (tab_id >= 0) {
-    ui::PaintRecorder recorder(context);
-    view_controller_->extension_action()->PaintBadge(recorder.canvas(),
-                                                     GetLocalBounds(), tab_id);
-  }
-}
-
 void PageActionImageView::UpdateState() {
   UpdateVisibility(GetCurrentWebContents());
 }