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

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

Index: chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm b/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm
index 925bc4002ae740e119450c275ed69c2a6498256e..942994f8720bc9b6e06a811910114ad4ce4f0ce0 100644
--- a/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm
+++ b/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm
@@ -8,6 +8,7 @@
 
 #include "base/macros.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/command_updater.h"
 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
@@ -193,16 +194,16 @@ const int kReloadMenuCommands[]  = {
   return VIEW_ID_RELOAD_BUTTON;
 }
 
-- (gfx::VectorIconId)vectorIconId {
+- (const gfx::VectorIcon*)vectorIcon {
   if ([self tag] == IDC_RELOAD) {
-    return gfx::VectorIconId::NAVIGATE_RELOAD;
+    return &kNavigateReloadIcon;
   } else if ([self tag] == IDC_STOP) {
-    return gfx::VectorIconId::NAVIGATE_STOP;
+    return &kNavigateStopIcon;
   } else {
     NOTREACHED();
   }
 
-  return gfx::VectorIconId::VECTOR_ICON_NONE;
+  return nullptr;
 }
 
 - (void)mouseInsideStateDidChange:(BOOL)isInside {