Reland Stop MenuItemView from directly caching MenuController

ui/views/controls/menu/menu_item_view.cc

Index: ui/views/controls/menu/menu_item_view.cc
diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc
index 556cb240d0954fe1ac6ac59156400ffb3d52e046..def351486fcbe17ab9c190afd63195ad8838630e 100644
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -435,11 +435,11 @@ const MenuItemView::MenuItemDimensions& MenuItemView::GetDimensions() const {
 }
 
 MenuController* MenuItemView::GetMenuController() {
-  return GetRootMenuItem()->controller_;
+  return GetRootMenuItem()->controller_.get();
 }
 
 const MenuController* MenuItemView::GetMenuController() const {
-  return GetRootMenuItem()->controller_;
+  return GetRootMenuItem()->controller_.get();
 }
 
 MenuDelegate* MenuItemView::GetDelegate() {