Update infobars to use VectorIcon struct instead of VectorIconId.

chrome/browser/ui/startup/default_browser_infobar_delegate.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/startup/default_browser_infobar_delegate.h"
 
 #include <memory>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/ui/startup/default_browser_prompt.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace chrome {
 
 bool IsStickyDefaultBrowserPromptEnabled() {
 #if defined(OS_WIN)
   // The flow to set the default browser is only asynchronous on Windows 10+.
@@ skipping 43 matching lines @@
 infobars::InfoBarDelegate::Type DefaultBrowserInfoBarDelegate::GetInfoBarType()
     const {
   return PAGE_ACTION_TYPE;
 }
 
 infobars::InfoBarDelegate::InfoBarIdentifier
 DefaultBrowserInfoBarDelegate::GetIdentifier() const {
   return DEFAULT_BROWSER_INFOBAR_DELEGATE;
 }
 
-gfx::VectorIconId DefaultBrowserInfoBarDelegate::GetVectorIconId() const {
-  return gfx::VectorIconId::PRODUCT;
+const gfx::VectorIcon& DefaultBrowserInfoBarDelegate::GetVectorIcon() const {
+  return kProductIcon;
 }
 
 bool DefaultBrowserInfoBarDelegate::ShouldExpire(
     const NavigationDetails& details) const {
   return should_expire_ && ConfirmInfoBarDelegate::ShouldExpire(details);
 }
 
 void DefaultBrowserInfoBarDelegate::InfoBarDismissed() {
   action_taken_ = true;
   // |profile_| may be null in tests.
@@ skipping 59 matching lines @@
     const shell_integration::DefaultWebClientWorkerCallback& callback) {
   return new shell_integration::DefaultBrowserWorker(callback);
 }
 
 void DefaultBrowserInfoBarDelegate::OnSetAsDefaultFinished(
     shell_integration::DefaultWebClientState state) {
   infobar()->owner()->RemoveInfoBar(infobar());
 }
 
 }  // namespace chrome