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

chrome/browser/extensions/extension_bookmarks_module.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/extensions/extension_bookmarks_module.h"
 
 #include "base/file_path.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/time_formatting.h"
 #include "base/json/json_writer.h"
@@ skipping 781 matching lines @@
   BookmarksQuotaLimitFactory::Build<UpdateBookmarkFunction>(heuristics);
 };
 
 void CreateBookmarkFunction::GetQuotaLimitHeuristics(
     QuotaLimitHeuristics* heuristics) const {
   BookmarksQuotaLimitFactory::BuildForCreate(heuristics, profile());
 }
 
 BookmarksIOFunction::BookmarksIOFunction() {}
 
-BookmarksIOFunction::~BookmarksIOFunction() {}
+BookmarksIOFunction::~BookmarksIOFunction() {
+  // 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();
+}
 
 void BookmarksIOFunction::SelectFile(SelectFileDialog::Type type) {
   // Balanced in one of the three callbacks of SelectFileDialog:
   // either FileSelectionCanceled, MultiFilesSelected, or FileSelected
   AddRef();
   select_file_dialog_ = SelectFileDialog::Create(this);
   SelectFileDialog::FileTypeInfo file_type_info;
   file_type_info.extensions.resize(1);
   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html"));
 
@@ skipping 49 matching lines @@
   SelectFile(SelectFileDialog::SELECT_SAVEAS_FILE);
   return true;
 }
 
 void ExportBookmarksFunction::FileSelected(const FilePath& path,
                                            int index,
                                            void* params) {
   bookmark_html_writer::WriteBookmarks(profile(), path, NULL);
   Release();  // Balanced in BookmarksIOFunction::SelectFile()
 }