Merge 79507 - Before object destruction, make sure that its select dialogs are told that we

chrome/browser/ui/webui/options/certificate_manager_handler.cc

 // Copyright (c) 2011 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/webui/options/certificate_manager_handler.h"
 
 #include "base/file_util.h"  // for FileAccessProvider
 #include "base/safe_strerror_posix.h"
 #include "base/scoped_vector.h"
 #include "base/string_number_conversions.h"
@@ skipping 663 matching lines @@
 void CertificateManagerHandler::CancelImportExportProcess(
     const ListValue* args) {
   ImportExportCleanup();
 }
 
 void CertificateManagerHandler::ImportExportCleanup() {
   file_path_.clear();
   password_.clear();
   file_data_.clear();
   selected_cert_list_.clear();
+  module_ = NULL;
+
+  // There may be pending file dialogs, we need to tell them that we've gone
+  // away so they don't try and call back to us.
+  if (select_file_dialog_.get())
+    select_file_dialog_->ListenerDestroyed();
   select_file_dialog_ = NULL;
-  module_ = NULL;
 }
 
 void CertificateManagerHandler::ImportServer(const ListValue* args) {
   select_file_dialog_ = SelectFileDialog::Create(this);
   ShowCertSelectFileDialog(
       select_file_dialog_.get(),
       SelectFileDialog::SELECT_OPEN_FILE,
       FilePath(),
       GetParentWindow(),
       reinterpret_cast<void*>(IMPORT_SERVER_FILE_SELECTED));
@@ skipping 244 matching lines @@
   StringValue error_value(error);
   web_ui_->CallJavascriptFunction(L"CertificateImportErrorOverlay.show",
                                   title_value,
                                   error_value,
                                   cert_error_list);
 }
 
 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
   return web_ui_->tab_contents()->view()->GetTopLevelNativeWindow();
 }