Changes views_aura_mus_unittests to create DesktopNativeWidgetAura

ui/views/controls/menu/menu_runner_unittest.cc

Index: ui/views/controls/menu/menu_runner_unittest.cc
diff --git a/ui/views/controls/menu/menu_runner_unittest.cc b/ui/views/controls/menu/menu_runner_unittest.cc
index 516723a0d342b1863fc7f6610a2271f6766d5de6..923a6cd29c651c23dc0fb170743388f641891625 100644
--- a/ui/views/controls/menu/menu_runner_unittest.cc
+++ b/ui/views/controls/menu/menu_runner_unittest.cc
@@ -105,6 +105,11 @@ TEST_F(MenuRunnerTest, AsynchronousRun) {
 // Tests that when a menu is run asynchronously, key events are handled properly
 // by testing that Escape key closes the menu.
 TEST_F(MenuRunnerTest, AsynchronousKeyEventHandling) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   InitMenuRunner(MenuRunner::ASYNC);
   MenuRunner* runner = menu_runner();
   MenuRunner::RunResult result = runner->RunMenuAt(
@@ -124,6 +129,11 @@ TEST_F(MenuRunnerTest, AsynchronousKeyEventHandling) {
 // Tests that a key press on a US keyboard layout activates the correct menu
 // item.
 TEST_F(MenuRunnerTest, LatinMnemonic) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   InitMenuRunner(MenuRunner::ASYNC);
   MenuRunner* runner = menu_runner();
   MenuRunner::RunResult result = runner->RunMenuAt(
@@ -144,6 +154,11 @@ TEST_F(MenuRunnerTest, LatinMnemonic) {
 // Tests that a key press on a non-US keyboard layout activates the correct menu
 // item.
 TEST_F(MenuRunnerTest, NonLatinMnemonic) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   InitMenuRunner(MenuRunner::ASYNC);
   MenuRunner* runner = menu_runner();
   MenuRunner::RunResult result = runner->RunMenuAt(
@@ -226,7 +241,7 @@ class MenuRunnerWidgetTest : public MenuRunnerTest {
   std::unique_ptr<ui::test::EventGenerator> EventGeneratorForWidget(
       Widget* widget) {
     return base::MakeUnique<ui::test::EventGenerator>(
-        IsMus() ? widget->GetNativeWindow() : GetContext(),
+        IsMus() || IsAuraMusClient() ? widget->GetNativeWindow() : GetContext(),
         widget->GetNativeWindow());
   }