Update infobars to use VectorIcon struct instead of VectorIconId.

components/infobars/core/infobar_delegate.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 "components/infobars/core/infobar_delegate.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_manager.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/vector_icons_public.h"
+#include "ui/gfx/vector_icon_types.h"
 
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
 #endif
 
 namespace infobars {
 
 const int InfoBarDelegate::kNoIconID = 0;
 
 InfoBarDelegate::~InfoBarDelegate() {
 }
 
 InfoBarDelegate::InfoBarAutomationType
     InfoBarDelegate::GetInfoBarAutomationType() const {
   return UNKNOWN_INFOBAR;
 }
 
 InfoBarDelegate::Type InfoBarDelegate::GetInfoBarType() const {
   return WARNING_TYPE;
 }
 
 int InfoBarDelegate::GetIconId() const {
   return kNoIconID;
 }
 
-gfx::VectorIconId InfoBarDelegate::GetVectorIconId() const {
-  return gfx::VectorIconId::VECTOR_ICON_NONE;
+const gfx::VectorIcon& InfoBarDelegate::GetVectorIcon() const {
+  CR_DEFINE_STATIC_LOCAL(gfx::VectorIcon, empty_icon, ());
+  return empty_icon;
 }
 
 gfx::Image InfoBarDelegate::GetIcon() const {
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
-  gfx::VectorIconId vector_id = GetVectorIconId();
-  if (vector_id != gfx::VectorIconId::VECTOR_ICON_NONE) {
-    return gfx::Image(gfx::CreateVectorIcon(vector_id, 16,
+  const gfx::VectorIcon& vector_icon = GetVectorIcon();
+  if (!vector_icon.is_empty()) {
+    return gfx::Image(gfx::CreateVectorIcon(vector_icon, 16,
                                             GetInfoBarType() == WARNING_TYPE
                                                 ? SkColorSetRGB(0xFF, 0x67, 0)
                                                 : gfx::kGoogleBlue500));
   }
 #endif
 
   int icon_id = GetIconId();
   return icon_id == kNoIconID ? gfx::Image() :
       ResourceBundle::GetSharedInstance().GetNativeImageNamed(icon_id);
 }
@@ skipping 79 matching lines @@
 offline_pages::OfflinePageInfoBarDelegate*
 InfoBarDelegate::AsOfflinePageInfoBarDelegate() {
   return nullptr;
 }
 #endif
 
 InfoBarDelegate::InfoBarDelegate() : nav_entry_id_(0) {
 }
 
 }  // namespace infobars