Fix crashes related to the extension uninstall dialog.

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

Index: chrome/browser/ui/webui/options/extension_settings_handler.h
diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.h b/chrome/browser/ui/webui/options/extension_settings_handler.h
index 3532e5d9c458a9ae0ef184376dfca5501b863493..ac30ed7afa666b00321b2298bfff77cac7cb52cb 100644
--- a/chrome/browser/ui/webui/options/extension_settings_handler.h
+++ b/chrome/browser/ui/webui/options/extension_settings_handler.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "chrome/browser/extensions/extension_install_ui.h"
-#include "chrome/browser/extensions/extension_uninstall_dialog.h"
+#include "chrome/browser/extensions/extension_uninstall_ui.h"
 #include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/browser/ui/webui/chrome_web_ui.h"
@@ -49,7 +49,7 @@ struct ExtensionPage {
 // Extension Settings UI handler.
 class ExtensionSettingsHandler : public OptionsPageUIHandler,
                                  public SelectFileDialog::Listener,
-                                 public ExtensionUninstallDialog::Delegate {
+                                 public ExtensionUninstallUI::Delegate {
  public:
   ExtensionSettingsHandler();
   virtual ~ExtensionSettingsHandler();
@@ -143,10 +143,10 @@ class ExtensionSettingsHandler : public OptionsPageUIHandler,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
-  // ExtensionUninstallDialog::Delegate implementation, used for receiving
+  // ExtensionUninstallUI::Delegate implementation, used for receiving
   // notification about uninstall confirmation dialog selections.
-  virtual void ExtensionDialogAccepted() OVERRIDE;
-  virtual void ExtensionDialogCanceled() OVERRIDE;
+  virtual void ExtensionUninstallAccepted() OVERRIDE;
+  virtual void ExtensionUninstallCanceled() OVERRIDE;
 
  private:
   // Helper that lists the current active html pages for an extension.
@@ -157,9 +157,9 @@ class ExtensionSettingsHandler : public OptionsPageUIHandler,
       const Extension* extension,
       std::vector<ExtensionPage> *result);
 
-  // Returns the ExtensionUninstallDialog object for this class, creating it if
+  // Returns the ExtensionUninstallUI object for this class, creating it if
   // needed.
-  ExtensionUninstallDialog* GetExtensionUninstallDialog();
+  ExtensionUninstallUI* GetExtensionUninstallUI();
 
   // Our model.  Outlives us since it's owned by our containing profile.
   ExtensionService* extension_service_;
@@ -168,7 +168,7 @@ class ExtensionSettingsHandler : public OptionsPageUIHandler,
   scoped_refptr<SelectFileDialog> load_extension_dialog_;
 
   // Used to show confirmation UI for uninstalling extensions in incognito mode.
-  scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_;
+  scoped_ptr<ExtensionUninstallUI> extension_uninstall_ui_;
 
   // The id of the extension we are prompting the user about.
   std::string extension_id_prompting_;