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

chrome/browser/extensions/extensions_ui.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/extensions_ui.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/callback.h"
@@ skipping 829 matching lines @@
     } else if (!extension->web_extent().ContainsURL(url)) {
       continue;
     }
 
     result->push_back(ExtensionPage(url, process->id(), host->routing_id(),
                                     process->profile()->IsOffTheRecord()));
   }
 }
 
 ExtensionsDOMHandler::~ExtensionsDOMHandler() {
+  // 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 (load_extension_dialog_.get())
+    load_extension_dialog_->ListenerDestroyed();
+
   if (pack_job_.get())
     pack_job_->ClearClient();
 
   registrar_.RemoveAll();
 }
 
 // ExtensionsDOMHandler, public: -----------------------------------------------
 
 ExtensionsUI::ExtensionsUI(TabContents* contents) : WebUI(contents) {
   ExtensionService *exstension_service =
@@ skipping 12 matching lines @@
 // static
 RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_PLUGIN);
 }
 
 // static
 void ExtensionsUI::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode, false);
 }