| Index: ui/views/controls/menu/menu_controller_unittest.cc
|
| diff --git a/ui/views/controls/menu/menu_controller_unittest.cc b/ui/views/controls/menu/menu_controller_unittest.cc
|
| index de6b7ba27072d0d416a3a04b8ed885fba04eddf0..406e309cae0cd1666854f8dfebfce01a36f5e02c 100644
|
| --- a/ui/views/controls/menu/menu_controller_unittest.cc
|
| +++ b/ui/views/controls/menu/menu_controller_unittest.cc
|
| @@ -1426,6 +1426,10 @@ TEST_F(MenuControllerTest, RunWithoutWidgetDoesntCrash) {
|
| // MenuController becomes active, that the exiting of drag does not cause a
|
| // crash.
|
| TEST_F(MenuControllerTest, MenuControllerReplacedDuringDrag) {
|
| + // TODO: this test wedges with aura-mus-client. http://crbug.com/664280.
|
| + if (IsAuraMusClient())
|
| + return;
|
| +
|
| // This test creates two native widgets, but expects the child native widget
|
| // to be able to reach up and use the parent native widget's aura
|
| // objects. https://crbug.com/614037
|
| @@ -1445,6 +1449,10 @@ TEST_F(MenuControllerTest, MenuControllerReplacedDuringDrag) {
|
| // destroy the MenuController. On Windows and Linux this destruction also
|
| // destroys the Widget used for drag-and-drop, thereby ending the drag.
|
| TEST_F(MenuControllerTest, CancelAllDuringDrag) {
|
| + // TODO: this test wedges with aura-mus-client. http://crbug.com/664280.
|
| + if (IsAuraMusClient())
|
| + return;
|
| +
|
| // This test creates two native widgets, but expects the child native widget
|
| // to be able to reach up and use the parent native widget's aura
|
| // objects. https://crbug.com/614037
|
|
|