Revert MenuController Checks

ui/views/controls/menu/menu_runner_impl.cc

Index: ui/views/controls/menu/menu_runner_impl.cc
diff --git a/ui/views/controls/menu/menu_runner_impl.cc b/ui/views/controls/menu/menu_runner_impl.cc
index 0bb9486a2957e6b04276f0ae28d1b976de955c73..a247d5129bba444b463610ba9855590974ef70ae 100644
--- a/ui/views/controls/menu/menu_runner_impl.cc
+++ b/ui/views/controls/menu/menu_runner_impl.cc
@@ -69,15 +69,9 @@ void MenuRunnerImpl::Release() {
       controller_->Cancel(MenuController::EXIT_DESTROYED);
       return;
     }
-
-    // TODO(jonross): remove after tracking down the cause of
-    // (crbug.com/683087).
-    // Update for the ASAN stack trace to determine if we are in the running
-    // state during the incorrect destruction order.
-    delete this;
-  } else {
-    delete this;
   }
+
+  delete this;
 }
 
 MenuRunner::RunResult MenuRunnerImpl::RunMenuAt(Widget* parent,
@@ -92,12 +86,6 @@ MenuRunner::RunResult MenuRunnerImpl::RunMenuAt(Widget* parent,
     return MenuRunner::NORMAL_EXIT;
   }
 
-  // TODO(jonross): remove after tracking down the cause of (crbug.com/683087).
-  // Verify that this was not a delegate previously used for a run, which was
-  // shutdown, but not deleted. Nesting the same delegate multiple times is
-  // dangerous.
-  CHECK(!controller_);
-
   MenuController* controller = MenuController::GetActiveInstance();
   if (controller) {
     if ((run_types & MenuRunner::IS_NESTED) != 0) {
@@ -133,8 +121,6 @@ MenuRunner::RunResult MenuRunnerImpl::RunMenuAt(Widget* parent,
   if (!controller) {
     // No menus are showing, show one.
     controller = new MenuController(!for_drop_, this);
-    // TODO(jonross): remove after tracking down the cause of
-    // (crbug.com/683087).
     owns_controller_ = true;
   }
   controller->SetAsyncRun(async_);
@@ -204,9 +190,8 @@ MenuRunner::RunResult MenuRunnerImpl::MenuDone(NotifyType type,
     // We created the controller and need to delete it.
     delete controller_.get();
     owns_controller_ = false;
-    controller_ = nullptr;
   }
-
+  controller_ = nullptr;
   // Make sure all the windows we created to show the menus have been
   // destroyed.
   menu_->DestroyAllMenuHosts();