Add VectorIconButton functionality to ImageButton.

chrome/browser/ui/views/infobars/infobar_view.cc

Index: chrome/browser/ui/views/infobars/infobar_view.cc
diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc
index ad1f7073383ef63b5b1fda614939d4735f25e4ae..0a524b8f1c89581f28d9331ccba2c356c6877333 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.cc
+++ b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -26,11 +26,9 @@
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/vector_icons/vector_icons.h"
-#include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/button/menu_button.h"
-#include "ui/views/controls/button/vector_icon_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
@@ -165,8 +163,8 @@ void InfoBarView::ViewHierarchyChanged(
       child_container_->AddChildView(icon_);
     }
 
-    close_button_ = new views::VectorIconButton(this);
-    close_button_->SetIcon(ui::kCloseIcon);
+    close_button_ =
+        views::ImageButton::CreateDefaultVectorIconButton(ui::kCloseIcon, this);
     close_button_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
     close_button_->SetFocusForPlatform();
@@ -195,7 +193,7 @@ void InfoBarView::ButtonPressed(views::Button* sender,
   }
 }
 
-SkColor InfoBarView::GetVectorIconBaseColor() const {
+SkColor InfoBarView::GetVectorIconColor() const {
   return GetInfobarTextColor();
 }