Revert of Stop MenuItemView From Directly Caching MenuController

ui/views/controls/menu/menu_item_view.cc

 // 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.
 
 #include "ui/views/controls/menu/menu_item_view.h"
 
 #include <stddef.h>
 
 #include "base/i18n/case_conversion.h"
 #include "base/macros.h"
@@ skipping 417 matching lines @@
 }
 
 const MenuItemView::MenuItemDimensions& MenuItemView::GetDimensions() const {
   if (!is_dimensions_valid())
     dimensions_ = CalculateDimensions();
   DCHECK(is_dimensions_valid());
   return dimensions_;
 }
 
 MenuController* MenuItemView::GetMenuController() {
-  return GetRootMenuItem()->controller_.get();
+  return GetRootMenuItem()->controller_;
 }
 
 const MenuController* MenuItemView::GetMenuController() const {
-  return GetRootMenuItem()->controller_.get();
+  return GetRootMenuItem()->controller_;
 }
 
 MenuDelegate* MenuItemView::GetDelegate() {
   return GetRootMenuItem()->delegate_;
 }
 
 const MenuDelegate* MenuItemView::GetDelegate() const {
   return GetRootMenuItem()->delegate_;
 }
 
@@ skipping 614 matching lines @@
     } else {
       const Type& type = menu_item->GetType();
       if (type == CHECKBOX || type == RADIO)
         return true;
     }
   }
   return false;
 }
 
 }  // namespace views