Changes views_aura_mus_unittests to create DesktopNativeWidgetAura

ui/views/controls/button/menu_button_unittest.cc

 // Copyright 2014 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 "ui/views/controls/button/menu_button.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 327 matching lines @@
   EXPECT_EQ(button(), menu_button_listener.last_source());
   EXPECT_EQ(Button::STATE_HOVERED, menu_button_listener.last_source_state());
 }
 
 // Test that the MenuButton stays pressed while there are any PressedLocks.
 TEST_F(MenuButtonTest, ButtonStateForMenuButtonsWithPressedLocks) {
   // Hovered-state is not updated under mus when EventGenerator send a
   // mouse-move event. https://crbug.com/615033
   if (IsMus())
     return;
+
+  // Similarly for aura-mus-client the location of the cursor is not updated by
+  // EventGenerator so that IsMouseHovered() checks the wrong thing.
+  // https://crbug.com/615033.
+  if (IsAuraMusClient())
+    return;
+
   CreateMenuButtonWithNoListener();
 
   // Move the mouse over the button; the button should be in a hovered state.
   generator()->MoveMouseTo(gfx::Point(10, 10));
   EXPECT_EQ(Button::STATE_HOVERED, button()->state());
 
   // Introduce a PressedLock, which should make the button pressed.
   std::unique_ptr<MenuButton::PressedLock> pressed_lock1(
       new MenuButton::PressedLock(button()));
   EXPECT_EQ(Button::STATE_PRESSED, button()->state());
@@ skipping 172 matching lines @@
 
 #if defined(USE_AURA)
 
 // Tests that the MenuButton does not become pressed if it can be dragged, and a
 // DragDropClient is processing the events.
 TEST_F(MenuButtonTest, DraggableMenuButtonDoesNotActivateOnDrag) {
   // The test uses drag-n-drop, which isn't yet supported on mus.
   // https://crbug.com/614037.
   if (IsMus())
     return;
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
   TestMenuButtonListener menu_button_listener;
   CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
   TestDragController drag_controller;
   button()->set_drag_controller(&drag_controller);
 
   TestDragDropClient drag_client;
   SetDragDropClient(GetContext(), &drag_client);
   button()->PrependPreTargetHandler(&drag_client);
 
   generator()->DragMouseBy(10, 0);
   EXPECT_EQ(nullptr, menu_button_listener.last_source());
   EXPECT_EQ(Button::STATE_NORMAL, menu_button_listener.last_source_state());
 }
 
 #endif  // USE_AURA
 
 // No touch on desktop Mac. Tracked in http://crbug.com/445520.
 #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 MenuButtonListener.
 TEST_F(MenuButtonTest, ActivateDropDownOnGestureTap) {
   // Hovered-state is not updated under mus when EventGenerator send a
   // mouse-move event. https://crbug.com/615033
   if (IsMus())
     return;
+  // Similarly for aura-mus-client the location of the cursor is not updated by
+  // EventGenerator so that IsMouseHovered() checks the wrong thing.
+  // https://crbug.com/615033.
+  if (IsAuraMusClient())
+    return;
   TestMenuButtonListener menu_button_listener;
   CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
 
   // 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));
 
@@ skipping 28 matching lines @@
 
   generator()->MoveTouch(gfx::Point(10, 30));
   generator()->ReleaseTouch();
   EXPECT_EQ(Button::STATE_NORMAL, button()->state());
   EXPECT_EQ(nullptr, menu_button_listener.last_source());
 }
 
 #endif  // !defined(OS_MACOSX) || defined(USE_AURA)
 
 }  // namespace views