Move around more vector icons.

components/toolbar/toolbar_model.h

Index: components/toolbar/toolbar_model.h
diff --git a/components/toolbar/toolbar_model.h b/components/toolbar/toolbar_model.h
index c8df6c632bff755e3332ee1054c94e04af87b8c2..8aa1727dc91d215a6f53a09f323d09b578e8dc11 100644
--- a/components/toolbar/toolbar_model.h
+++ b/components/toolbar/toolbar_model.h
@@ -15,7 +15,7 @@
 #include "url/gurl.h"
 
 namespace gfx {
-enum class VectorIconId;
+struct VectorIcon;
 }
 
 // This class is the model used by the toolbar, location bar and autocomplete
@@ -47,7 +47,7 @@ class ToolbarModel {
   // current URL.  When search term replacement is active, this returns a search
   // icon.  This doesn't cover specialized icons while the user is editing; see
   // OmniboxView::GetVectorIcon().
-  virtual gfx::VectorIconId GetVectorIcon() const = 0;
+  virtual const gfx::VectorIcon& GetVectorIcon() const = 0;
 
   // Returns text for the omnibox secure verbose chip.
   virtual base::string16 GetSecureVerboseText() const = 0;