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

chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h

Index: chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h b/chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h
index acc93174ab36b45f6d5aa0dbfcdf6eb16807f117..4479eb97fde7b0878f3c2ceafda9453a92044996 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h
@@ -10,7 +10,10 @@
 #import "base/mac/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "ui/gfx/color_utils.h"
-#include "ui/gfx/vector_icons_public.h"
+
+namespace gfx {
+struct VectorIcon;
+}
 
 enum class ToolbarButtonImageBackgroundStyle {
   DEFAULT,
@@ -34,8 +37,8 @@ enum class ToolbarButtonImageBackgroundStyle {
 + (NSSize)toolbarButtonSize;
 // Whether or not to handle the mouse middle click events.
 @property(assign, nonatomic) BOOL handleMiddleClick;
-// Override point for subclasses to return their vector icon id.
-- (gfx::VectorIconId)vectorIconId;
+// Override point for subclasses to return their vector icon.
+- (const gfx::VectorIcon*)vectorIcon;
 // Override point for subclasses to return their vector icon color.
 - (SkColor)vectorIconColor:(BOOL)themeIsDark;
 // When in Material Design mode, sets the images for each of the ToolbarButton's