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

chrome/browser/upgrade_detector.cc

Index: chrome/browser/upgrade_detector.cc
diff --git a/chrome/browser/upgrade_detector.cc b/chrome/browser/upgrade_detector.cc
index 67e3f3b3fc7585313fc6d8e8148c5189519e32c6..2dfd1a91560d353cf9753dfa8654eeb8046c4483 100644
--- a/chrome/browser/upgrade_detector.cc
+++ b/chrome/browser/upgrade_detector.cc
@@ -6,6 +6,7 @@
 
 #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"
@@ -15,7 +16,6 @@
 #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).
@@ -57,8 +57,7 @@ gfx::Image UpgradeDetector::GetIcon() {
   }
   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()