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

ash/common/system/web_notification/web_notification_tray.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 "ash/common/system/web_notification/web_notification_tray.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 13 matching lines @@
 #include "ash/strings/grit/ash_strings.h"
 #include "base/auto_reset.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_tray_delegate.h"
 #include "ui/message_center/views/message_bubble_base.h"
 #include "ui/message_center/views/message_center_bubble.h"
 #include "ui/message_center/views/message_popup_collection.h"
 #include "ui/strings/grit/ui_strings.h"
+#include "ui/vector_icons/vector_icons.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/fill_layout.h"
 
 namespace message_center {
 
 MessageCenterTrayDelegate* CreateMessageCenterTray() {
   // On non-CrOS, the Tray will not be hosted in ash::Shell.
@@ skipping 248 matching lines @@
     SetInkDropMode(InkDropMode::ON);
     SetContentsBackground(false);
     gfx::ImageSkia bell_image =
         CreateVectorIcon(kShelfNotificationsIcon, kShelfIconColor);
     const gfx::Size bell_icon_size = kTrayItemInnerIconSize;
     bell_icon_.reset(new WebNotificationImage(
         bell_image, bell_icon_size, animation_container_.get(), this));
   } else {
     SetContentsBackground(true);
     gfx::ImageSkia bell_image =
-        CreateVectorIcon(gfx::VectorIconId::NOTIFICATIONS, kNoUnreadIconSize,
+        CreateVectorIcon(ui::kNotificationsIcon, kNoUnreadIconSize,
                          kWebNotificationColorNoUnread);
     const gfx::Size bell_icon_size = kTrayItemInnerBellIconSizeNonMd;
     bell_icon_.reset(new WebNotificationImage(
         bell_image, bell_icon_size, animation_container_.get(), this));
   }
   tray_container()->AddChildView(bell_icon_.get());
 
   counter_.reset(new WebNotificationLabel(animation_container_.get(), this));
   tray_container()->AddChildView(counter_.get());
 
@@ skipping 332 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return nullptr;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash