Revert of Stop MenuItemView From Directly Caching MenuController

ui/views/controls/menu/menu_item_view.h

Index: ui/views/controls/menu/menu_item_view.h
diff --git a/ui/views/controls/menu/menu_item_view.h b/ui/views/controls/menu/menu_item_view.h
index c375343698b9ff56022b404f0b505ed7ef9b1cf7..ec8aa982884f35ea139c0994dc608b08d83d62d2 100644
--- a/ui/views/controls/menu/menu_item_view.h
+++ b/ui/views/controls/menu/menu_item_view.h
@@ -11,13 +11,11 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "ui/base/models/menu_separator_types.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/menu/menu_config.h"
-#include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_types.h"
 #include "ui/views/view.h"
 
@@ -414,12 +412,7 @@
     actual_menu_position_ = actual_menu_position;
   }
 
-  void set_controller(MenuController* controller) {
-    if (controller)
-      controller_ = controller->AsWeakPtr();
-    else
-      controller_.reset();
-  }
+  void set_controller(MenuController* controller) { controller_ = controller; }
 
   // Returns true if this MenuItemView contains a single child
   // that is responsible for rendering the content.
@@ -443,7 +436,7 @@
   MenuDelegate* delegate_;
 
   // The controller for the run operation, or NULL if the menu isn't showing.
-  base::WeakPtr<MenuController> controller_;
+  MenuController* controller_;
 
   // Used to detect when Cancel was invoked.
   bool canceled_;