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

chrome/browser/ui/global_error/global_error.cc

Index: chrome/browser/ui/global_error/global_error.cc
diff --git a/chrome/browser/ui/global_error/global_error.cc b/chrome/browser/ui/global_error/global_error.cc
index 8511cc3639fd106daefd66da49db4931107eca9c..370a8ad2824f7cb81e5a544f4e48df0146a29028 100644
--- a/chrome/browser/ui/global_error/global_error.cc
+++ b/chrome/browser/ui/global_error/global_error.cc
@@ -12,9 +12,9 @@
 #include "ui/gfx/image/image.h"
 
 #if !defined(OS_ANDROID)
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #endif
 
 // GlobalError ---------------------------------------------------------------
@@ -30,8 +30,8 @@ gfx::Image GlobalError::MenuItemIcon() {
   return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_INPUT_ALERT_MENU);
 #else
-  return gfx::Image(gfx::CreateVectorIcon(
-      gfx::VectorIconId::BROWSER_TOOLS_ERROR, gfx::kGoogleYellow700));
+  return gfx::Image(
+      gfx::CreateVectorIcon(kBrowserToolsErrorIcon, gfx::kGoogleYellow700));
 #endif
 }