Replace ButtonDropDown menu implementation (Menu2) with MenuItemView.

views/view_unittest.cc

 // Copyright (c) 2011 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.
 
 #include <map>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/clipboard/clipboard.h"
@@ skipping 1395 matching lines @@
 // click events are processed and the listener gets the click)
 TEST_F(ButtonDropDownTest, RegularClickTest) {
   MouseEvent press_event(ui::ET_MOUSE_PRESSED, 1, 1, ui::EF_LEFT_BUTTON_DOWN);
   MouseEvent release_event(ui::ET_MOUSE_RELEASED, 1, 1,
                            ui::EF_LEFT_BUTTON_DOWN);
   button_as_view_->OnMousePressed(press_event);
   button_as_view_->OnMouseReleased(release_event);
   EXPECT_EQ(test_dialog_->last_pressed_button_, test_dialog_->button_drop_);
 }
 
-#if defined(OS_WIN)
-// Ensure that dragging downwards on the button shows the menu while keeping the
-// button depressed.
-TEST_F(ButtonDropDownTest, DragMenuTest) {
-  test_dialog_->last_pressed_button_ = NULL;
-  MouseEvent press_event(ui::ET_MOUSE_PRESSED, 1, 1, ui::EF_LEFT_BUTTON_DOWN);
-  MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, 1, 99, ui::EF_LEFT_BUTTON_DOWN);
-  test_dialog_->ExpectShowDropMenu();
-  button_as_view_->OnMousePressed(press_event);
-  button_as_view_->OnMouseDragged(drag_event);
-  // The button should not get a press event as a result of the drag. This would
-  // revert the button into an unpressed state while the menu is open.
-  EXPECT_TRUE(test_dialog_->last_pressed_button_ == NULL);
-}
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////
 // View hierarchy / Visibility changes
 ////////////////////////////////////////////////////////////////////////////////
 /*
 TEST_F(ViewTest, ChangeVisibility) {
 #if defined(OS_LINUX)
   // Make CRITICAL messages fatal
   // TODO(oshima): we probably should enable this for entire tests on linux.
   g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
 #endif
@@ skipping 564 matching lines @@
   EXPECT_TRUE(v2->Contains(v2));
   EXPECT_FALSE(v2->Contains(&v1));
   EXPECT_TRUE(v2->Contains(v3));
   EXPECT_FALSE(v3->Contains(NULL));
   EXPECT_TRUE(v3->Contains(v3));
   EXPECT_FALSE(v3->Contains(&v1));
   EXPECT_FALSE(v3->Contains(v2));
 }
 
 }  // namespace views