Simplify the JavaScriptDialogManager.

chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc

 // Copyright 2016 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 "chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.h"
 
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 127 matching lines @@
     const base::string16* prompt_override) {
   if (!IsEnabled()) {
     return AppModalDialogManager()->HandleJavaScriptDialog(web_contents, accept,
                                                            prompt_override);
   }
 
   NOTREACHED() << "auto-dismissing dialog code does not yet exist";
   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);
+  if (!IsEnabled()) {
+    return AppModalDialogManager()->CancelDialogs(
+        web_contents, suppress_callbacks, reset_state);
+  }
 
   // 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);
-
-  // More work here for the auto-dismissing dialogs.
-}