[UI Views] Don't allow a ButtonListener and a MenuButtonListener

Step 1 in simplifying our button listener logic (and hopefully removing
MenuButtonListener) - ensure each button has at most one listener.

BUG=585252

Review URL: https://codereview.chromium.org/1682603002

Cr-Commit-Position: refs/heads/master@{#374462}

21 files changed, 39 insertions, 120 deletions

diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
index 599048c..e1f2074 100644
--- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
+++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
@@ -612,7 +612,7 @@ bool AutofillDialogViews::SectionContainer::ShouldForwardEvent(
 
 AutofillDialogViews::SuggestedButton::SuggestedButton(
     views::MenuButtonListener* listener)
-    : views::MenuButton(NULL, base::string16(), listener, false) {
+    : views::MenuButton(base::string16(), listener, false) {
   const int kFocusBorderWidth = 1;
   SetBorder(views::Border::CreateEmptyBorder(kMenuButtonTopInset,
                                              kFocusBorderWidth,
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index a850bcc..ec2166d 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -161,9 +161,6 @@ static const int kSeparatorStartX = 2;
 // Left-padding for the instructional text.
 static const int kInstructionsPadding = 6;
 
-// Tag for the 'Other bookmarks' button.
-static const int kOtherFolderButtonTag = 1;
-
 // Tag for the 'Apps Shortcut' button.
 static const int kAppsShortcutButtonTag = 2;
 
@@ -171,11 +168,6 @@ static const int kAppsShortcutButtonTag = 2;
 static const int kButtonPaddingHorizontal = 6;
 static const int kButtonPaddingVertical = 4;
 
-// Tag for the 'Managed bookmarks' button.
-static const int kManagedFolderButtonTag = 3;
-// Tag for the 'Supervised bookmarks' button.
-static const int kSupervisedFolderButtonTag = 4;
-
 static const gfx::ElideBehavior kElideBehavior = gfx::FADE_TAIL;
 
 namespace {
@@ -302,11 +294,10 @@ const char ShortcutButton::kViewClassName[] = "ShortcutButton";
 // button.
 class BookmarkFolderButton : public views::MenuButton {
  public:
-  BookmarkFolderButton(views::ButtonListener* listener,
-                       const base::string16& title,
+  BookmarkFolderButton(const base::string16& title,
                        views::MenuButtonListener* menu_button_listener,
                        bool show_menu_marker)
-      : MenuButton(listener, title, menu_button_listener, show_menu_marker) {
+      : MenuButton(title, menu_button_listener, show_menu_marker) {
     SetElideBehavior(kElideBehavior);
     show_animation_.reset(new gfx::SlideAnimation(this));
     if (!animations_enabled) {
@@ -350,7 +341,7 @@ class BookmarkFolderButton : public views::MenuButton {
 class OverflowButton : public views::MenuButton {
  public:
   explicit OverflowButton(BookmarkBarView* owner)
-      : MenuButton(NULL, base::string16(), owner, false), owner_(owner) {}
+      : MenuButton(base::string16(), owner, false), owner_(owner) {}
 
   bool OnMousePressed(const ui::MouseEvent& e) override {
     owner_->StopThrobbing(true);
@@ -1461,18 +1452,9 @@ void BookmarkBarView::ButtonPressed(views::Button* sender,
     return;
   }
 
-  const BookmarkNode* node;
-  if (sender->tag() == kOtherFolderButtonTag) {
-    node = model_->other_node();
-  } else if (sender->tag() == kManagedFolderButtonTag) {
-    node = managed_->managed_node();
-  } else if (sender->tag() == kSupervisedFolderButtonTag) {
-    node = managed_->supervised_node();
-  } else {
-    int index = GetIndexOf(sender);
-    DCHECK_NE(-1, index);
-    node = model_->bookmark_bar_node()->GetChild(index);
-  }
+  int index = GetIndexOf(sender);
+  DCHECK_NE(-1, index);
+  const BookmarkNode* node = model_->bookmark_bar_node()->GetChild(index);
   DCHECK(page_navigator_);
 
   if (node->is_url()) {
@@ -1627,31 +1609,25 @@ int BookmarkBarView::GetFirstHiddenNodeIndex() {
 
 MenuButton* BookmarkBarView::CreateOtherBookmarksButton() {
   // Title is set in Loaded.
-  MenuButton* button =
-      new BookmarkFolderButton(this, base::string16(), this, false);
+  MenuButton* button = new BookmarkFolderButton(base::string16(), this, false);
   button->set_id(VIEW_ID_OTHER_BOOKMARKS);
   button->set_context_menu_controller(this);
-  button->set_tag(kOtherFolderButtonTag);
   return button;
 }
 
 MenuButton* BookmarkBarView::CreateManagedBookmarksButton() {
   // Title is set in Loaded.
-  MenuButton* button =
-      new BookmarkFolderButton(this, base::string16(), this, false);
+  MenuButton* button = new BookmarkFolderButton(base::string16(), this, false);
   button->set_id(VIEW_ID_MANAGED_BOOKMARKS);
   button->set_context_menu_controller(this);
-  button->set_tag(kManagedFolderButtonTag);
   return button;
 }
 
 MenuButton* BookmarkBarView::CreateSupervisedBookmarksButton() {
   // Title is set in Loaded.
-  MenuButton* button =
-      new BookmarkFolderButton(this, base::string16(), this, false);
+  MenuButton* button = new BookmarkFolderButton(base::string16(), this, false);
   button->set_id(VIEW_ID_SUPERVISED_BOOKMARKS);
   button->set_context_menu_controller(this);
-  button->set_tag(kSupervisedFolderButtonTag);
   return button;
 }
 
@@ -1683,7 +1659,7 @@ views::View* BookmarkBarView::CreateBookmarkButton(const BookmarkNode* node) {
     return button;
   }
   views::MenuButton* button =
-      new BookmarkFolderButton(this, node->GetTitle(), this, false);
+      new BookmarkFolderButton(node->GetTitle(), this, false);
   ConfigureButton(node, button);
   return button;
 }
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index ec5883a..40544c4 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -304,8 +304,7 @@ void ContentSettingBubbleContents::Init() {
       label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
       views::MenuButton* menu_button = new views::MenuButton(
-          NULL, base::UTF8ToUTF16((i->second.selected_device.name)),
-          this, true);
+          base::UTF8ToUTF16((i->second.selected_device.name)), this, true);
       menu_button->SetStyle(views::Button::STYLE_BUTTON);
       menu_button->SetHorizontalAlignment(gfx::ALIGN_LEFT);
       menu_button->set_animate_on_state_change(false);
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
index 4a2b928..77c6671 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
@@ -167,7 +167,7 @@ class OpaqueBrowserFrameViewLayoutTest : public views::ViewsTestBase {
 
   void AddNewAvatarButton() {
     new_avatar_button_ =
-        new views::MenuButton(nullptr, base::string16(), nullptr, false);
+        new views::MenuButton(base::string16(), nullptr, false);
     new_avatar_button_->set_id(VIEW_ID_NEW_AVATAR_BUTTON);
     root_view_->AddChildView(new_avatar_button_);
     delegate_->set_show_avatar(true);
diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc
index f5fada0..78ff30c 100644
--- a/chrome/browser/ui/views/menu_model_adapter_test.cc
+++ b/chrome/browser/ui/views/menu_model_adapter_test.cc
@@ -170,8 +170,8 @@ class MenuModelAdapterTest : public ViewEventTestBase,
   // ViewEventTestBase implementation.
 
   void SetUp() override {
-    button_ = new views::MenuButton(
-        NULL, base::ASCIIToUTF16("Menu Adapter Test"), this, true);
+    button_ = new views::MenuButton(base::ASCIIToUTF16("Menu Adapter Test"),
+                                    this, true);
 
     menu_ = menu_model_adapter_.CreateMenu();
     menu_runner_.reset(
diff --git a/chrome/browser/ui/views/menu_test_base.cc b/chrome/browser/ui/views/menu_test_base.cc
index 5874c75..6b21115 100644
--- a/chrome/browser/ui/views/menu_test_base.cc
+++ b/chrome/browser/ui/views/menu_test_base.cc
@@ -42,8 +42,7 @@ int MenuTestBase::GetMenuRunnerFlags() {
 }
 
 void MenuTestBase::SetUp() {
-  button_ = new views::MenuButton(
-      NULL, base::ASCIIToUTF16("Menu Test"), this, true);
+  button_ = new views::MenuButton(base::ASCIIToUTF16("Menu Test"), this, true);
   menu_ = new views::MenuItemView(this);
   BuildMenu(menu_);
   menu_runner_.reset(new views::MenuRunner(menu_, GetMenuRunnerFlags()));
diff --git a/chrome/browser/ui/views/profiles/avatar_menu_button.cc b/chrome/browser/ui/views/profiles/avatar_menu_button.cc
index 786e83d..a558853 100644
--- a/chrome/browser/ui/views/profiles/avatar_menu_button.cc
+++ b/chrome/browser/ui/views/profiles/avatar_menu_button.cc
@@ -37,7 +37,7 @@ static inline int Round(double x) {
 const char AvatarMenuButton::kViewClassName[] = "AvatarMenuButton";
 
 AvatarMenuButton::AvatarMenuButton(BrowserView* browser_view)
-    : MenuButton(NULL, base::string16(), this, false),
+    : MenuButton(base::string16(), this, false),
       browser_view_(browser_view),
       enabled_(browser_view_->IsRegularOrGuestSession()),
       is_rectangle_(false),
diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc
index 1666161..d249e5c 100644
--- a/chrome/browser/ui/views/tab_icon_view.cc
+++ b/chrome/browser/ui/views/tab_icon_view.cc
@@ -57,7 +57,7 @@ void TabIconView::InitializeIfNeeded() {
 
 TabIconView::TabIconView(TabIconViewModel* model,
                          views::MenuButtonListener* listener)
-    : views::MenuButton(NULL, base::string16(), listener, false),
+    : views::MenuButton(base::string16(), listener, false),
       model_(model),
       is_light_(false) {
   InitializeIfNeeded();
diff --git a/chrome/browser/ui/views/toolbar/app_menu_button.cc b/chrome/browser/ui/views/toolbar/app_menu_button.cc
index a277f24..7865760 100644
--- a/chrome/browser/ui/views/toolbar/app_menu_button.cc
+++ b/chrome/browser/ui/views/toolbar/app_menu_button.cc
@@ -35,12 +35,11 @@
 bool AppMenuButton::g_open_app_immediately_for_testing = false;
 
 AppMenuButton::AppMenuButton(ToolbarView* toolbar_view)
-    : views::MenuButton(NULL, base::string16(), toolbar_view, false),
+    : views::MenuButton(base::string16(), toolbar_view, false),
       severity_(AppMenuIconPainter::SEVERITY_NONE),
       toolbar_view_(toolbar_view),
       allow_extension_dragging_(
-          extensions::FeatureSwitch::extension_action_redesign()
-              ->IsEnabled()),
+          extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()),
       destroyed_(nullptr),
       margin_trailing_(0),
       ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)),
diff --git a/chrome/browser/ui/views/toolbar/chevron_menu_button.cc b/chrome/browser/ui/views/toolbar/chevron_menu_button.cc
index baa9e13..63221b1 100644
--- a/chrome/browser/ui/views/toolbar/chevron_menu_button.cc
+++ b/chrome/browser/ui/views/toolbar/chevron_menu_button.cc
@@ -361,7 +361,7 @@ size_t ChevronMenuButton::MenuController::IndexForId(int id) const {
 
 ChevronMenuButton::ChevronMenuButton(
     BrowserActionsContainer* browser_actions_container)
-    : views::MenuButton(NULL, base::string16(), this, false),
+    : views::MenuButton(base::string16(), this, false),
       browser_actions_container_(browser_actions_container),
       weak_factory_(this) {
   // Set the border explicitly, because otherwise the native theme manager takes
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
index 5ac1202..0b91a5d 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
@@ -53,7 +53,7 @@ ToolbarActionView::ContextMenuCallback* context_menu_callback_for_test =
 ToolbarActionView::ToolbarActionView(
     ToolbarActionViewController* view_controller,
     ToolbarActionView::Delegate* delegate)
-    : MenuButton(nullptr, base::string16(), this, false),
+    : MenuButton(base::string16(), this, false),
       view_controller_(view_controller),
       delegate_(delegate),
       called_register_command_(false),
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc
index d28937e..bf034bf 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc
@@ -218,7 +218,7 @@ TEST_F(ToolbarActionViewUnitTest, BasicToolbarActionViewTest) {
   EXPECT_FALSE(view.wants_to_run_for_testing());
 
   // Create an overflow button.
-  views::MenuButton overflow_button(nullptr, base::string16(), nullptr, false);
+  views::MenuButton overflow_button(base::string16(), nullptr, false);
   overflow_button.set_owned_by_client();
   action_view_delegate.set_overflow_reference_view(&overflow_button);
 
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.cc b/chrome/browser/ui/views/website_settings/permission_selector_view.cc
index 0a47968..ddbcdf9 100644
--- a/chrome/browser/ui/views/website_settings/permission_selector_view.cc
+++ b/chrome/browser/ui/views/website_settings/permission_selector_view.cc
@@ -62,8 +62,7 @@ class PermissionMenuButton : public views::MenuButton,
 PermissionMenuButton::PermissionMenuButton(const base::string16& text,
                                            PermissionMenuModel* model,
                                            bool show_menu_marker)
-    : MenuButton(NULL, text, this, show_menu_marker),
-      menu_model_(model) {
+    : MenuButton(text, this, show_menu_marker), menu_model_(model) {
   // Update the themed border before the NativeTheme is applied. Usually this
   // happens in a call to LabelButton::OnNativeThemeChanged(). However, if
   // PermissionMenuButton called that from its override, the NativeTheme would
diff --git a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc
index 451cda3..547bc74 100644
--- a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc
+++ b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc
@@ -101,7 +101,7 @@ PermissionCombobox::PermissionCombobox(Listener* listener,
                                        int index,
                                        const GURL& url,
                                        ContentSetting setting)
-    : MenuButton(nullptr, base::string16(), this, true),
+    : MenuButton(base::string16(), this, true),
       index_(index),
       listener_(listener),
       model_(new PermissionMenuModel(
diff --git a/ui/app_list/views/search_box_view.cc b/ui/app_list/views/search_box_view.cc
index d59bf54..1441d6c 100644
--- a/ui/app_list/views/search_box_view.cc
+++ b/ui/app_list/views/search_box_view.cc
@@ -172,7 +172,7 @@ SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
 
 #if !defined(OS_CHROMEOS)
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  menu_button_ = new views::MenuButton(NULL, base::string16(), this, false);
+  menu_button_ = new views::MenuButton(base::string16(), this, false);
   menu_button_->SetBorder(views::Border::NullBorder());
   menu_button_->SetImage(views::Button::STATE_NORMAL,
                          *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_NORMAL));
diff --git a/ui/message_center/views/notifier_settings_view.cc b/ui/message_center/views/notifier_settings_view.cc
index 145512d..dc54bcf 100644
--- a/ui/message_center/views/notifier_settings_view.cc
+++ b/ui/message_center/views/notifier_settings_view.cc
@@ -578,7 +578,7 @@ void NotifierSettingsView::UpdateContentsView(
     base::string16 notifier_group_text = active_group.login_info.empty() ?
         active_group.name : active_group.login_info;
     notifier_group_selector_ =
-        new views::MenuButton(NULL, notifier_group_text, this, true);
+        new views::MenuButton(notifier_group_text, this, true);
     notifier_group_selector_->SetBorder(scoped_ptr<views::Border>(
         new views::LabelButtonAssetBorder(views::Button::STYLE_BUTTON)));
     notifier_group_selector_->SetFocusPainter(nullptr);
diff --git a/ui/views/controls/button/custom_button_unittest.cc b/ui/views/controls/button/custom_button_unittest.cc
index 0ff9f95..36482a6 100644
--- a/ui/views/controls/button/custom_button_unittest.cc
+++ b/ui/views/controls/button/custom_button_unittest.cc
@@ -425,7 +425,7 @@ TEST_F(CustomButtonTest, AsCustomButton) {
   RadioButton radio_button(text, 0);
   EXPECT_TRUE(CustomButton::AsCustomButton(&radio_button));
 
-  MenuButton menu_button(NULL, text, NULL, false);
+  MenuButton menu_button(text, NULL, false);
   EXPECT_TRUE(CustomButton::AsCustomButton(&menu_button));
 
   Label label;
diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc
index c7a5338..2764c77 100644
--- a/ui/views/controls/button/menu_button.cc
+++ b/ui/views/controls/button/menu_button.cc
@@ -62,16 +62,16 @@ MenuButton::PressedLock::~PressedLock() {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-MenuButton::MenuButton(ButtonListener* listener,
-                       const base::string16& text,
+MenuButton::MenuButton(const base::string16& text,
                        MenuButtonListener* menu_button_listener,
                        bool show_menu_marker)
-    : LabelButton(listener, text),
+    : LabelButton(nullptr, text),
       menu_offset_(kDefaultMenuOffsetX, kDefaultMenuOffsetY),
       listener_(menu_button_listener),
       show_menu_marker_(show_menu_marker),
-      menu_marker_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-          IDR_MENU_DROPARROW).ToImageSkia()),
+      menu_marker_(ui::ResourceBundle::GetSharedInstance()
+                       .GetImageNamed(IDR_MENU_DROPARROW)
+                       .ToImageSkia()),
       destroyed_flag_(NULL),
       pressed_lock_count_(0),
       should_disable_after_press_(false),
diff --git a/ui/views/controls/button/menu_button.h b/ui/views/controls/button/menu_button.h
index 94c209b..c320221 100644
--- a/ui/views/controls/button/menu_button.h
+++ b/ui/views/controls/button/menu_button.h
@@ -47,8 +47,7 @@ class VIEWS_EXPORT MenuButton : public LabelButton {
   static const int kMenuMarkerPaddingRight;
 
   // Create a Button.
-  MenuButton(ButtonListener* listener,
-             const base::string16& text,
+  MenuButton(const base::string16& text,
              MenuButtonListener* menu_button_listener,
              bool show_menu_marker);
   ~MenuButton() override;
diff --git a/ui/views/controls/button/menu_button_unittest.cc b/ui/views/controls/button/menu_button_unittest.cc
index 8d554c9..a260d16 100644
--- a/ui/views/controls/button/menu_button_unittest.cc
+++ b/ui/views/controls/button/menu_button_unittest.cc
@@ -41,30 +41,22 @@ class MenuButtonTest : public ViewsTestBase {
 
  protected:
   // Creates a MenuButton with no button listener.
-  void CreateMenuButtonWithNoListener() { CreateMenuButton(nullptr, nullptr); }
-
-  // Creates a MenuButton with a ButtonListener. In this case, the MenuButton
-  // acts like a regular button.
-  void CreateMenuButtonWithButtonListener(ButtonListener* button_listener) {
-    CreateMenuButton(button_listener, nullptr);
-  }
+  void CreateMenuButtonWithNoListener() { CreateMenuButton(nullptr); }
 
   // Creates a MenuButton with a MenuButtonListener. In this case, when the
   // MenuButton is pushed, it notifies the MenuButtonListener to open a
   // drop-down menu.
   void CreateMenuButtonWithMenuButtonListener(
       MenuButtonListener* menu_button_listener) {
-    CreateMenuButton(nullptr, menu_button_listener);
+    CreateMenuButton(menu_button_listener);
   }
 
  private:
-  void CreateMenuButton(ButtonListener* button_listener,
-                        MenuButtonListener* menu_button_listener) {
+  void CreateMenuButton(MenuButtonListener* menu_button_listener) {
     CreateWidget();
 
     const base::string16 label(ASCIIToUTF16("button"));
-    button_ =
-        new MenuButton(button_listener, label, menu_button_listener, false);
+    button_ = new MenuButton(label, menu_button_listener, false);
     button_->SetBoundsRect(gfx::Rect(0, 0, 200, 20));
     widget_->SetContentsView(button_);
 
@@ -268,24 +260,6 @@ class TestShowSiblingButtonListener : public MenuButtonListener {
   DISALLOW_COPY_AND_ASSIGN(TestShowSiblingButtonListener);
 };
 
-// Tests if the listener is notified correctly, when a mouse click happens on a
-// MenuButton that has a regular ButtonListener.
-TEST_F(MenuButtonTest, ActivateNonDropDownOnMouseClick) {
-  TestButtonListener button_listener;
-  CreateMenuButtonWithButtonListener(&button_listener);
-
-  ui::test::EventGenerator generator(GetContext(), widget()->GetNativeWindow());
-
-  generator.set_current_location(gfx::Point(10, 10));
-  generator.ClickLeftButton();
-
-  // Check that MenuButton has notified the listener on mouse-released event,
-  // while it was in hovered state.
-  EXPECT_EQ(button(), button_listener.last_sender());
-  EXPECT_EQ(ui::ET_MOUSE_RELEASED, button_listener.last_event_type());
-  EXPECT_EQ(Button::STATE_HOVERED, button_listener.last_sender_state());
-}
-
 // Tests if the listener is notified correctly when a mouse click happens on a
 // MenuButton that has a MenuButtonListener.
 TEST_F(MenuButtonTest, ActivateDropDownOnMouseClick) {
@@ -424,31 +398,6 @@ TEST_F(MenuButtonTest, DraggableMenuButtonDoesNotActivateOnDrag) {
 #if !defined(OS_MACOSX) || defined(USE_AURA)
 
 // Tests if the listener is notified correctly when a gesture tap happens on a
-// MenuButton that has a regular ButtonListener.
-TEST_F(MenuButtonTest, ActivateNonDropDownOnGestureTap) {
-  TestButtonListener button_listener;
-  CreateMenuButtonWithButtonListener(&button_listener);
-
-  ui::test::EventGenerator generator(GetContext(), widget()->GetNativeWindow());
-
-  // Move the mouse outside the menu button so that it doesn't impact the
-  // button state.
-  generator.MoveMouseTo(400, 400);
-  EXPECT_FALSE(button()->IsMouseHovered());
-
-  generator.GestureTapAt(gfx::Point(10, 10));
-
-  // Check that MenuButton has notified the listener on gesture tap event, while
-  // it was in hovered state.
-  EXPECT_EQ(button(), button_listener.last_sender());
-  EXPECT_EQ(ui::ET_GESTURE_TAP, button_listener.last_event_type());
-  EXPECT_EQ(Button::STATE_HOVERED, button_listener.last_sender_state());
-
-  // The button should go back to it's normal state since the gesture ended.
-  EXPECT_EQ(Button::STATE_NORMAL, button()->state());
-}
-
-// Tests if the listener is notified correctly when a gesture tap happens on a
 // MenuButton that has a MenuButtonListener.
 TEST_F(MenuButtonTest, ActivateDropDownOnGestureTap) {
   TestMenuButtonListener menu_button_listener;
diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc
index effa3e7..c04ce6b9 100644
--- a/ui/views/examples/menu_example.cc
+++ b/ui/views/examples/menu_example.cc
@@ -178,8 +178,7 @@ void ExampleMenuModel::ExecuteCommand(int command_id, int event_flags) {
 // ExampleMenuButton -----------------------------------------------------------
 
 ExampleMenuButton::ExampleMenuButton(const base::string16& test)
-    : MenuButton(NULL, test, this, true) {
-}
+    : MenuButton(test, this, true) {}
 
 ExampleMenuButton::~ExampleMenuButton() {
 }