Remove crrev.com/82385 debug code added for crbug.com/78792.

Scott's crrev.com/83066 & crrev.com/83776 fix the root crbug.com/80392.

The debug code in question moved the crash callstack from:
views::MenuController::GetMenuPartByScreenCoordinate
ex/ http://crash/reportdetail?reportid=faa16e3bc5833288
Catching the freed object access earlier at:
views::SubmenuView::GetMenuItem
ex/ http://crash/reportdetail?reportid=353971611ff1a9a2
but crash/ doesn't show any similar callstacks at/after 13.0.749.0 (83125).

Please double check crash/, as I don't have much experience with it.

BUG=78792
TEST=none

Review URL: http://codereview.chromium.org/6935005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84142 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 2 insertions, 32 deletions

diff --git a/views/controls/menu/menu_host_root_view.cc b/views/controls/menu/menu_host_root_view.cc
index 061d682..e1c119f 100644
--- a/views/controls/menu/menu_host_root_view.cc
+++ b/views/controls/menu/menu_host_root_view.cc
@@ -13,23 +13,13 @@ MenuHostRootView::MenuHostRootView(Widget* widget,
                                    SubmenuView* submenu)
     : RootView(widget),
       submenu_(submenu),
-      forward_drag_to_menu_controller_(true),
-      destroyed_flag_ (NULL) {
-}
-
-MenuHostRootView::~MenuHostRootView() {
-  if(destroyed_flag_)
-    *destroyed_flag_ = true;
+      forward_drag_to_menu_controller_(true) {
 }
 
 bool MenuHostRootView::OnMousePressed(const MouseEvent& event) {
-  bool destroyed = false;
-  destroyed_flag_ = &destroyed;
   forward_drag_to_menu_controller_ =
       !GetLocalBounds().Contains(event.location()) ||
       !RootView::OnMousePressed(event);
-  CHECK(!destroyed);
-  destroyed_flag_ = NULL;
   if (forward_drag_to_menu_controller_ && GetMenuController())
     GetMenuController()->OnMousePressed(submenu_, event);
   return true;
diff --git a/views/controls/menu/menu_host_root_view.h b/views/controls/menu/menu_host_root_view.h
index 12e7cc9..32200c5 100644
--- a/views/controls/menu/menu_host_root_view.h
+++ b/views/controls/menu/menu_host_root_view.h
@@ -22,7 +22,6 @@ class SubmenuView;
 class MenuHostRootView : public RootView {
  public:
   MenuHostRootView(Widget* widget, SubmenuView* submenu);
-  ~MenuHostRootView();
 
   void ClearSubmenu() { submenu_ = NULL; }
 
@@ -43,11 +42,6 @@ class MenuHostRootView : public RootView {
   // Whether mouse dragged/released should be forwarded to the MenuController.
   bool forward_drag_to_menu_controller_;
 
-  // TODO(msw): Resolve crasher crbug.com/78792.
-  // If non-null the destructor sets this to true. This is set to non-null
-  // during RootView::OnMousePressed to detect unplanned destruction.
-  bool* destroyed_flag_;
-
   DISALLOW_COPY_AND_ASSIGN(MenuHostRootView);
 };
 
diff --git a/views/controls/menu/submenu_view.cc b/views/controls/menu/submenu_view.cc
index a0d3f12..cb72f93 100644
--- a/views/controls/menu/submenu_view.cc
+++ b/views/controls/menu/submenu_view.cc
@@ -21,10 +21,6 @@ const int kDropIndicatorHeight = 2;
 // Color of the drop indicator.
 const SkColor kDropIndicatorColor = SK_ColorBLACK;
 
-// TODO(msw): Resolve crasher crbug.com/78792.
-const int kMagicInitialized = 0x346292;
-const int kMagicDestroyed = 0x9932CD;
-
 }  // namespace
 
 namespace views {
@@ -41,23 +37,18 @@ SubmenuView::SubmenuView(MenuItemView* parent)
       drop_item_(NULL),
       drop_position_(MenuDelegate::DROP_NONE),
       scroll_view_container_(NULL),
-      max_accelerator_width_(0),
-      magic_token_(kMagicInitialized) {
+      max_accelerator_width_(0) {
   DCHECK(parent);
   // We'll delete ourselves, otherwise the ScrollView would delete us on close.
   set_parent_owned(false);
 }
 
 SubmenuView::~SubmenuView() {
-  CHECK_EQ(magic_token_, kMagicInitialized);
-
   // The menu may not have been closed yet (it will be hidden, but not
   // necessarily closed).
   Close();
 
   delete scroll_view_container_;
-
-  magic_token_ = kMagicDestroyed;
 }
 
 int SubmenuView::GetMenuItemCount() {
@@ -297,7 +288,6 @@ bool SubmenuView::SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
 }
 
 MenuItemView* SubmenuView::GetMenuItem() const {
-  CHECK_EQ(magic_token_, kMagicInitialized);
   return parent_menu_item_;
 }
 
@@ -321,7 +311,6 @@ bool SubmenuView::GetShowSelection(MenuItemView* item) {
 }
 
 MenuScrollViewContainer* SubmenuView::GetScrollViewContainer() {
-  CHECK_EQ(magic_token_, kMagicInitialized);
   if (!scroll_view_container_) {
     scroll_view_container_ = new MenuScrollViewContainer(this);
     // Otherwise MenuHost would delete us.
diff --git a/views/controls/menu/submenu_view.h b/views/controls/menu/submenu_view.h
index f0bed4a..bcc6aae 100644
--- a/views/controls/menu/submenu_view.h
+++ b/views/controls/menu/submenu_view.h
@@ -176,9 +176,6 @@ class SubmenuView : public View {
   // See description above getter.
   int max_accelerator_width_;
 
-  // TODO(msw): Resolve crasher crbug.com/78792.
-  int magic_token_;
-
   DISALLOW_COPY_AND_ASSIGN(SubmenuView);
 };