Revert of Stop MenuItemView From Directly Caching MenuController

ui/views/controls/menu/submenu_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/submenu_view.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "ui/accessibility/ax_node_data.h"
@@ skipping 436 matching lines @@
   if (!scroll_view_container_) {
     scroll_view_container_ = new MenuScrollViewContainer(this);
     // Otherwise MenuHost would delete us.
     scroll_view_container_->set_owned_by_client();
   }
   return scroll_view_container_;
 }
 
 void SubmenuView::MenuHostDestroyed() {
   host_ = NULL;
-  MenuController* controller = GetMenuItem()->GetMenuController();
-  if (controller)
-    controller->Cancel(MenuController::EXIT_DESTROYED);
+  GetMenuItem()->GetMenuController()->Cancel(MenuController::EXIT_DESTROYED);
 }
 
 const char* SubmenuView::GetClassName() const {
   return kViewClassName;
 }
 
 void SubmenuView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   SchedulePaint();
 }
 
@@ skipping 44 matching lines @@
   y = std::max(y, 0);
   gfx::Rect new_vis_bounds(x, y, vis_bounds.width(), vis_bounds.height());
   if (new_vis_bounds != vis_bounds) {
     ScrollRectToVisible(new_vis_bounds);
     return true;
   }
   return false;
 }
 
 }  // namespace views