Change MenuControllerDelegate to provide WeakPtr

ui/views/controls/menu/menu_runner_unittest.cc

 // Copyright 2015 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 "ui/views/controls/menu/menu_runner.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 402 matching lines @@
   // controller that it created.
   menu_runner->Release();
 
   // This is not expected to run, however this is from the origin ASAN stack
   // traces. So regressions will be caught with the same stack trace.
   if (menu_controller.controller())
     menu_controller.controller()->CancelAll();
   EXPECT_EQ(nullptr, menu_controller.controller());
 }
 
+// Tests that if a delegate is destroyed, while a menu is still running, that
+// subsequent shutdown of the menu does not attempt to notify it. This should
+// not crash on ASAN bots.
+TEST_F(MenuRunnerImplTest, NestedDelegateDestroyedWhileMenuRunning) {
+  internal::MenuRunnerImpl* menu_runner =
+      new internal::MenuRunnerImpl(menu_item_view());
+  EXPECT_EQ(MenuRunner::NORMAL_EXIT,
+            menu_runner->RunMenuAt(owner(), nullptr, gfx::Rect(),
+                                   MENU_ANCHOR_TOPLEFT, MenuRunner::ASYNC));
+
+  std::unique_ptr<TestMenuDelegate> menu_delegate2(new TestMenuDelegate);
+  MenuItemView* menu_item_view2 = new MenuItemView(menu_delegate2.get());
+  menu_item_view2->AppendMenuItemWithLabel(1, base::ASCIIToUTF16("One"));
+
+  internal::MenuRunnerImpl* menu_runner2 =
+      new internal::MenuRunnerImpl(menu_item_view2);
+  EXPECT_EQ(MenuRunner::NORMAL_EXIT,
+            menu_runner2->RunMenuAt(owner(), nullptr, gfx::Rect(),
+                                    MENU_ANCHOR_TOPLEFT,
+                                    MenuRunner::ASYNC | MenuRunner::IS_NESTED));
+
+  // Nested delegate closed while the MenuController is still showing
+  menu_runner2->OnMenuClosed(internal::MenuControllerDelegate::NOTIFY_DELEGATE,
+                             nullptr, 0);
+
+  // Nested delegate is deleted while not running/
+  menu_runner2->Release();
+
+  // Closing the full menu stack should not attempt to tell a delegate which
+  // has been otherwise destroyed.
+  MenuControllerTestApi menu_controller;
+  menu_controller.ClearState();
+  menu_controller.controller()->CancelAll();
+}
+
 }  // namespace test
 }  // namespace views