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

chrome/browser/ui/views/toolbar/reload_button.cc

Index: chrome/browser/ui/views/toolbar/reload_button.cc
diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc
index bc07083a3404b0d0dcfe718b6fb7142c409ab980..94bb8ceacae587325b42a96730412962abef7c38 100644
--- a/chrome/browser/ui/views/toolbar/reload_button.cc
+++ b/chrome/browser/ui/views/toolbar/reload_button.cc
@@ -9,6 +9,7 @@
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_properties.h"
@@ -20,7 +21,6 @@
 #include "ui/base/theme_provider.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/metrics.h"
 #include "ui/views/widget/widget.h"
 
@@ -232,17 +232,16 @@ void ReloadButton::ChangeModeInternal(Mode mode) {
   const ui::ThemeProvider* tp = GetThemeProvider();
   // |tp| can be NULL in unit tests.
   if (tp) {
-    const gfx::VectorIconId icon_id = (mode == MODE_RELOAD)
-                                          ? gfx::VectorIconId::NAVIGATE_RELOAD
-                                          : gfx::VectorIconId::NAVIGATE_STOP;
+    const gfx::VectorIcon& icon =
+        (mode == MODE_RELOAD) ? kNavigateReloadIcon : kNavigateStopIcon;
     const SkColor normal_color =
         tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
     const SkColor disabled_color =
         tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE);
     SetImage(views::Button::STATE_NORMAL,
-             gfx::CreateVectorIcon(icon_id, normal_color));
+             gfx::CreateVectorIcon(icon, normal_color));
     SetImage(views::Button::STATE_DISABLED,
-             gfx::CreateVectorIcon(icon_id, disabled_color));
+             gfx::CreateVectorIcon(icon, disabled_color));
     set_ink_drop_base_color(normal_color);
   }