Fix crashes related to the extension uninstall dialog.

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

Index: chrome/browser/ui/webui/options/extension_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc
index a9cd9005595c5f73a70f9060da0ca47eee6bb0ff..b8799cdb3906f5624d0c32efaec8699ef5bb0653 100644
--- a/chrome/browser/ui/webui/options/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc
@@ -206,13 +206,13 @@ void ExtensionSettingsHandler::MaybeRegisterForNotifications() {
       NotificationService::AllSources());
 }
 
-ExtensionUninstallDialog*
-ExtensionSettingsHandler::GetExtensionUninstallDialog() {
-  if (!extension_uninstall_dialog_.get()) {
-    extension_uninstall_dialog_.reset(
-        new ExtensionUninstallDialog(Profile::FromWebUI(web_ui_)));
+ExtensionUninstallUI*
+ExtensionSettingsHandler::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 ExtensionSettingsHandler::HandleToggleDeveloperMode(
@@ -345,10 +345,10 @@ void ExtensionSettingsHandler::HandleUninstallMessage(const ListValue* args) {
 
   extension_id_prompting_ = extension_id;
 
-  GetExtensionUninstallDialog()->ConfirmUninstall(this, extension);
+  GetExtensionUninstallUI()->ConfirmUninstall(this, extension);
 }
 
-void ExtensionSettingsHandler::ExtensionDialogAccepted() {
+void ExtensionSettingsHandler::ExtensionUninstallAccepted() {
   DCHECK(!extension_id_prompting_.empty());
 
   bool was_terminated = false;
@@ -376,7 +376,7 @@ void ExtensionSettingsHandler::ExtensionDialogAccepted() {
     HandleRequestExtensionsData(NULL);
 }
 
-void ExtensionSettingsHandler::ExtensionDialogCanceled() {
+void ExtensionSettingsHandler::ExtensionUninstallCanceled() {
   extension_id_prompting_ = "";
 }