Move final vector icons out of ui/gfx/vector_icons/ and remove the

chrome/browser/chromeos/eol_notification.cc

 // Copyright 2016 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/chromeos/eol_notification.h"
 
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/update_engine_client.h"
 #include "components/prefs/pref_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
+#include "ui/vector_icons/vector_icons.h"
 
 using message_center::MessageCenter;
 
 namespace chromeos {
 namespace {
 
 const char kEolNotificationId[] = "eol";
 const char kDelegateId[] = "eol_delegate";
 const SkColor kButtonIconColor = SkColorSetRGB(150, 150, 152);
 const SkColor kNotificationIconColor = SkColorSetRGB(219, 68, 55);
@@ skipping 100 matching lines @@
       profile_->GetPrefs()->GetBoolean(prefs::kEolNotificationDismissed);
   if (user_dismissed_eol_notification)
     return;
 
   Update();
 }
 
 void EolNotification::Update() {
   message_center::ButtonInfo learn_more(
       l10n_util::GetStringUTF16(IDS_EOL_MORE_INFO_BUTTON));
-  learn_more.icon = gfx::Image(
-      CreateVectorIcon(gfx::VectorIconId::INFO_OUTLINE, kButtonIconColor));
+  learn_more.icon =
+      gfx::Image(CreateVectorIcon(ui::kInfoOutlineIcon, kButtonIconColor));
   message_center::ButtonInfo dismiss(
       l10n_util::GetStringUTF16(IDS_EOL_DISMISS_BUTTON));
-  dismiss.icon = gfx::Image(
-      CreateVectorIcon(gfx::VectorIconId::NOTIFICATIONS_OFF, kButtonIconColor));
+  dismiss.icon =
+      gfx::Image(CreateVectorIcon(ui::kNotificationsOffIcon, kButtonIconColor));
 
   message_center::RichNotificationData data;
   data.buttons.push_back(learn_more);
   data.buttons.push_back(dismiss);
 
   Notification notification(
       message_center::NOTIFICATION_TYPE_SIMPLE,
       l10n_util::GetStringUTF16(IDS_EOL_NOTIFICATION_TITLE),
       l10n_util::GetStringUTF16(IDS_EOL_NOTIFICATION_EOL),
-      gfx::Image(
-          CreateVectorIcon(gfx::VectorIconId::EOL, kNotificationIconColor)),
+      gfx::Image(CreateVectorIcon(kEolIcon, kNotificationIconColor)),
       message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
                                  kEolNotificationId),
       base::string16(),  // display_source
       GURL(), kEolNotificationId, data, new EolNotificationDelegate(profile_));
   g_browser_process->notification_ui_manager()->Add(notification, profile_);
 }
 
 }  // namespace chromeos