Fix MenuRunner Releasing

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 execute_command_id() const { return execute_command_id_; }
@@ skipping 23 matching lines @@
 
   // The values of the last call to OnMenuClosed.
   MenuItemView* on_menu_closed_menu_;
   MenuRunner::RunResult on_menu_closed_run_result_;
 
   bool on_perform_drop_called_;
 
   DISALLOW_COPY_AND_ASSIGN(TestMenuDelegate);
 };
 
-// Test api which can be used to hide the active MenuController, without
-// performing normal shutdown.
+// Test api which caches the currently active MenuController. Can be used to
+// toggle visibility, and to clear seletion states, without performing full
+// shutdown. This is used to simulate menus with varing states, such as during
+// drags, without performing the entire operation. Used to test strange shutdown
+// ordering.
 class MenuControllerTestApi {
  public:
   MenuControllerTestApi();
   ~MenuControllerTestApi();
 
-  // Tells the active MenuController to consider itself not showing.
-  void Hide();
+  MenuController* controller() { return controller_.get(); };
+
+  // Clears out the current and pending states, without notifying the associated
+  // menu items.
+  void ClearState();
+
+  // Toggles the internal showing state of |controller_| without attempting
+  // to change associated Widgets.
+  void SetShowing(bool showing);
 
  private:
+  base::WeakPtr<MenuController> controller_;
+
   DISALLOW_COPY_AND_ASSIGN(MenuControllerTestApi);
 };
 
 }  // namespace test
 }  // namespace views
 
 #endif  // UI_VIEWS_TEST_MENU_TEST_UTILS_H_