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

chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc

 // Copyright 2014 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/autofill/card_unmask_prompt_views.h"
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/ui/autofill/create_card_unmask_prompt_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/autofill/core/browser/ui/card_unmask_prompt_controller.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/compositing_recorder.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/safe_integer_conversions.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/background.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/tooltip_icon.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/throbber.h"
@@ skipping 413 matching lines @@
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 4);
   temporary_error->SetLayoutManager(temporary_error_layout);
   temporary_error_layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
   temporary_error->SetBorder(views::CreateEmptyBorder(8, 0, 0, 0));
   controls_container->AddChildView(temporary_error);
 
   error_icon_ = new views::ImageView();
   error_icon_->SetVisible(false);
   error_icon_->SetImage(
-      gfx::CreateVectorIcon(gfx::VectorIconId::WARNING, 16, kWarningColor));
+      gfx::CreateVectorIcon(ui::kWarningIcon, 16, kWarningColor));
   temporary_error->AddChildView(error_icon_);
 
   // Reserve vertical space for the error label, assuming it's one line.
   error_label_ = new views::Label(base::ASCIIToUTF16(" "));
   error_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   error_label_->SetEnabledColor(kWarningColor);
   temporary_error->AddChildView(error_label_);
   temporary_error_layout->SetFlexForView(error_label_, 1);
 
   progress_overlay_ = new FadeOutView();
@@ skipping 52 matching lines @@
   views::View::OnPaint(canvas);
   canvas->Restore();
 }
 
 void CardUnmaskPromptViews::FadeOutView::SetAlpha(uint8_t alpha) {
   alpha_ = alpha;
   SchedulePaint();
 }
 
 }  // namespace autofill