Fix crashes related to the extension uninstall dialog.

chrome/browser/extensions/extensions_ui.h

Index: chrome/browser/extensions/extensions_ui.h
diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h
index 37e27c77a8c921c12d17b68179d8220bfabda7fd..c7304402da2f78b99f33a9b5b7a887fa91d84b07 100644
--- a/chrome/browser/extensions/extensions_ui.h
+++ b/chrome/browser/extensions/extensions_ui.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/extensions/extension_uninstall_dialog.h"
+#include "chrome/browser/extensions/extension_uninstall_ui.h"
 #include "chrome/browser/extensions/pack_extension_job.h"
 #include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
@@ -50,7 +50,7 @@ class ExtensionsDOMHandler : public WebUIMessageHandler,
                              public NotificationObserver,
                              public PackExtensionJob::Client,
                              public SelectFileDialog::Listener,
-                             public ExtensionUninstallDialog::Delegate {
+                             public ExtensionUninstallUI::Delegate {
  public:
   explicit ExtensionsDOMHandler(ExtensionService* extension_service);
   virtual ~ExtensionsDOMHandler();
@@ -74,8 +74,8 @@ class ExtensionsDOMHandler : public WebUIMessageHandler,
   virtual void OnPackFailure(const std::string& error) OVERRIDE;
 
   // ExtensionUninstallDialog::Delegate:
-  virtual void ExtensionDialogAccepted() OVERRIDE;
-  virtual void ExtensionDialogCanceled() OVERRIDE;
+  virtual void ExtensionUninstallAccepted() OVERRIDE;
+  virtual void ExtensionUninstallCanceled() OVERRIDE;
 
  private:
   // Callback for "requestExtensionsData" message.
@@ -152,9 +152,9 @@ class ExtensionsDOMHandler : public WebUIMessageHandler,
       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* const extension_service_;
@@ -166,7 +166,7 @@ class ExtensionsDOMHandler : public WebUIMessageHandler,
   scoped_refptr<PackExtensionJob> pack_job_;
 
   // 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_;