Simplify the JavaScriptDialogManager.

content/shell/browser/shell_javascript_dialog_manager.h

 // 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.
 
 #ifndef CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
 #define CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
 
 #include <memory>
 
 #include "base/callback_forward.h"
@@ skipping 17 matching lines @@
                            JavaScriptMessageType javascript_message_type,
                            const base::string16& message_text,
                            const base::string16& default_prompt_text,
                            const DialogClosedCallback& callback,
                            bool* did_suppress_message) override;
 
   void RunBeforeUnloadDialog(WebContents* web_contents,
                              bool is_reload,
                              const DialogClosedCallback& callback) override;
 
-  void CancelActiveAndPendingDialogs(WebContents* web_contents) override;
-
-  void ResetDialogState(WebContents* web_contents) override;
+  void CancelDialogs(WebContents* web_contents,
+                     bool suppress_callbacks,
+                     bool reset_state) override;
 
   // Called by the ShellJavaScriptDialog when it closes.
   void DialogClosed(ShellJavaScriptDialog* dialog);
 
   // Used for content_browsertests.
   void set_dialog_request_callback(const base::Closure& callback) {
     dialog_request_callback_ = callback;
   }
   void set_should_proceed_on_beforeunload(bool proceed) {
     should_proceed_on_beforeunload_ = proceed;
@@ skipping 14 matching lines @@
   bool should_proceed_on_beforeunload_;
 
   DialogClosedCallback before_unload_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellJavaScriptDialogManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_