Changes views_aura_mus_unittests to create DesktopNativeWidgetAura

ui/views/controls/menu/menu_runner_unittest.cc

 // Copyright 2015 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/menu/menu_runner.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 87 matching lines @@
   EXPECT_FALSE(runner->IsRunning());
   TestMenuDelegate* delegate = menu_delegate();
   EXPECT_EQ(1, delegate->on_menu_closed_called());
   EXPECT_EQ(nullptr, delegate->on_menu_closed_menu());
   EXPECT_EQ(MenuRunner::NORMAL_EXIT, delegate->on_menu_closed_run_result());
 }
 
 // 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(
       owner(), nullptr, gfx::Rect(), MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_NONE);
   EXPECT_EQ(MenuRunner::NORMAL_EXIT, result);
   EXPECT_TRUE(runner->IsRunning());
 
   ui::test::EventGenerator generator(GetContext(), owner()->GetNativeWindow());
   generator.PressKey(ui::VKEY_ESCAPE, 0);
   EXPECT_FALSE(runner->IsRunning());
   TestMenuDelegate* delegate = menu_delegate();
   EXPECT_EQ(1, delegate->on_menu_closed_called());
   EXPECT_EQ(nullptr, delegate->on_menu_closed_menu());
   EXPECT_EQ(MenuRunner::NORMAL_EXIT, delegate->on_menu_closed_run_result());
 }
 
 // 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(
       owner(), nullptr, gfx::Rect(), MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_NONE);
   EXPECT_EQ(MenuRunner::NORMAL_EXIT, result);
   EXPECT_TRUE(runner->IsRunning());
 
   ui::test::EventGenerator generator(GetContext(), owner()->GetNativeWindow());
   generator.PressKey(ui::VKEY_O, 0);
   EXPECT_FALSE(runner->IsRunning());
   TestMenuDelegate* delegate = menu_delegate();
   EXPECT_EQ(1, delegate->execute_command_id());
   EXPECT_EQ(1, delegate->on_menu_closed_called());
   EXPECT_NE(nullptr, delegate->on_menu_closed_menu());
   EXPECT_EQ(MenuRunner::NORMAL_EXIT, delegate->on_menu_closed_run_result());
 }
 
 // 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(
       owner(), nullptr, gfx::Rect(), MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_NONE);
   EXPECT_EQ(MenuRunner::NORMAL_EXIT, result);
   EXPECT_TRUE(runner->IsRunning());
 
   ui::test::EventGenerator generator(GetContext(), owner()->GetNativeWindow());
   ui::KeyEvent key_press(0x062f, ui::VKEY_N, 0);
   generator.Dispatch(&key_press);
@@ skipping 62 matching lines @@
 class MenuRunnerWidgetTest : public MenuRunnerTest {
  public:
   MenuRunnerWidgetTest() {}
 
   Widget* widget() { return widget_; }
   EventCountView* event_count_view() { return event_count_view_; }
 
   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());
   }
 
   void AddMenuLauncherEventHandler(Widget* widget) {
     consumer_ =
         base::MakeUnique<MenuLauncherEventHandler>(menu_runner(), widget);
     event_count_view_->AddPostTargetHandler(consumer_.get());
   }
 
   // ViewsTestBase:
@@ skipping 115 matching lines @@
   menu_runner->OnMenuClosed(internal::MenuControllerDelegate::NOTIFY_DELEGATE,
                             nullptr, 0);
 
   // This should not access the destroyed MenuController
   menu_runner2->Release();
   menu_runner->Release();
 }
 
 }  // namespace test
 }  // namespace views