Fix MenuRunner Releasing

ui/views/controls/menu/menu_controller.h

 // Copyright (c) 2012 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_CONTROLS_MENU_MENU_CONTROLLER_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 
 #include <stddef.h>
 
 #include <list>
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
+#include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 #include "ui/views/widget/widget_observer.h"
 
@@ skipping 22 matching lines @@
 namespace test {
 class MenuControllerTest;
 class MenuControllerTestApi;
 }
 
 // MenuController -------------------------------------------------------------
 
 // MenuController is used internally by the various menu classes to manage
 // showing, selecting and drag/drop for menus. All relevant events are
 // forwarded to the MenuController from SubmenuView and MenuHost.
-class VIEWS_EXPORT MenuController : public WidgetObserver {
+class VIEWS_EXPORT MenuController
+    : public base::SupportsWeakPtr<MenuController>,
+      public WidgetObserver {
  public:
   // Enumeration of how the menu should exit.
   enum ExitType {
     // Don't exit.
     EXIT_NONE,
 
     // All menus, including nested, should be exited.
     EXIT_ALL,
 
     // Only the outermost menu should be exited.
@@ skipping 109 matching lines @@
 
   // Update the submenu's selection based on the current mouse location
   void UpdateSubmenuSelection(SubmenuView* source);
 
   // WidgetObserver overrides:
   void OnWidgetDestroying(Widget* widget) override;
 
   // Only used for testing.
   bool IsCancelAllTimerRunningForTest();
 
+  // Only used for testing. Clears |state_| and |pending_state_| without
+  // notifying any menu items.
+  void ClearStateForTest();
+
   // Only used for testing.
   static void TurnOffMenuSelectionHoldForTest();
 
  private:
   friend class internal::MenuRunnerImpl;
   friend class test::MenuControllerTest;
   friend class test::MenuControllerTestApi;
   friend class MenuHostRootView;
   friend class MenuItemView;
   friend class SubmenuView;
@@ skipping 499 matching lines @@
 #if defined(USE_AURA)
   std::unique_ptr<MenuPreTargetHandler> menu_pre_target_handler_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_