Cleanup MenuRunner API

chrome/browser/ui/views/menu_view_drag_and_drop_test.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 "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/menu_test_base.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
@@ skipping 445 matching lines @@
   ~MenuViewDragAndDropForDropStayOpen() override {}
 
  private:
   // MenuViewDragAndDropTest:
   int GetMenuRunnerFlags() override;
   void DoTestWithMenuOpen() override;
 };
 
 int MenuViewDragAndDropForDropStayOpen::GetMenuRunnerFlags() {
   return views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::NESTED_DRAG |
-         views::MenuRunner::FOR_DROP | views::MenuRunner::ASYNC;
+         views::MenuRunner::FOR_DROP;
 }
 
 void MenuViewDragAndDropForDropStayOpen::DoTestWithMenuOpen() {
   views::SubmenuView* submenu = menu()->GetSubmenu();
   ASSERT_TRUE(submenu);
   ASSERT_TRUE(submenu->IsShowing());
 
   views::MenuController* controller = menu()->GetMenuController();
   ASSERT_TRUE(controller);
   EXPECT_FALSE(controller->IsCancelAllTimerRunningForTest());
@@ skipping 11 matching lines @@
   MenuViewDragAndDropForDropCancel() {}
   ~MenuViewDragAndDropForDropCancel() override {}
 
  private:
   // MenuViewDragAndDropTest:
   int GetMenuRunnerFlags() override;
   void DoTestWithMenuOpen() override;
 };
 
 int MenuViewDragAndDropForDropCancel::GetMenuRunnerFlags() {
-  return views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::FOR_DROP |
-         views::MenuRunner::ASYNC;
+  return views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::FOR_DROP;
 }
 
 void MenuViewDragAndDropForDropCancel::DoTestWithMenuOpen() {
   views::SubmenuView* submenu = menu()->GetSubmenu();
   ASSERT_TRUE(submenu);
   ASSERT_TRUE(submenu->IsShowing());
 
   views::MenuController* controller = menu()->GetMenuController();
   ASSERT_TRUE(controller);
   EXPECT_TRUE(controller->IsCancelAllTimerRunningForTest());
 
   Done();
 }
 
 // Test that if a menu is opened for a drop handled entirely by menu code, the
 // menu will try to close if it does not receive any drag updates.
 // If this flakes, disable and log details in http://crbug.com/523255.
 VIEW_TEST(MenuViewDragAndDropForDropCancel, MenuViewCancelsForOwnDrag)