Update infobars to use VectorIcon struct instead of VectorIconId.

components/infobars/core/infobar_delegate.h

 // 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.
 
 #ifndef COMPONENTS_INFOBARS_CORE_INFOBAR_DELEGATE_H_
 #define COMPONENTS_INFOBARS_CORE_INFOBAR_DELEGATE_H_
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
@@ skipping 18 matching lines @@
 class OfflinePageInfoBarDelegate;
 }
 #endif
 
 namespace translate {
 class TranslateInfoBarDelegate;
 }
 
 namespace gfx {
 class Image;
-enum class VectorIconId;
+struct VectorIcon;
 }
 
 namespace infobars {
 
 class InfoBar;
 
 // An interface implemented by objects wishing to control an InfoBar.
 // Implementing this interface is not sufficient to use an InfoBar, since it
 // does not map to a specific InfoBar type. Instead, you must implement
 // ConfirmInfoBarDelegate, or override with your own delegate for your own
@@ skipping 129 matching lines @@
 
   virtual InfoBarAutomationType GetInfoBarAutomationType() const;
 
   // Returns the resource ID of the icon to be shown for this InfoBar.  If the
   // value is equal to |kNoIconID|, GetIcon() will not show an icon by default.
   virtual int GetIconId() const;
 
   // Returns the vector icon identifier to be shown for this InfoBar. This will
   // take precedence over GetIconId() (although typically only one of the two
   // should be defined for any given infobar).
-  virtual gfx::VectorIconId GetVectorIconId() const;
+  virtual const gfx::VectorIcon& GetVectorIcon() const;
 
   // Returns the icon to be shown for this InfoBar. If the returned Image is
   // empty, no icon is shown.
   //
   // Most subclasses should not override this; override GetIconId() instead
   // unless the infobar needs to show an image from somewhere other than the
   // resource bundle as its icon.
   virtual gfx::Image GetIcon() const;
 
   // Returns true if the supplied |delegate| is equal to this one. Equality is
@@ skipping 48 matching lines @@
 
   // The ID of the active navigation entry at the time we became owned.
   int nav_entry_id_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarDelegate);
 };
 
 }  // namespace infobars
 
 #endif  // COMPONENTS_INFOBARS_CORE_INFOBAR_DELEGATE_H_