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

chrome/browser/ui/gtk/certificate_dialogs.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.
 
 // TODO(mattm): this isn't gtk specific, it shouldn't be under the gtk dir
 
 #include "chrome/browser/ui/gtk/certificate_dialogs.h"
 
 
 #include <vector>
@@ skipping 89 matching lines @@
     suggested_path = FilePath(cert_title);
 
   ShowCertSelectFileDialog(select_file_dialog_.get(),
                            SelectFileDialog::SELECT_SAVEAS_FILE,
                            suggested_path,
                            parent,
                            NULL);
 }
 
 Exporter::~Exporter() {
+  // 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();
+
   x509_certificate_model::DestroyCertChain(&cert_chain_list_);
 }
 
 void Exporter::FileSelected(const FilePath& path, int index, void* params) {
   std::string data;
   switch (index) {
     case 2:
       for (size_t i = 0; i < cert_chain_list_.size(); ++i)
         data += GetBase64String(cert_chain_list_[i]);
       break;
@@ skipping 54 matching lines @@
       type, string16(),
       suggested_path, &file_type_info, 1,
       FILE_PATH_LITERAL("crt"), parent,
       params);
 }
 
 void ShowCertExportDialog(gfx::NativeWindow parent,
                           net::X509Certificate::OSCertHandle cert) {
   new Exporter(parent, cert);
 }