Simplify the JavaScriptDialogManager.

chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc

Index: chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc
diff --git a/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc b/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc
index 9f55898589b88c1c90e3bfc3e408c36792e01483..4abd35a0aff6e0b6d4d828970a122d7070a912f3 100644
--- a/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc
+++ b/chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc
@@ -145,19 +145,15 @@ bool JavaScriptDialogTabHelper::HandleJavaScriptDialog(
   return false;
 }
 
-void JavaScriptDialogTabHelper::CancelActiveAndPendingDialogs(
-    content::WebContents* web_contents) {
+void JavaScriptDialogTabHelper::CancelDialogs(
+    content::WebContents* web_contents,
+    bool suppress_callbacks,
+    bool reset_state) {
   // Cancel any app-modal dialogs that may be going.
-  AppModalDialogManager()->CancelActiveAndPendingDialogs(web_contents);
-
-  // More work here for the auto-dismissing dialogs.
-}
-
-void JavaScriptDialogTabHelper::ResetDialogState(
-    content::WebContents* web_contents) {
-  // Reset any app-modal dialog state that may exist.
-  if (!IsEnabled())
-    return AppModalDialogManager()->ResetDialogState(web_contents);
+  if (!IsEnabled()) {
+    return AppModalDialogManager()->CancelDialogs(
+        web_contents, suppress_callbacks, reset_state);
+  }
 
   // More work here for the auto-dismissing dialogs.
 }