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

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

 // Copyright 2016 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.
 
 #import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button.h"
 
 #include "base/macros.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #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
 
 @implementation AppToolbarButton
 
 - (instancetype)initWithFrame:(NSRect)frame {
   if ((self = [super initWithFrame:frame])) {
     [self commonInit];
   }
   return self;
 }
 
 - (void)awakeFromNib {
   [self commonInit];
 }
 
 - (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;
     case AppMenuIconController::IconType::GLOBAL_ERROR:
     case AppMenuIconController::IconType::INCOMPATIBILITY_WARNING:
       return gfx::VectorIconId::BROWSER_TOOLS_ERROR;
   }
 
   return gfx::VectorIconId::VECTOR_ICON_NONE;
 }
 
 - (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;
 
     default:
       break;
   }
 }
 
-- (void)setSeverity:(AppMenuIconPainter::Severity)severity
+- (void)setSeverity:(AppMenuIconController::Severity)severity
            iconType:(AppMenuIconController::IconType)type
       shouldAnimate:(BOOL)shouldAnimate {
   if (severity != severity_ || type != type_) {
     severity_ = severity;
     type_ = type;
     // Update the button state images with the new severity color or icon type.
     [self resetButtonStateImages];
   }
 }
 
 @end