Cleanup MenuRunner API

ui/views/test/menu_test_utils.h

 // Copyright 2016 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.
 
 #ifndef UI_VIEWS_TEST_MENU_TEST_UTILS_H_
 #define UI_VIEWS_TEST_MENU_TEST_UTILS_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 
 namespace views {
 
 class MenuController;
 
 namespace test {
 
 // Test implementation of MenuDelegate that tracks calls to MenuDelegate, along
 // with the provided parameters.
 class TestMenuDelegate : public MenuDelegate {
  public:
   TestMenuDelegate();
   ~TestMenuDelegate() override;
 
   int show_context_menu_count() { return show_context_menu_count_; }
   MenuItemView* show_context_menu_source() { return show_context_menu_source_; }
   int execute_command_id() const { return execute_command_id_; }
   int on_menu_closed_called() const { return on_menu_closed_called_count_; }
   MenuItemView* on_menu_closed_menu() const { return on_menu_closed_menu_; }
-  MenuRunner::RunResult on_menu_closed_run_result() const {
-    return on_menu_closed_run_result_;
-  }
   bool on_perform_drop_called() { return on_perform_drop_called_; }
   int will_hide_menu_count() { return will_hide_menu_count_; }
   MenuItemView* will_hide_menu() { return will_hide_menu_; }
 
   // MenuDelegate:
   bool ShowContextMenu(MenuItemView* source,
                        int id,
                        const gfx::Point& p,
                        ui::MenuSourceType source_type) override;
   void ExecuteCommand(int id) override;
-  void OnMenuClosed(MenuItemView* menu, MenuRunner::RunResult result) override;
+  void OnMenuClosed(MenuItemView* menu) override;
   int OnPerformDrop(MenuItemView* menu,
                     DropPosition position,
                     const ui::DropTargetEvent& event) override;
   int GetDragOperations(MenuItemView* sender) override;
   void WriteDragData(MenuItemView* sender, OSExchangeData* data) override;
   void WillHideMenu(MenuItemView* menu) override;
 
  private:
   // The number of times ShowContextMenu was called.
   int show_context_menu_count_ = 0;
 
   // The value of the last call to ShowContextMenu.
   MenuItemView* show_context_menu_source_ = nullptr;
 
   // ID of last executed command.
   int execute_command_id_;
 
   // The number of times OnMenuClosed was called.
   int on_menu_closed_called_count_;
 
-  // The values of the last call to OnMenuClosed.
+  // The value of the last call to OnMenuClosed.
   MenuItemView* on_menu_closed_menu_;
-  MenuRunner::RunResult on_menu_closed_run_result_;
 
   // The number of times WillHideMenu was called.
   int will_hide_menu_count_ = 0;
 
   // The value of the last call to WillHideMenu.
   MenuItemView* will_hide_menu_ = nullptr;
 
   bool on_perform_drop_called_;
 
   DISALLOW_COPY_AND_ASSIGN(TestMenuDelegate);
@@ skipping 22 matching lines @@
  private:
   base::WeakPtr<MenuController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuControllerTestApi);
 };
 
 }  // namespace test
 }  // namespace views
 
 #endif  // UI_VIEWS_TEST_MENU_TEST_UTILS_H_