Simplify the JavaScriptDialogManager.

chrome/browser/extensions/content_script_apitest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 158 matching lines @@
 
   dialog_manager_ =
       web_contents_->GetDelegate()->GetJavaScriptDialogManager(web_contents_);
 }
 
 DialogHelper::~DialogHelper() {
   client_->set_helper(nullptr);
 }
 
 void DialogHelper::CloseDialogs() {
-  dialog_manager_->CancelActiveAndPendingDialogs(web_contents_);
+  dialog_manager_->CancelDialogs(web_contents_, false, false);
 }
 
 void DialogHelper::DialogOpened() {
   ++dialog_count_;
   if (!quit_closure_.is_null()) {
     quit_closure_.Run();
     quit_closure_ = base::Closure();
   }
 }
 
@@ skipping 470 matching lines @@
   ExtensionTestMessageListener iframe_loaded_listener("iframe loaded", false);
   ExtensionTestMessageListener content_script_listener("script injected",
                                                        false);
   LoadExtension(data_dir.AppendASCII("script_a_com"));
   LoadExtension(data_dir.AppendASCII("background_page_iframe"));
   iframe_loaded_listener.WaitUntilSatisfied();
   EXPECT_FALSE(content_script_listener.was_satisfied());
 }
 
 }  // namespace extensions