[reland] views: Move MenuButton from TextButton to LabelButton.

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 cd5da729fc2dd5f3a44d56c1e75a7e5fa3da9f37..3874c8ab05ad4b8eca38755df98d27469eb25e6c 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.cc
+++ b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -23,6 +23,7 @@
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/menu_button.h"
+#include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
@@ -129,8 +130,8 @@ views::MenuButton* InfoBarView::CreateMenuButton(
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   menu_button->set_menu_marker(
       rb.GetImageNamed(IDR_INFOBARBUTTON_MENU_DROPARROW).ToImageSkia());
-  menu_button->SetEnabledColor(SK_ColorBLACK);
-  menu_button->SetHoverColor(SK_ColorBLACK);
+  menu_button->SetTextColor(views::Button::STATE_NORMAL, SK_ColorBLACK);
+  menu_button->SetTextColor(views::Button::STATE_HOVERED, SK_ColorBLACK);
   menu_button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
   menu_button->SizeToPreferredSize();
   menu_button->SetFocusable(true);