Fix crashes related to the extension uninstall dialog.

chrome/browser/extensions/extensions_ui.cc

Index: chrome/browser/extensions/extensions_ui.cc
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index ca435f7930d8a7e53aceb80cfea017b65b63351d..be0f49cbc399efa93363f80422e5fe3bcf0384aa 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -279,12 +279,12 @@ void ExtensionsDOMHandler::RegisterForNotifications() {
       NotificationService::AllSources());
 }
 
-ExtensionUninstallDialog* ExtensionsDOMHandler::GetExtensionUninstallDialog() {
-  if (!extension_uninstall_dialog_.get()) {
-    extension_uninstall_dialog_.reset(
-        new ExtensionUninstallDialog(Profile::FromWebUI(web_ui_)));
+ExtensionUninstallUI* ExtensionsDOMHandler::GetExtensionUninstallUI() {
+  if (!extension_uninstall_ui_.get()) {
+    extension_uninstall_ui_.reset(
+        new ExtensionUninstallUI(Profile::FromWebUI(web_ui_)));
   }
-  return extension_uninstall_dialog_.get();
+  return extension_uninstall_ui_.get();
 }
 
 void ExtensionsDOMHandler::HandleToggleDeveloperMode(const ListValue* args) {
@@ -413,10 +413,10 @@ void ExtensionsDOMHandler::HandleUninstallMessage(const ListValue* args) {
 
   extension_id_prompting_ = extension_id;
 
-  GetExtensionUninstallDialog()->ConfirmUninstall(this, extension);
+  GetExtensionUninstallUI()->ConfirmUninstall(this, extension);
 }
 
-void ExtensionsDOMHandler::ExtensionDialogAccepted() {
+void ExtensionsDOMHandler::ExtensionUninstallAccepted() {
   DCHECK(!extension_id_prompting_.empty());
 
   bool was_terminated = false;
@@ -443,7 +443,7 @@ void ExtensionsDOMHandler::ExtensionDialogAccepted() {
     HandleRequestExtensionsData(NULL);
 }
 
-void ExtensionsDOMHandler::ExtensionDialogCanceled() {
+void ExtensionsDOMHandler::ExtensionUninstallCanceled() {
   extension_id_prompting_ = "";
 }