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

chrome/browser/recovery/recovery_install_global_error.cc

 // Copyright (c) 2014 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/recovery/recovery_install_global_error.h"
 
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/component_updater/recovery_component_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "components/prefs/pref_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/native_theme/native_theme.h"
 
 RecoveryInstallGlobalError::RecoveryInstallGlobalError(Profile* profile)
         : elevation_needed_(false),
           profile_(profile),
           has_shown_bubble_view_(false) {
   GlobalErrorServiceFactory::GetForProfile(profile_)->AddUnownedGlobalError(
       this);
 
   PrefService* pref = g_browser_process->local_state();
@@ skipping 31 matching lines @@
 int RecoveryInstallGlobalError::MenuItemCommandID() {
   return IDC_ELEVATED_RECOVERY_DIALOG;
 }
 
 base::string16 RecoveryInstallGlobalError::MenuItemLabel() {
   return l10n_util::GetStringUTF16(IDS_UPDATE_NOW);
 }
 
 gfx::Image RecoveryInstallGlobalError::MenuItemIcon() {
   return gfx::Image(gfx::CreateVectorIcon(
-      gfx::VectorIconId::BROWSER_TOOLS_UPDATE,
+      kBrowserToolsUpdateIcon,
       ui::NativeTheme::GetInstanceForNativeUi()->GetSystemColor(
           ui::NativeTheme::kColorId_AlertSeverityHigh)));
 }
 
 void RecoveryInstallGlobalError::ExecuteMenuItem(Browser* browser) {
   ShowBubbleView(browser);
 }
 
 bool RecoveryInstallGlobalError::HasBubbleView() {
   return HasElevationNotification();
@@ skipping 67 matching lines @@
   DCHECK(pref->FindPreference(prefs::kRecoveryComponentNeedsElevation));
   elevation_needed_ = pref->GetBoolean(prefs::kRecoveryComponentNeedsElevation);
 
   // Got a new elevation request, resets |has_shown_bubble_view_| so the
   // bubble has a higher priority to show.
   if (elevation_needed_)
     has_shown_bubble_view_ = false;
 
   GlobalErrorServiceFactory::GetForProfile(profile_)->NotifyErrorsChanged(this);
 }