Remove Nested Message Loop from MenuController

ui/views/controls/menu/menu_controller_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/menu/menu_controller.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "ui/aura/scoped_window_targeter.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/null_event_targeter.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/controls/menu/menu_controller_delegate.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 #include "ui/views/controls/menu/menu_host.h"
 #include "ui/views/controls/menu/menu_host_root_view.h"
 #include "ui/views/controls/menu/menu_item_view.h"
-#include "ui/views/controls/menu/menu_message_loop.h"
 #include "ui/views/controls/menu/menu_scroll_view_container.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/test/menu_test_utils.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/root_view.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/scoped_window_targeter.h"
@@ skipping 106 matching lines @@
     }
   }
 
   int outstanding_touches() const { return outstanding_touches_; }
 
  private:
   int outstanding_touches_;
   DISALLOW_COPY_AND_ASSIGN(TestEventHandler);
 };
 
-// A wrapper around MenuMessageLoop that can be used to track whether a message
-// loop is running or not.
-class TestMenuMessageLoop : public MenuMessageLoop {
- public:
-  explicit TestMenuMessageLoop(std::unique_ptr<MenuMessageLoop> original);
-  ~TestMenuMessageLoop() override;
-
-  bool is_running() const { return is_running_; }
-
-  // MenuMessageLoop:
-  void QuitNow() override;
-
- private:
-  // MenuMessageLoop:
-  void Run() override;
-
-  std::unique_ptr<MenuMessageLoop> original_;
-  bool is_running_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestMenuMessageLoop);
-};
-
-TestMenuMessageLoop::TestMenuMessageLoop(
-    std::unique_ptr<MenuMessageLoop> original)
-    : original_(std::move(original)) {
-  DCHECK(original_);
-}
-
-TestMenuMessageLoop::~TestMenuMessageLoop() {}
-
-void TestMenuMessageLoop::Run() {
-  is_running_ = true;
-  original_->Run();
-}
-
-void TestMenuMessageLoop::QuitNow() {
-  is_running_ = false;
-  original_->QuitNow();
-}
-
 #if defined(USE_AURA)
 // A DragDropClient which does not trigger a nested message loop. Instead a
 // callback is triggered during StartDragAndDrop in order to allow testing.
 class TestDragDropClient : public aura::client::DragDropClient {
  public:
   explicit TestDragDropClient(const base::Closure& callback)
       : start_drag_and_drop_callback_(callback), drag_in_progress_(false) {}
   ~TestDragDropClient() override {}
 
   // aura::client::DragDropClient:
@@ skipping 104 matching lines @@
   }
 
   void ReleaseTouchId(int id) {
     event_generator_->ReleaseTouchId(id);
   }
 
   void PressKey(ui::KeyboardCode key_code) {
     event_generator_->PressKey(key_code, 0);
   }
 
-#if defined(OS_LINUX) && defined(USE_X11)
-  void TestEventTargeter() {
-    {
-      // With the |ui::NullEventTargeter| instantiated and assigned we expect
-      // the menu to not handle the key event.
-      aura::ScopedWindowTargeter scoped_targeter(
-          owner()->GetNativeWindow()->GetRootWindow(),
-          std::unique_ptr<ui::EventTargeter>(new ui::NullEventTargeter));
-      event_generator_->PressKey(ui::VKEY_ESCAPE, 0);
-      EXPECT_EQ(MenuController::EXIT_NONE, menu_exit_type());
-    }
-    // Now that the targeter has been destroyed, expect to exit the menu
-    // normally when hitting escape.
-    event_generator_->PressKey(ui::VKEY_ESCAPE, 0);
-    EXPECT_EQ(MenuController::EXIT_ALL, menu_exit_type());
-  }
-#endif  // defined(OS_LINUX) && defined(USE_X11
-
 #if defined(USE_AURA)
   // Verifies that a non-nested menu fully closes when receiving an escape key.
   void TestAsyncEscapeKey() {
     ui::KeyEvent event(ui::EventType::ET_KEY_PRESSED, ui::VKEY_ESCAPE, 0);
     menu_controller_->OnWillDispatchKeyEvent(&event);
   }
 
   // Verifies that an open menu receives a cancel event, and closes.
   void TestCancelEvent() {
     EXPECT_EQ(MenuController::EXIT_NONE, menu_controller_->exit_type());
@@ skipping 11 matching lines @@
   }
 
   // Setups |menu_controller_delegate_| to be destroyed when OnMenuClosed is
   // called.
   void TestDragCompleteThenDestroyOnMenuClosed() {
     menu_controller_delegate_->set_on_menu_closed_callback(
         base::Bind(&MenuControllerTest::VerifyDragCompleteThenDestroy,
                    base::Unretained(this)));
   }
 
-  void TestAsynchronousNestedExitAll() {
-    ASSERT_TRUE(test_message_loop_->is_running());
-
-    std::unique_ptr<TestMenuControllerDelegate> nested_delegate(
-        new TestMenuControllerDelegate());
-
-    menu_controller()->AddNestedDelegate(nested_delegate.get());
-    menu_controller()->SetAsyncRun(true);
-
-    int mouse_event_flags = 0;
-    MenuItemView* run_result = menu_controller()->Run(
-        owner(), nullptr, menu_item(), gfx::Rect(), MENU_ANCHOR_TOPLEFT, false,
-        false, &mouse_event_flags);
-    EXPECT_EQ(run_result, nullptr);
-
-    // Exit all menus and check that the parent menu's message loop is
-    // terminated.
-    menu_controller()->Cancel(MenuController::EXIT_ALL);
-    EXPECT_EQ(MenuController::EXIT_ALL, menu_controller()->exit_type());
-    EXPECT_FALSE(test_message_loop_->is_running());
-  }
-
-  void TestAsynchronousNestedExitOutermost() {
-    ASSERT_TRUE(test_message_loop_->is_running());
-
-    std::unique_ptr<TestMenuControllerDelegate> nested_delegate(
-        new TestMenuControllerDelegate());
-
-    menu_controller()->AddNestedDelegate(nested_delegate.get());
-    menu_controller()->SetAsyncRun(true);
-
-    int mouse_event_flags = 0;
-    MenuItemView* run_result = menu_controller()->Run(
-        owner(), nullptr, menu_item(), gfx::Rect(), MENU_ANCHOR_TOPLEFT, false,
-        false, &mouse_event_flags);
-    EXPECT_EQ(run_result, nullptr);
-
-    // Exit the nested menu and check that the parent menu's message loop is
-    // still running.
-    menu_controller()->Cancel(MenuController::EXIT_OUTERMOST);
-    EXPECT_EQ(MenuController::EXIT_NONE, menu_controller()->exit_type());
-    EXPECT_TRUE(test_message_loop_->is_running());
-
-    // Now, exit the parent menu and check that its message loop is terminated.
-    menu_controller()->Cancel(MenuController::EXIT_OUTERMOST);
-    EXPECT_EQ(MenuController::EXIT_OUTERMOST, menu_controller()->exit_type());
-    EXPECT_FALSE(test_message_loop_->is_running());
-  }
-
-  // This nested an asynchronous delegate onto a menu with a nested message
-  // loop, then kills the loop. Simulates the loop being killed not by
-  // MenuController.
-  void TestNestedMessageLoopKillsItself(
-      TestMenuControllerDelegate* nested_delegate) {
-    menu_controller_->AddNestedDelegate(nested_delegate);
-    menu_controller_->SetAsyncRun(true);
-
-    test_message_loop_->QuitNow();
-  }
-
   // Tests destroying the active |menu_controller_| and replacing it with a new
   // active instance.
   void TestMenuControllerReplacementDuringDrag() {
     DestroyMenuController();
     menu_item()->GetSubmenu()->Close();
     menu_controller_ =
         new MenuController(true, menu_controller_delegate_.get());
     menu_controller_->owner_ = owner_.get();
     menu_controller_->showing_ = true;
   }
 
   // Tests that the menu does not destroy itself when canceled during a drag.
   void TestCancelAllDuringDrag() {
     menu_controller_->CancelAll();
     EXPECT_EQ(0, menu_controller_delegate_->on_menu_closed_called());
   }
 
   // Tests that destroying the menu during ViewsDelegate::ReleaseRef does not
   // cause a crash.
   void TestDestroyedDuringViewsRelease() {
     // |test_views_delegate_| is owned by views::ViewsTestBase and not deleted
     // until TearDown. MenuControllerTest outlives it.
     test_views_delegate_->set_release_ref_callback(base::Bind(
         &MenuControllerTest::DestroyMenuController, base::Unretained(this)));
-    menu_controller_->ExitAsyncRun();
+    menu_controller_->ExitMenu();
   }
 
  protected:
   void SetPendingStateItem(MenuItemView* item) {
     menu_controller_->pending_state_.item = item;
     menu_controller_->pending_state_.submenu_open = true;
   }
 
   void SetState(MenuItemView* item) {
     menu_controller_->state_.item = item;
@@ skipping 44 matching lines @@
   MenuItemView* FindPreviousSelectableMenuItem(MenuItemView* parent,
                                                int index) {
     return menu_controller_->FindNextSelectableMenuItem(
         parent, index, MenuController::INCREMENT_SELECTION_UP);
   }
 
   internal::MenuControllerDelegate* GetCurrentDelegate() {
     return menu_controller_->delegate_;
   }
 
-  bool IsAsyncRun() { return menu_controller_->async_run_; }
-
   bool IsShowing() { return menu_controller_->showing_; }
 
   MenuHost* GetMenuHost(SubmenuView* submenu) { return submenu->host_; }
 
   MenuHostRootView* CreateMenuHostRootView(MenuHost* host) {
     return static_cast<MenuHostRootView*>(host->CreateRootView());
   }
 
   void MenuHostOnDragWillStart(MenuHost* host) { host->OnDragWillStart(); }
 
@@ skipping 28 matching lines @@
   }
 
   void ProcessMouseMoved(SubmenuView* source, const ui::MouseEvent& event) {
     menu_controller_->OnMouseMoved(source, event);
   }
 
   void ProcessMouseReleased(SubmenuView* source, const ui::MouseEvent& event) {
     menu_controller_->OnMouseReleased(source, event);
   }
 
-  void RunMenu() {
-#if defined(USE_AURA)
-    std::unique_ptr<MenuPreTargetHandler> menu_pre_target_handler(
-        new MenuPreTargetHandler(menu_controller_, owner_.get()));
-#endif
-
-    menu_controller_->message_loop_depth_++;
-    menu_controller_->RunMessageLoop();
-    menu_controller_->message_loop_depth_--;
-  }
-
   void Accept(MenuItemView* item, int event_flags) {
     menu_controller_->Accept(item, event_flags);
   }
 
-  void InstallTestMenuMessageLoop() {
-    test_message_loop_ =
-        new TestMenuMessageLoop(std::move(menu_controller_->message_loop_));
-    menu_controller_->message_loop_.reset(test_message_loop_);
-  }
-
   // Causes the |menu_controller_| to begin dragging. Use TestDragDropClient to
   // avoid nesting message loops.
   void StartDrag() {
     const gfx::Point location;
     menu_controller_->state_.item = menu_item()->GetSubmenu()->GetMenuItemAt(0);
     menu_controller_->StartDrag(
         menu_item()->GetSubmenu()->GetMenuItemAt(0)->CreateSubmenu(), location);
   }
 
   Widget* owner() { return owner_.get(); }
@@ skipping 30 matching lines @@
   CustomButton* GetHotButton() {
     return menu_controller_->hot_button_;
   }
 
   void SetHotTrackedButton(CustomButton* hot_button) {
     menu_controller_->SetHotTrackedButton(hot_button);
   }
 
   void ExitMenuRun() {
     menu_controller_->SetExitType(MenuController::ExitType::EXIT_OUTERMOST);
-    menu_controller_->ExitMenuRun();
+    menu_controller_->ExitTopMostMenu();
   }
 
   void DestroyMenuController() {
     if (!menu_controller_)
       return;
 
     if (!owner_->IsClosed())
       owner_->RemoveObserver(menu_controller_);
 
     menu_controller_->showing_ = false;
@@ skipping 38 matching lines @@
 
   // Not owned.
   DestructingTestViewsDelegate* test_views_delegate_;
 
   std::unique_ptr<Widget> owner_;
   std::unique_ptr<ui::test::EventGenerator> event_generator_;
   std::unique_ptr<TestMenuItemViewShown> menu_item_;
   std::unique_ptr<TestMenuControllerDelegate> menu_controller_delegate_;
   std::unique_ptr<TestMenuDelegate> menu_delegate_;
   MenuController* menu_controller_;
-  TestMenuMessageLoop* test_message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuControllerTest);
 };
 
 #if defined(OS_LINUX) && defined(USE_X11)
 // Tests that an event targeter which blocks events will be honored by the menu
 // event dispatcher.
 TEST_F(MenuControllerTest, EventTargeter) {
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(&MenuControllerTest::TestEventTargeter,
-                            base::Unretained(this)));
-  RunMenu();
-}
-
-// Tests that an non-nested menu receiving an escape key will fully shut. This
-// should not crash by attempting to retarget the key to an inner menu.
-TEST_F(MenuControllerTest, AsyncEscapeKey) {
-  menu_controller()->SetAsyncRun(true);
+  {
+    // With the |ui::NullEventTargeter| instantiated and assigned we expect
+    // the menu to not handle the key event.
+    aura::ScopedWindowTargeter scoped_targeter(
+        owner()->GetNativeWindow()->GetRootWindow(),
+        std::unique_ptr<ui::EventTargeter>(new ui::NullEventTargeter));
+    PressKey(ui::VKEY_ESCAPE);
+    EXPECT_EQ(MenuController::EXIT_NONE, menu_exit_type());
+  }
+  // Now that the targeter has been destroyed, expect to exit the menu
+  // normally when hitting escape.
   TestAsyncEscapeKey();
   EXPECT_EQ(MenuController::EXIT_ALL, menu_exit_type());
 }
 
 #endif  // defined(OS_LINUX) && defined(USE_X11)
 
 #if defined(USE_X11)
 // Tests that touch event ids are released correctly. See crbug.com/439051 for
 // details. When the ids aren't managed correctly, we get stuck down touches.
 TEST_F(MenuControllerTest, TouchIdsReleasedCorrectly) {
   TestEventHandler test_event_handler;
   owner()->GetNativeWindow()->GetRootWindow()->AddPreTargetHandler(
       &test_event_handler);
 
   std::vector<int> devices;
   devices.push_back(1);
   ui::SetUpTouchDevicesForTest(devices);
 
   event_generator()->PressTouchId(0);
   event_generator()->PressTouchId(1);
   event_generator()->ReleaseTouchId(0);
 
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(&MenuControllerTest::ReleaseTouchId,
-                            base::Unretained(this), 1));
+  int mouse_event_flags = 0;
+  MenuItemView* run_result = menu_controller()->Run(
+      owner(), nullptr, menu_item(), gfx::Rect(), MENU_ANCHOR_TOPLEFT, false,
+      false, &mouse_event_flags);
+  EXPECT_EQ(run_result, nullptr);
 
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(&MenuControllerTest::PressKey,
-                            base::Unretained(this), ui::VKEY_ESCAPE));
-
-  RunMenu();
+  MenuControllerTest::ReleaseTouchId(1);
+  TestAsyncEscapeKey();
 
   EXPECT_EQ(MenuController::EXIT_ALL, menu_exit_type());
   EXPECT_EQ(0, test_event_handler.outstanding_touches());
 
   owner()->GetNativeWindow()->GetRootWindow()->RemovePreTargetHandler(
       &test_event_handler);
 }
 #endif  // defined(USE_X11)
 
 // Tests that initial selected menu items are correct when items are enabled or
@@ skipping 287 matching lines @@
   // Increment twice to move selection to |button2|.
   IncrementSelection();
   IncrementSelection();
   EXPECT_EQ(5, pending_state_item()->GetCommand());
   EXPECT_FALSE(button1->IsHotTracked());
   EXPECT_TRUE(button2->IsHotTracked());
   EXPECT_FALSE(button3->IsHotTracked());
   EXPECT_EQ(button2, GetHotButton());
 
   MenuController* controller = menu_controller();
-  controller->SetAsyncRun(true);
   int mouse_event_flags = 0;
   MenuItemView* run_result =
       controller->Run(owner(), nullptr, menu_item(), gfx::Rect(),
                       MENU_ANCHOR_TOPLEFT, false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
 
   // |button2| should stay in hot-tracked state but menu controller should not
   // track it anymore (preventing resetting hot-tracked state when changing
   // selection while a nested run is active).
   EXPECT_TRUE(button2->IsHotTracked());
   EXPECT_EQ(nullptr, GetHotButton());
 
   // Setting hot-tracked button while nested should get reverted when nested
   // menu run ends.
   SetHotTrackedButton(button1);
   EXPECT_TRUE(button1->IsHotTracked());
   EXPECT_EQ(button1, GetHotButton());
 
   ExitMenuRun();
   EXPECT_FALSE(button1->IsHotTracked());
   EXPECT_TRUE(button2->IsHotTracked());
   EXPECT_EQ(button2, GetHotButton());
 }
 
 // Tests that a menu opened asynchronously, will notify its
 // MenuControllerDelegate when Accept is called.
 TEST_F(MenuControllerTest, AsynchronousAccept) {
   MenuController* controller = menu_controller();
-  controller->SetAsyncRun(true);
 
   int mouse_event_flags = 0;
   MenuItemView* run_result =
       controller->Run(owner(), nullptr, menu_item(), gfx::Rect(),
                       MENU_ANCHOR_TOPLEFT, false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
   TestMenuControllerDelegate* delegate = menu_controller_delegate();
   EXPECT_EQ(0, delegate->on_menu_closed_called());
 
   MenuItemView* accepted = menu_item()->GetSubmenu()->GetMenuItemAt(0);
   const int kEventFlags = 42;
   Accept(accepted, kEventFlags);
 
   EXPECT_EQ(1, delegate->on_menu_closed_called());
   EXPECT_EQ(accepted, delegate->on_menu_closed_menu());
   EXPECT_EQ(kEventFlags, delegate->on_menu_closed_mouse_event_flags());
   EXPECT_EQ(internal::MenuControllerDelegate::NOTIFY_DELEGATE,
             delegate->on_menu_closed_notify_type());
 }
 
 // Tests that a menu opened asynchronously, will notify its
 // MenuControllerDelegate when CancelAll is called.
 TEST_F(MenuControllerTest, AsynchronousCancelAll) {
   MenuController* controller = menu_controller();
-  controller->SetAsyncRun(true);
 
   int mouse_event_flags = 0;
   MenuItemView* run_result =
       controller->Run(owner(), nullptr, menu_item(), gfx::Rect(),
                       MENU_ANCHOR_TOPLEFT, false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
   TestMenuControllerDelegate* delegate = menu_controller_delegate();
   EXPECT_EQ(0, delegate->on_menu_closed_called());
 
   controller->CancelAll();
   EXPECT_EQ(1, delegate->on_menu_closed_called());
   EXPECT_EQ(nullptr, delegate->on_menu_closed_menu());
   EXPECT_EQ(0, delegate->on_menu_closed_mouse_event_flags());
   EXPECT_EQ(internal::MenuControllerDelegate::NOTIFY_DELEGATE,
             delegate->on_menu_closed_notify_type());
   EXPECT_EQ(MenuController::EXIT_ALL, controller->exit_type());
 }
 
-// Tests that an asynchrnous menu nested within a synchronous menu restores the
-// previous MenuControllerDelegate and synchronous settings.
+// Tests that canceling a nested menu restores the previous
+// MenuControllerDelegate, and notifies each delegate.
 TEST_F(MenuControllerTest, AsynchronousNestedDelegate) {
   MenuController* controller = menu_controller();
   TestMenuControllerDelegate* delegate = menu_controller_delegate();
   std::unique_ptr<TestMenuControllerDelegate> nested_delegate(
       new TestMenuControllerDelegate());
 
-  ASSERT_FALSE(IsAsyncRun());
   controller->AddNestedDelegate(nested_delegate.get());
-  controller->SetAsyncRun(true);
-
-  EXPECT_TRUE(IsAsyncRun());
   EXPECT_EQ(nested_delegate.get(), GetCurrentDelegate());
 
   int mouse_event_flags = 0;
   MenuItemView* run_result =
       controller->Run(owner(), nullptr, menu_item(), gfx::Rect(),
                       MENU_ANCHOR_TOPLEFT, false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
 
   controller->CancelAll();
-  EXPECT_FALSE(IsAsyncRun());
   EXPECT_EQ(delegate, GetCurrentDelegate());
-  EXPECT_EQ(0, delegate->on_menu_closed_called());
+  EXPECT_EQ(1, delegate->on_menu_closed_called());
   EXPECT_EQ(1, nested_delegate->on_menu_closed_called());
   EXPECT_EQ(nullptr, nested_delegate->on_menu_closed_menu());
   EXPECT_EQ(0, nested_delegate->on_menu_closed_mouse_event_flags());
   EXPECT_EQ(internal::MenuControllerDelegate::NOTIFY_DELEGATE,
             nested_delegate->on_menu_closed_notify_type());
   EXPECT_EQ(MenuController::EXIT_ALL, controller->exit_type());
 }
 
 // Tests that dropping within an asynchronous menu stops the menu from showing
 // and does not notify the controller.
 TEST_F(MenuControllerTest, AsynchronousPerformDrop) {
   MenuController* controller = menu_controller();
-  controller->SetAsyncRun(true);
   SubmenuView* source = menu_item()->GetSubmenu();
   MenuItemView* target = source->GetMenuItemAt(0);
 
   SetDropMenuItem(target, MenuDelegate::DropPosition::DROP_AFTER);
 
   ui::OSExchangeData drop_data;
   gfx::Rect bounds(target->bounds());
   gfx::Point location(bounds.x(), bounds.y());
   ui::DropTargetEvent target_event(drop_data, location, location,
                                    ui::DragDropTypes::DRAG_MOVE);
   controller->OnPerformDrop(source, target_event);
 
   TestMenuDelegate* menu_delegate =
       static_cast<TestMenuDelegate*>(target->GetDelegate());
   TestMenuControllerDelegate* controller_delegate = menu_controller_delegate();
   EXPECT_TRUE(menu_delegate->on_perform_drop_called());
   EXPECT_FALSE(IsShowing());
   EXPECT_EQ(0, controller_delegate->on_menu_closed_called());
 }
 
 // Tests that dragging within an asynchronous menu notifies the
 // MenuControllerDelegate for shutdown.
 TEST_F(MenuControllerTest, AsynchronousDragComplete) {
   MenuController* controller = menu_controller();
-  controller->SetAsyncRun(true);
   TestDragCompleteThenDestroyOnMenuClosed();
 
   controller->OnDragWillStart();
   controller->OnDragComplete(true);
 
   TestMenuControllerDelegate* controller_delegate = menu_controller_delegate();
   EXPECT_EQ(1, controller_delegate->on_menu_closed_called());
   EXPECT_EQ(nullptr, controller_delegate->on_menu_closed_menu());
   EXPECT_EQ(internal::MenuControllerDelegate::NOTIFY_DELEGATE,
             controller_delegate->on_menu_closed_notify_type());
 }
 
 // Tests that if Cancel is called during a drag, that OnMenuClosed is still
 // notified when the drag completes.
 TEST_F(MenuControllerTest, AsynchronousCancelDuringDrag) {
   MenuController* controller = menu_controller();
-  controller->SetAsyncRun(true);
   TestDragCompleteThenDestroyOnMenuClosed();
 
   controller->OnDragWillStart();
   controller->CancelAll();
   controller->OnDragComplete(true);
 
   TestMenuControllerDelegate* controller_delegate = menu_controller_delegate();
   EXPECT_EQ(1, controller_delegate->on_menu_closed_called());
   EXPECT_EQ(nullptr, controller_delegate->on_menu_closed_menu());
   EXPECT_EQ(internal::MenuControllerDelegate::NOTIFY_DELEGATE,
             controller_delegate->on_menu_closed_notify_type());
 }
 
 // Tests that if a menu is destroyed while drag operations are occuring, that
 // the MenuHost does not crash as the drag completes.
 TEST_F(MenuControllerTest, AsynchronousDragHostDeleted) {
-  MenuController* controller = menu_controller();
-  controller->SetAsyncRun(true);
-
   SubmenuView* submenu = menu_item()->GetSubmenu();
   submenu->ShowAt(owner(), menu_item()->bounds(), false);
   MenuHost* host = GetMenuHost(submenu);
   MenuHostOnDragWillStart(host);
   submenu->Close();
   DestroyMenuItem();
   MenuHostOnDragComplete(host);
 }
 
 // Widget destruction and cleanup occurs on the MessageLoop after the
 // MenuController has been destroyed. A MenuHostRootView should not attempt to
 // access a destroyed MenuController. This test should not cause a crash.
 TEST_F(MenuControllerTest, HostReceivesInputBeforeDestruction) {
-  MenuController* controller = menu_controller();
-  controller->SetAsyncRun(true);
-
   SubmenuView* submenu = menu_item()->GetSubmenu();
   submenu->ShowAt(owner(), menu_item()->bounds(), false);
   gfx::Point location(submenu->bounds().bottom_right());
   location.Offset(1, 1);
 
   MenuHost* host = GetMenuHost(submenu);
   // Normally created as the full Widget is brought up. Explicitly created here
   // for testing.
   std::unique_ptr<MenuHostRootView> root_view(CreateMenuHostRootView(host));
   DestroyMenuController();
 
   ui::MouseEvent event(ui::ET_MOUSE_MOVED, location, location,
                        ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
 
   // This should not attempt to access the destroyed MenuController and should
   // not crash.
   root_view->OnMouseMoved(event);
 }
 
 // Tets that an asynchronous menu nested within an asynchronous menu closes both
 // menus, and notifies both delegates.
 TEST_F(MenuControllerTest, DoubleAsynchronousNested) {
   MenuController* controller = menu_controller();
   TestMenuControllerDelegate* delegate = menu_controller_delegate();
   std::unique_ptr<TestMenuControllerDelegate> nested_delegate(
       new TestMenuControllerDelegate());
 
-  ASSERT_FALSE(IsAsyncRun());
-  // Sets the run created in SetUp
-  controller->SetAsyncRun(true);
-
   // Nested run
   controller->AddNestedDelegate(nested_delegate.get());
-  controller->SetAsyncRun(true);
   int mouse_event_flags = 0;
   MenuItemView* run_result =
       controller->Run(owner(), nullptr, menu_item(), gfx::Rect(),
                       MENU_ANCHOR_TOPLEFT, false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
 
   controller->CancelAll();
   EXPECT_EQ(1, delegate->on_menu_closed_called());
   EXPECT_EQ(1, nested_delegate->on_menu_closed_called());
 }
 
-// Tests that an asynchronous menu nested within a synchronous menu does not
-// crash when trying to repost events that occur outside of the bounds of the
-// menu. Instead a proper shutdown should occur.
+// Tests that a nested menu does not crash when trying to repost events that
+// occur outside of the bounds of the menu. Instead a proper shutdown should
+// occur.
 TEST_F(MenuControllerTest, AsynchronousRepostEvent) {
   MenuController* controller = menu_controller();
   TestMenuControllerDelegate* delegate = menu_controller_delegate();
   std::unique_ptr<TestMenuControllerDelegate> nested_delegate(
       new TestMenuControllerDelegate());
 
-  ASSERT_FALSE(IsAsyncRun());
-
   controller->AddNestedDelegate(nested_delegate.get());
-  controller->SetAsyncRun(true);
-
-  EXPECT_TRUE(IsAsyncRun());
   EXPECT_EQ(nested_delegate.get(), GetCurrentDelegate());
 
   MenuItemView* item = menu_item();
   int mouse_event_flags = 0;
   MenuItemView* run_result =
       controller->Run(owner(), nullptr, item, gfx::Rect(), MENU_ANCHOR_TOPLEFT,
                       false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
 
   // Show a sub menu to target with a pointer selection. However have the event
   // occur outside of the bounds of the entire menu.
   SubmenuView* sub_menu = item->GetSubmenu();
   sub_menu->ShowAt(owner(), item->bounds(), false);
   gfx::Point location(sub_menu->bounds().bottom_right());
   location.Offset(1, 1);
   ui::MouseEvent event(ui::ET_MOUSE_PRESSED, location, location,
                        ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
 
   // When attempting to select outside of all menus this should lead to a
   // shutdown. This should not crash while attempting to repost the event.
   SetSelectionOnPointerDown(sub_menu, &event);
 
-  EXPECT_FALSE(IsAsyncRun());
   EXPECT_EQ(delegate, GetCurrentDelegate());
-  EXPECT_EQ(0, delegate->on_menu_closed_called());
+  EXPECT_EQ(1, delegate->on_menu_closed_called());
   EXPECT_EQ(1, nested_delegate->on_menu_closed_called());
   EXPECT_EQ(nullptr, nested_delegate->on_menu_closed_menu());
   EXPECT_EQ(0, nested_delegate->on_menu_closed_mouse_event_flags());
   EXPECT_EQ(internal::MenuControllerDelegate::NOTIFY_DELEGATE,
             nested_delegate->on_menu_closed_notify_type());
   EXPECT_EQ(MenuController::EXIT_ALL, controller->exit_type());
 }
 
 // Tests that an asynchronous menu reposts touch events that occur outside of
 // the bounds of the menu, and that the menu closes.
 TEST_F(MenuControllerTest, AsynchronousTouchEventRepostEvent) {
   MenuController* controller = menu_controller();
   TestMenuControllerDelegate* delegate = menu_controller_delegate();
-  controller->SetAsyncRun(true);
 
   // Show a sub menu to target with a touch event. However have the event occur
   // outside of the bounds of the entire menu.
   MenuItemView* item = menu_item();
   SubmenuView* sub_menu = item->GetSubmenu();
   sub_menu->ShowAt(owner(), item->bounds(), false);
   gfx::Point location(sub_menu->bounds().bottom_right());
   location.Offset(1, 1);
   ui::TouchEvent event(
       ui::ET_TOUCH_PRESSED, location, ui::EventTimeForNow(),
       ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
   controller->OnTouchEvent(sub_menu, &event);
 
   EXPECT_FALSE(IsShowing());
   EXPECT_EQ(1, delegate->on_menu_closed_called());
   EXPECT_EQ(nullptr, delegate->on_menu_closed_menu());
   EXPECT_EQ(0, delegate->on_menu_closed_mouse_event_flags());
   EXPECT_EQ(internal::MenuControllerDelegate::NOTIFY_DELEGATE,
             delegate->on_menu_closed_notify_type());
   EXPECT_EQ(MenuController::EXIT_ALL, controller->exit_type());
 }
 
-// Tests that if you exit all menus when an asynchrnous menu is nested within a
-// synchronous menu, the message loop for the parent menu finishes running.
-TEST_F(MenuControllerTest, AsynchronousNestedExitAll) {
-  InstallTestMenuMessageLoop();
-
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(&MenuControllerTest::TestAsynchronousNestedExitAll,
-                            base::Unretained(this)));
-
-  RunMenu();
-}
-
-// Tests that if you exit the nested menu when an asynchrnous menu is nested
-// within a synchronous menu, the message loop for the parent menu remains
-// running.
-TEST_F(MenuControllerTest, AsynchronousNestedExitOutermost) {
-  InstallTestMenuMessageLoop();
-
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE,
-      base::Bind(&MenuControllerTest::TestAsynchronousNestedExitOutermost,
-                 base::Unretained(this)));
-
-  RunMenu();
-}
-
 // Tests that having the MenuController deleted during RepostEvent does not
 // cause a crash. ASAN bots should not detect use-after-free in MenuController.
 TEST_F(MenuControllerTest, AsynchronousRepostEventDeletesController) {
   MenuController* controller = menu_controller();
   std::unique_ptr<TestMenuControllerDelegate> nested_delegate(
       new TestMenuControllerDelegate());
 
-  ASSERT_FALSE(IsAsyncRun());
-
   controller->AddNestedDelegate(nested_delegate.get());
-  controller->SetAsyncRun(true);
-
-  EXPECT_TRUE(IsAsyncRun());
   EXPECT_EQ(nested_delegate.get(), GetCurrentDelegate());
 
   MenuItemView* item = menu_item();
   int mouse_event_flags = 0;
   MenuItemView* run_result =
       controller->Run(owner(), nullptr, item, gfx::Rect(), MENU_ANCHOR_TOPLEFT,
                       false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
 
   // Show a sub menu to target with a pointer selection. However have the event
@@ skipping 16 matching lines @@
   sub_menu->Close();
   EXPECT_EQ(1, nested_delegate->on_menu_closed_called());
 }
 
 // Tests that having the MenuController deleted during OnGestureEvent does not
 // cause a crash. ASAN bots should not detect use-after-free in MenuController.
 TEST_F(MenuControllerTest, AsynchronousGestureDeletesController) {
   MenuController* controller = menu_controller();
   std::unique_ptr<TestMenuControllerDelegate> nested_delegate(
       new TestMenuControllerDelegate());
-  ASSERT_FALSE(IsAsyncRun());
 
   controller->AddNestedDelegate(nested_delegate.get());
-  controller->SetAsyncRun(true);
-
-  EXPECT_TRUE(IsAsyncRun());
   EXPECT_EQ(nested_delegate.get(), GetCurrentDelegate());
 
   MenuItemView* item = menu_item();
   int mouse_event_flags = 0;
   MenuItemView* run_result =
       controller->Run(owner(), nullptr, item, gfx::Rect(), MENU_ANCHOR_TOPLEFT,
                       false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
 
   // Show a sub menu to target with a tap event.
   SubmenuView* sub_menu = item->GetSubmenu();
   sub_menu->ShowAt(owner(), gfx::Rect(0, 0, 100, 100), true);
 
   gfx::Point location(sub_menu->bounds().CenterPoint());
   ui::GestureEvent event(location.x(), location.y(), 0, ui::EventTimeForNow(),
                          ui::GestureEventDetails(ui::ET_GESTURE_TAP));
 
   // This will lead to MenuController being deleted during the processing of the
   // gesture event. The remainder of this test, and TearDown should not crash.
   DestroyMenuControllerOnMenuClosed(nested_delegate.get());
   controller->OnGestureEvent(sub_menu, &event);
 
   // Close to remove observers before test TearDown
   sub_menu->Close();
   EXPECT_EQ(1, nested_delegate->on_menu_closed_called());
 }
 
-// Tests that when an asynchronous menu is nested, and the nested message loop
-// is kill not by the MenuController, that the nested menu is notified of
-// destruction.
-TEST_F(MenuControllerTest, NestedMessageLoopDiesWithNestedMenu) {
-  menu_controller()->CancelAll();
-  InstallTestMenuMessageLoop();
-  std::unique_ptr<TestMenuControllerDelegate> nested_delegate(
-      new TestMenuControllerDelegate());
-  // This will nest an asynchronous menu, and then kill the nested message loop.
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE,
-      base::Bind(&MenuControllerTest::TestNestedMessageLoopKillsItself,
-                 base::Unretained(this), nested_delegate.get()));
-
-  int result_event_flags = 0;
-  // This creates a nested message loop.
-  EXPECT_EQ(nullptr, menu_controller()->Run(owner(), nullptr, menu_item(),
-                                            gfx::Rect(), MENU_ANCHOR_TOPLEFT,
-                                            false, false, &result_event_flags));
-  EXPECT_FALSE(menu_controller_delegate()->on_menu_closed_called());
-  EXPECT_TRUE(nested_delegate->on_menu_closed_called());
-}
-
 #if defined(USE_AURA)
-// Tests that when a synchronous menu receives a cancel event, that it closes.
-TEST_F(MenuControllerTest, SynchronousCancelEvent) {
-  ExitMenuRun();
-  // Post actual test to run once the menu has created a nested message loop.
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE,
-      base::Bind(&MenuControllerTest::TestCancelEvent, base::Unretained(this)));
-  int mouse_event_flags = 0;
-  MenuItemView* run_result = menu_controller()->Run(
-      owner(), nullptr, menu_item(), gfx::Rect(), MENU_ANCHOR_TOPLEFT, false,
-      false, &mouse_event_flags);
-  EXPECT_EQ(run_result, nullptr);
-}
-
 // Tests that when an asynchronous menu receives a cancel event, that it closes.
 TEST_F(MenuControllerTest, AsynchronousCancelEvent) {
   ExitMenuRun();
   MenuController* controller = menu_controller();
-  controller->SetAsyncRun(true);
 
   int mouse_event_flags = 0;
   MenuItemView* run_result =
       controller->Run(owner(), nullptr, menu_item(), gfx::Rect(),
                       MENU_ANCHOR_TOPLEFT, false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
-  TestCancelEvent();
+  EXPECT_EQ(MenuController::EXIT_NONE, controller->exit_type());
+  ui::CancelModeEvent cancel_event;
+  event_generator()->Dispatch(&cancel_event);
+  EXPECT_EQ(MenuController::EXIT_ALL, controller->exit_type());
 }
 
 // Tests that if a menu is ran without a widget, that MenuPreTargetHandler does
 // not cause a crash.
 TEST_F(MenuControllerTest, RunWithoutWidgetDoesntCrash) {
   ExitMenuRun();
   MenuController* controller = menu_controller();
-  controller->SetAsyncRun(true);
   int mouse_event_flags = 0;
   MenuItemView* run_result =
       controller->Run(nullptr, nullptr, menu_item(), gfx::Rect(),
                       MENU_ANCHOR_TOPLEFT, false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
 }
 
 // Tests that if a MenuController is destroying during drag/drop, and another
 // MenuController becomes active, that the exiting of drag does not cause a
 // crash.
@@ skipping 10 matching lines @@
                                       ->GetNativeWindow()
                                       ->GetRootWindow(),
                                   &drag_drop_client);
   StartDrag();
 }
 
 // Tests that if a CancelAll is called during drag-and-drop that it does not
 // 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) {
-  MenuController* controller = menu_controller();
-  controller->SetAsyncRun(true);
-
   // Build the menu so that the appropriate root window is available to set the
   // drag drop client on.
   AddButtonMenuItems();
   TestDragDropClient drag_drop_client(base::Bind(
       &MenuControllerTest::TestCancelAllDuringDrag, base::Unretained(this)));
   aura::client::SetDragDropClient(menu_item()
                                       ->GetSubmenu()
                                       ->GetWidget()
                                       ->GetNativeWindow()
                                       ->GetRootWindow(),
                                   &drag_drop_client);
   StartDrag();
 }
 
 // Tests that when releasing the ref on ViewsDelegate and MenuController is
 // deleted, that shutdown occurs without crashing.
 TEST_F(MenuControllerTest, DestroyedDuringViewsRelease) {
   ExitMenuRun();
   MenuController* controller = menu_controller();
-  controller->SetAsyncRun(true);
 
   int mouse_event_flags = 0;
   MenuItemView* run_result =
       controller->Run(owner(), nullptr, menu_item(), gfx::Rect(),
                       MENU_ANCHOR_TOPLEFT, false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
   TestDestroyedDuringViewsRelease();
 }
 
 // Tests that when a context menu is opened above an empty menu item, and a
 // right-click occurs over the empty item, that the bottom menu is not hidden,
 // that a request to relaunch the context menu is received, and that
 // subsequently pressing ESC does not crash the browser.
 TEST_F(MenuControllerTest, RepostEventToEmptyMenuItem) {
   // Setup a submenu. Additionally hook up appropriate Widget and View
   // containers, with bounds, so that hit testing works.
   MenuController* controller = menu_controller();
-  controller->SetAsyncRun(true);
   MenuItemView* base_menu = menu_item();
   base_menu->SetBounds(0, 0, 200, 200);
   SubmenuView* base_submenu = base_menu->GetSubmenu();
   base_submenu->SetBounds(0, 0, 200, 200);
   base_submenu->ShowAt(owner(), gfx::Rect(0, 0, 200, 200), false);
   GetMenuHost(base_submenu)
       ->SetContentsView(base_submenu->GetScrollViewContainer());
 
   // Build the submenu to have an empty menu item. Additionally hook up
   // appropriate Widget and View containersm with counds, so that hit testing
@@ skipping 88 matching lines @@
   // crash.
   TestAsyncEscapeKey();
   EXPECT_EQ(nested_controller_delegate_2->on_menu_closed_called(), 1);
   EXPECT_EQ(menu_controller_delegate(), GetCurrentDelegate());
 }
 
 #endif  // defined(USE_AURA)
 
 }  // namespace test
 }  // namespace views