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

chrome/browser/upgrade_detector.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/upgrade_detector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/browser_otr_state.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "content/public/browser/notification_service.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 
 // How long to wait between checks for whether the user has been idle.
 static const int kIdleRepeatingTimerWait = 10;  // Minutes (seconds if testing).
 
 // How much idle time (since last input even was detected) must have passed
 // until we notify that a critical update has occurred.
 static const int kIdleAmount = 2;  // Hours (or seconds, if testing).
 
 bool UseTestingIntervals() {
   // If a command line parameter specifying how long the upgrade check should
@@ skipping 21 matching lines @@
       color = gfx::kGoogleYellow700;
       break;
     case UPGRADE_ANNOYANCE_HIGH:
     case UPGRADE_ANNOYANCE_SEVERE:
     case UPGRADE_ANNOYANCE_CRITICAL:
       color = gfx::kGoogleRed700;
       break;
   }
   DCHECK_NE(gfx::kPlaceholderColor, color);
 
-  return gfx::Image(
-      gfx::CreateVectorIcon(gfx::VectorIconId::BROWSER_TOOLS_UPDATE, color));
+  return gfx::Image(gfx::CreateVectorIcon(kBrowserToolsUpdateIcon, color));
 }
 
 UpgradeDetector::UpgradeDetector()
     : upgrade_available_(UPGRADE_AVAILABLE_NONE),
       best_effort_experiment_updates_available_(false),
       critical_experiment_updates_available_(false),
       critical_update_acknowledged_(false),
       is_factory_reset_required_(false),
       upgrade_notification_stage_(UPGRADE_ANNOYANCE_NONE),
       notify_upgrade_(false) {
@@ skipping 60 matching lines @@
       break;
     case ui::IDLE_STATE_ACTIVE:
     case ui::IDLE_STATE_UNKNOWN:
       break;
     default:
       NOTREACHED();  // Need to add any new value above (either providing
                      // automatic restart or show notification to user).
       break;
   }
 }