Remove a bunch of pre-MD toolbar code and assets.

chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm

Index: chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
diff --git a/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
index 8baa47f2e2547a3f1b516d3a06392340801bf7b9..bc09d31cbcc07373f81ab725060ddc969b365937 100644
--- a/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
+++ b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
@@ -10,23 +10,6 @@
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/color_palette.h"
 
-class AppMenuButtonIconPainterDelegateMac :
-    public AppMenuIconPainter::Delegate {
- public:
-  explicit AppMenuButtonIconPainterDelegateMac(NSButton* button) :
-      button_(button) {}
-  ~AppMenuButtonIconPainterDelegateMac() override {}
-
-  void ScheduleAppMenuIconPaint() override {
-    [button_ setNeedsDisplay:YES];
-  }
-
- private:
-  NSButton* button_;
-
-  DISALLOW_COPY_AND_ASSIGN(AppMenuButtonIconPainterDelegateMac);
-};
-
 @interface AppToolbarButton ()
 - (void)commonInit;
 @end
@@ -46,15 +29,14 @@ class AppMenuButtonIconPainterDelegateMac :
 
 - (void)commonInit {
   view_id_util::SetID(self, VIEW_ID_APP_MENU);
-  delegate_.reset(new AppMenuButtonIconPainterDelegateMac(self));
-  severity_ = AppMenuIconPainter::Severity::SEVERITY_NONE;
+  severity_ = AppMenuIconController::Severity::NONE;
   type_ = AppMenuIconController::IconType::NONE;
 }
 
 - (gfx::VectorIconId)vectorIconId {
   switch (type_) {
     case AppMenuIconController::IconType::NONE:
-      DCHECK_EQ(severity_, AppMenuIconPainter::SEVERITY_NONE);
+      DCHECK_EQ(severity_, AppMenuIconController::Severity::NONE);
       return gfx::VectorIconId::BROWSER_TOOLS;
     case AppMenuIconController::IconType::UPGRADE_NOTIFICATION:
       return gfx::VectorIconId::BROWSER_TOOLS_UPDATE;
@@ -68,19 +50,19 @@ class AppMenuButtonIconPainterDelegateMac :
 
 - (SkColor)vectorIconColor:(BOOL)themeIsDark {
   switch (severity_) {
-    case AppMenuIconPainter::Severity::SEVERITY_NONE:
+    case AppMenuIconController::Severity::NONE:
       return themeIsDark ? SK_ColorWHITE : gfx::kChromeIconGrey;
       break;
 
-    case AppMenuIconPainter::Severity::SEVERITY_LOW:
+    case AppMenuIconController::Severity::LOW:
       return themeIsDark ? gfx::kGoogleGreen300 : gfx::kGoogleGreen700;
       break;
 
-    case AppMenuIconPainter::Severity::SEVERITY_MEDIUM:
+    case AppMenuIconController::Severity::MEDIUM:
       return themeIsDark ? gfx::kGoogleYellow300 : gfx::kGoogleYellow700;
       break;
 
-    case AppMenuIconPainter::Severity::SEVERITY_HIGH:
+    case AppMenuIconController::Severity::HIGH:
       return themeIsDark ? gfx::kGoogleRed300 : gfx::kGoogleRed700;
       break;
 
@@ -89,7 +71,7 @@ class AppMenuButtonIconPainterDelegateMac :
   }
 }
 
-- (void)setSeverity:(AppMenuIconPainter::Severity)severity
+- (void)setSeverity:(AppMenuIconController::Severity)severity
            iconType:(AppMenuIconController::IconType)type
       shouldAnimate:(BOOL)shouldAnimate {
   if (severity != severity_ || type != type_) {