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

chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.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/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/grit/components_scaled_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_unittest_util.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
+#include "ui/vector_icons/vector_icons.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
 namespace {
 const int kIconSize = 16;
 }
@@ skipping 279 matching lines @@
   ASSERT_FALSE(extra_view);
   CloseBubble();
 }
 
 TEST_F(ToolbarActionsBarBubbleViewsTest, TestCreateExtraViewIconOnly) {
   TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
                                                ActionString());
   std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>
       extra_view_info =
           base::MakeUnique<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>();
-  extra_view_info->resource_id = gfx::VectorIconId::BUSINESS;
+  extra_view_info->resource = &ui::kBusinessIcon;
   delegate.set_extra_view_info(std::move(extra_view_info));
   ShowBubble(&delegate);
   std::unique_ptr<views::View> extra_view(TestCreateExtraView());
   ASSERT_TRUE(extra_view);
   ASSERT_EQ("ImageView", std::string(extra_view->GetClassName()));
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       gfx::Image(static_cast<views::ImageView*>(extra_view.get())->GetImage()),
-      gfx::Image(gfx::CreateVectorIcon(gfx::VectorIconId::BUSINESS, kIconSize,
+      gfx::Image(gfx::CreateVectorIcon(ui::kBusinessIcon, kIconSize,
                                        gfx::kChromeIconGrey))));
   CloseBubble();
 }
 
 TEST_F(ToolbarActionsBarBubbleViewsTest, TestCreateExtraViewLinkedTextOnly) {
   TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
                                                ActionString());
   std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>
       extra_view_info_linked_text =
           base::MakeUnique<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>();
@@ skipping 32 matching lines @@
             static_cast<views::Label*>(extra_view.get())->text());
   CloseBubble();
 }
 
 TEST_F(ToolbarActionsBarBubbleViewsTest, TestCreateExtraViewImageAndText) {
   TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
                                                ActionString());
   std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>
       extra_view_info =
           base::MakeUnique<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>();
-  extra_view_info->resource_id = gfx::VectorIconId::BUSINESS;
+  extra_view_info->resource = &ui::kBusinessIcon;
   extra_view_info->text =
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALLED_BY_ADMIN);
   extra_view_info->is_text_linked = false;
   delegate.set_extra_view_info(std::move(extra_view_info));
 
   ShowBubble(&delegate);
 
   std::unique_ptr<views::View> extra_view(TestCreateExtraView());
   ASSERT_TRUE(extra_view);
   EXPECT_EQ("View", std::string(extra_view->GetClassName()));
   EXPECT_EQ(2, extra_view->child_count());
 
   for (int i = 0; i < 2; i++) {
     const views::View* v = extra_view->child_at(i);
     std::string class_name = v->GetClassName();
     ASSERT_TRUE(class_name == "Label" || class_name == "ImageView");
     if (class_name == "Label") {
       EXPECT_EQ(l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALLED_BY_ADMIN),
                 static_cast<const views::Label*>(v)->text());
     } else {
       EXPECT_TRUE(gfx::test::AreImagesEqual(
           gfx::Image(static_cast<const views::ImageView*>(v)->GetImage()),
-          gfx::Image(gfx::CreateVectorIcon(gfx::VectorIconId::BUSINESS,
-                                           kIconSize, gfx::kChromeIconGrey))));
+          gfx::Image(gfx::CreateVectorIcon(ui::kBusinessIcon, kIconSize,
+                                           gfx::kChromeIconGrey))));
     }
   }
 
   CloseBubble();
 }