Move around more vector icons.

chrome/browser/ui/autofill/autofill_popup_layout_model.cc

Index: chrome/browser/ui/autofill/autofill_popup_layout_model.cc
diff --git a/chrome/browser/ui/autofill/autofill_popup_layout_model.cc b/chrome/browser/ui/autofill/autofill_popup_layout_model.cc
index a481c95c2d0f6a129a48c37d7e2b4500209fa565..b985edd7c252a3c016d129c70c5dead838affbe7 100644
--- a/chrome/browser/ui/autofill/autofill_popup_layout_model.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_layout_model.cc
@@ -23,7 +23,10 @@
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
+
+#if !defined(OS_ANDROID)
+#include "components/toolbar/vector_icons.h"  // nogncheck
+#endif
 
 namespace autofill {
 
@@ -208,16 +211,16 @@ gfx::ImageSkia AutofillPopupLayoutModel::GetIconImage(size_t index) const {
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
   const base::string16& icon_str = suggestions[index].icon;
 
-  // For http warning message, get icon images from VectorIconId, which is the
+  // For http warning message, get icon images from VectorIcon, which is the
   // same as security indicator icons in location bar.
   if (suggestions[index].frontend_id ==
       POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE) {
     if (icon_str == base::ASCIIToUTF16("httpWarning")) {
-      return gfx::CreateVectorIcon(gfx::VectorIconId::LOCATION_BAR_HTTP,
-                                   kHttpWarningIconWidth, gfx::kChromeIconGrey);
+      return gfx::CreateVectorIcon(toolbar::kHttpIcon, kHttpWarningIconWidth,
+                                   gfx::kChromeIconGrey);
     }
     DCHECK_EQ(icon_str, base::ASCIIToUTF16("httpsInvalid"));
-    return gfx::CreateVectorIcon(gfx::VectorIconId::LOCATION_BAR_HTTPS_INVALID,
+    return gfx::CreateVectorIcon(toolbar::kHttpsInvalidIcon,
                                  kHttpWarningIconWidth, gfx::kGoogleRed700);
   }