[Extensions UI] Clean up extension icon generation

chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_TEST_TOOLBAR_ACTION_VIEW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_TOOLBAR_TEST_TOOLBAR_ACTION_VIEW_CONTROLLER_H_
 
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 
 // A minimalistic and configurable ToolbarActionViewController for use in
 // testing.
 class TestToolbarActionViewController : public ToolbarActionViewController {
  public:
   explicit TestToolbarActionViewController(const std::string& id);
   ~TestToolbarActionViewController() override;
 
   // ToolbarActionViewController:
   const std::string& GetId() const override;
   void SetDelegate(ToolbarActionViewDelegate* delegate) override;
-  gfx::Image GetIcon(content::WebContents* web_contents) override;
-  gfx::ImageSkia GetIconWithBadge() override;
+  gfx::Image GetIcon(content::WebContents* web_contents,
+                     const gfx::Size& size) override;
   base::string16 GetActionName() const override;
   base::string16 GetAccessibleName(content::WebContents* web_contents)
       const override;
   base::string16 GetTooltip(content::WebContents* web_contents)
       const override;
   bool IsEnabled(content::WebContents* web_contents) const override;
   bool WantsToRun(content::WebContents* web_contents) const override;
   bool HasPopup(content::WebContents* web_contents) const override;
   void HidePopup() override;
   gfx::NativeView GetPopupNativeView() override;
@@ skipping 33 matching lines @@
   // Whether or not the action wants to run. Defaults to false.
   bool wants_to_run_;
 
   // The number of times the action would have been executed.
   int execute_action_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestToolbarActionViewController);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_TEST_TOOLBAR_ACTION_VIEW_CONTROLLER_H_