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

chrome/browser/ui/global_error/global_error.cc

 // 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.
 
 #include "chrome/browser/ui/global_error/global_error.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h"
 #include "chrome/grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #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 ---------------------------------------------------------------
 
 GlobalError::GlobalError() {}
 
 GlobalError::~GlobalError() {}
 
 GlobalError::Severity GlobalError::GetSeverity() { return SEVERITY_MEDIUM; }
 
 gfx::Image GlobalError::MenuItemIcon() {
 #if defined(OS_ANDROID)
   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
 }
 
 // GlobalErrorWithStandardBubble ---------------------------------------------
 
 GlobalErrorWithStandardBubble::GlobalErrorWithStandardBubble()
     : has_shown_bubble_view_(false), bubble_view_(NULL) {}
 
 GlobalErrorWithStandardBubble::~GlobalErrorWithStandardBubble() {}
 
@@ skipping 30 matching lines @@
 
 bool GlobalErrorWithStandardBubble::ShouldAddElevationIconToAcceptButton() {
   return false;
 }
 
 void GlobalErrorWithStandardBubble::BubbleViewDidClose(Browser* browser) {
   DCHECK(browser);
   bubble_view_ = NULL;
   OnBubbleViewDidClose(browser);
 }