Revert 285142 "Open the WrenchMenu on mouseover when dragging a ..."

trunk/src/chrome/browser/ui/views/menu_test_base.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/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/menu_test_base.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "ui/aura/window.h"
 #include "ui/base/test/ui_controls.h"
@@ skipping 19 matching lines @@
       next);
 }
 
 void MenuTestBase::KeyPress(ui::KeyboardCode keycode,
                             const base::Closure& next) {
   ui_controls::SendKeyPressNotifyWhenDone(
       GetWidget()->GetNativeView()->GetRootWindow(), keycode, false, false,
       false, false, next);
 }
 
-int MenuTestBase::GetMenuRunnerFlags() {
-  return views::MenuRunner::HAS_MNEMONICS;
-}
-
 void MenuTestBase::SetUp() {
   button_ = new views::MenuButton(
       NULL, base::ASCIIToUTF16("Menu Test"), this, true);
   menu_ = new views::MenuItemView(this);
   BuildMenu(menu_);
-  menu_runner_.reset(new views::MenuRunner(menu_, GetMenuRunnerFlags()));
+  menu_runner_.reset(
+      new views::MenuRunner(menu_, views::MenuRunner::HAS_MNEMONICS));
 
   ViewEventTestBase::SetUp();
 }
 
 void MenuTestBase::TearDown() {
-  // We cancel the menu first because certain operations (like a menu opened
-  // with views::MenuRunner::FOR_DROP) don't take kindly to simply pulling the
-  // runner out from under them.
-  menu_runner_->Cancel();
-
   menu_runner_.reset();
   menu_ = NULL;
   ViewEventTestBase::TearDown();
 }
 
 views::View* MenuTestBase::CreateContentsView() {
   return button_;
 }
 
 void MenuTestBase::DoTestOnMessageLoop() {
@@ skipping 12 matching lines @@
   ignore_result(menu_runner_->RunMenuAt(source->GetWidget(),
                                         button_,
                                         bounds,
                                         views::MENU_ANCHOR_TOPLEFT,
                                         ui::MENU_SOURCE_NONE));
 }
 
 void MenuTestBase::ExecuteCommand(int id) {
   last_command_ = id;
 }