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

ui/views/controls/button/vector_icon_button.cc

 // Copyright 2015 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.
 
 #include "ui/views/controls/button/vector_icon_button.h"
 
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
@@ skipping 26 matching lines @@
 void VectorIconButton::SetIcon(gfx::VectorIconId id) {
   id_ = id;
 
   if (!border()) {
     SetBorder(
         views::CreateEmptyBorder(kButtonExtraTouchSize, kButtonExtraTouchSize,
                                  kButtonExtraTouchSize, kButtonExtraTouchSize));
   }
 }
 
+void VectorIconButton::SetIcon(const gfx::VectorIcon& icon) {
+  icon_ = &icon;
+  SetIcon(gfx::VectorIconId::VECTOR_ICON_NONE);
+}
+
 void VectorIconButton::OnThemeChanged() {
   SkColor icon_color =
       color_utils::DeriveDefaultIconColor(delegate_->GetVectorIconBaseColor());
-  gfx::ImageSkia image = gfx::CreateVectorIcon(id_, icon_color);
+  gfx::ImageSkia image;
+  if (icon_)
+    image = gfx::CreateVectorIcon(*icon_, icon_color);
+  else
+    image = gfx::CreateVectorIcon(id_, icon_color);
   SetImage(views::CustomButton::STATE_NORMAL, &image);
   image = gfx::CreateVectorIcon(id_, SkColorSetA(icon_color, 0xff / 2));
   SetImage(views::CustomButton::STATE_DISABLED, &image);
   set_ink_drop_base_color(icon_color);
 }
 
 void VectorIconButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   OnThemeChanged();
 }
 
 }  // namespace views