How to fix WebContentsImplBrowserTest.NoResetOnBeforeUnloadCanceledOnCommit.

content/shell/browser/shell_javascript_dialog_manager.cc

 // Copyright 2013 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 "content/shell/browser/shell_javascript_dialog_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/web_contents.h"
 #include "content/shell/browser/shell_javascript_dialog.h"
 #include "content/shell/common/shell_switches.h"
 
 namespace content {
 
-ShellJavaScriptDialogManager::ShellJavaScriptDialogManager()
-    : should_proceed_on_beforeunload_(true) {}
+ShellJavaScriptDialogManager::ShellJavaScriptDialogManager() {}
 
-ShellJavaScriptDialogManager::~ShellJavaScriptDialogManager() {
-}
+ShellJavaScriptDialogManager::~ShellJavaScriptDialogManager() {}
 
 void ShellJavaScriptDialogManager::RunJavaScriptDialog(
     WebContents* web_contents,
     const GURL& origin_url,
     JavaScriptDialogType dialog_type,
     const base::string16& message_text,
     const base::string16& default_prompt_text,
     const DialogClosedCallback& callback,
     bool* did_suppress_message) {
   if (!dialog_request_callback_.is_null()) {
@@ skipping 24 matching lines @@
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
   *did_suppress_message = true;
   return;
 #endif
 }
 
 void ShellJavaScriptDialogManager::RunBeforeUnloadDialog(
     WebContents* web_contents,
     bool is_reload,
     const DialogClosedCallback& callback) {
-  // During tests, if the BeforeUnload should not proceed automatically, store
-  // the callback and return.
   if (!dialog_request_callback_.is_null()) {
     dialog_request_callback_.Run();
-    if (should_proceed_on_beforeunload_)
-      callback.Run(true, base::string16());
-    else
-      before_unload_callback_ = callback;
+    callback.Run(true, base::string16());
     dialog_request_callback_.Reset();
     return;
   }
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
   if (dialog_) {
     // Seriously!?
     callback.Run(true, base::string16());
     return;
   }
@@ skipping 17 matching lines @@
 void ShellJavaScriptDialogManager::CancelDialogs(WebContents* web_contents,
                                                  bool reset_state) {
 #if defined(OS_MACOSX) || defined(OS_WIN)
   if (dialog_) {
     dialog_->Cancel();
     dialog_.reset();
   }
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
 #endif
-
-  if (before_unload_callback_.is_null())
-    return;
-
-  if (reset_state) {
-    before_unload_callback_.Run(false, base::string16());
-    before_unload_callback_.Reset();
-  }
 }
 
 void ShellJavaScriptDialogManager::DialogClosed(ShellJavaScriptDialog* dialog) {
 #if defined(OS_MACOSX) || defined(OS_WIN)
   DCHECK_EQ(dialog, dialog_.get());
   dialog_.reset();
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
 #endif
 }
 
 }  // namespace content