[Extensions UI] Clean up extension icon generation

chrome/browser/ui/views/toolbar/browser_actions_container.cc

 // Copyright 2013 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/views/toolbar/browser_actions_container.h"
 
 #include "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_message_bubble_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ skipping 597 matching lines @@
 void BrowserActionsContainer::WriteDragDataForView(View* sender,
                                                    const gfx::Point& press_pt,
                                                    OSExchangeData* data) {
   DCHECK(data);
 
   ToolbarActionViews::iterator iter = std::find(toolbar_action_views_.begin(),
                                                 toolbar_action_views_.end(),
                                                 sender);
   DCHECK(iter != toolbar_action_views_.end());
   ToolbarActionViewController* view_controller = (*iter)->view_controller();
+  gfx::Size size(ToolbarActionsBar::IconWidth(false),
+                 ToolbarActionsBar::IconHeight());
   drag_utils::SetDragImageOnDataObject(
-      view_controller->GetIconWithBadge(),
+      view_controller->GetIcon(GetCurrentWebContents(), size).AsImageSkia(),
       press_pt.OffsetFromOrigin(),
       data);
   // Fill in the remaining info.
   BrowserActionDragData drag_data(view_controller->GetId(),
                                   iter - toolbar_action_views_.begin());
   drag_data.Write(browser_->profile(), data);
 }
 
 int BrowserActionsContainer::GetDragOperationsForView(View* sender,
                                                       const gfx::Point& p) {
@@ skipping 154 matching lines @@
   const int kImages[] = IMAGE_GRID(IDR_DEVELOPER_MODE_HIGHLIGHT);
   highlight_painter_.reset(views::Painter::CreateImageGridPainter(kImages));
 }
 
 void BrowserActionsContainer::ClearActiveBubble(views::Widget* widget) {
   DCHECK(active_bubble_);
   DCHECK_EQ(active_bubble_->GetWidget(), widget);
   widget->RemoveObserver(this);
   active_bubble_ = nullptr;
 }