Merge Prevent nested Menu Cancelling

ui/views/controls/menu/menu_runner_impl.h

Index: ui/views/controls/menu/menu_runner_impl.h
diff --git a/ui/views/controls/menu/menu_runner_impl.h b/ui/views/controls/menu/menu_runner_impl.h
index 8312f428e040741f0ab610aedbe22f3fa396de50..83c4723d9af67b908be3e2f5ab7d82fbfe134455 100644
--- a/ui/views/controls/menu/menu_runner_impl.h
+++ b/ui/views/controls/menu/menu_runner_impl.h
@@ -23,6 +23,12 @@ class MenuController;
 class MenuDelegate;
 class MenuItemView;
 
+namespace test {
+
+class MenuRunnerDestructionTest;
+
+}  // namespace test
+
 namespace internal {
 
 // A menu runner implementation that uses views::MenuItemView to show a menu.
@@ -49,6 +55,8 @@ class VIEWS_EXPORT MenuRunnerImpl
   void SiblingMenuCreated(MenuItemView* menu) override;
 
  private:
+  friend class ::views::test::MenuRunnerDestructionTest;
+
   ~MenuRunnerImpl() override;
 
   // Cleans up after the menu is no longer showing. |result| is the menu that