Reland crrev.com/8283cad74e0cad4840d1f with fix for static initializers.

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 bc09d31cbcc07373f81ab725060ddc969b365937..e5065fcaa490ef6da807bcaa4e71580a839893e5 100644
--- a/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
+++ b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
@@ -5,6 +5,7 @@
 #import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button.h"
 
 #include "base/macros.h"
+#include "chrome/app/vector_icons/vector_icons.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"
@@ -33,19 +34,19 @@
   type_ = AppMenuIconController::IconType::NONE;
 }
 
-- (gfx::VectorIconId)vectorIconId {
+- (const gfx::VectorIcon*)vectorIcon {
   switch (type_) {
     case AppMenuIconController::IconType::NONE:
       DCHECK_EQ(severity_, AppMenuIconController::Severity::NONE);
-      return gfx::VectorIconId::BROWSER_TOOLS;
+      return &kBrowserToolsIcon;
     case AppMenuIconController::IconType::UPGRADE_NOTIFICATION:
-      return gfx::VectorIconId::BROWSER_TOOLS_UPDATE;
+      return &kBrowserToolsUpdateIcon;
     case AppMenuIconController::IconType::GLOBAL_ERROR:
     case AppMenuIconController::IconType::INCOMPATIBILITY_WARNING:
-      return gfx::VectorIconId::BROWSER_TOOLS_ERROR;
+      return &kBrowserToolsErrorIcon;
   }
 
-  return gfx::VectorIconId::VECTOR_ICON_NONE;
+  return nullptr;
 }
 
 - (SkColor)vectorIconColor:(BOOL)themeIsDark {