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

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

 // Copyright (c) 2012 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/reload_button_cocoa.h"
 
 #include <stddef.h>
 
 #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"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "ui/base/accelerators/platform_accelerator_cocoa.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ skipping 165 matching lines @@
     }
   }
 
   return [super sendAction:theAction to:theTarget];
 }
 
 - (ViewID)viewID {
   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 {
   [pendingReloadTimer_ fire];
 }
 
 - (void)populateMenu {
   [menu_ setAutoenablesItems:NO];
   // 0-th item must be blank. (This is because we use a pulldown list, for which
   // Cocoa uses the 0-th item as "title" in the button.)
@@ skipping 41 matching lines @@
 
 @end  // ReloadButton
 
 @implementation ReloadButton (Testing)
 
 + (void)setPendingReloadTimeout:(NSTimeInterval)seconds {
   kPendingReloadTimeout = seconds;
 }
 
 @end