Fix crashes related to the extension uninstall dialog.

chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm

Index: chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
index 23119f265acc8032821383f3f5a49bfcf6d3230e..b8780bb86ec02ef09f119ea419388c8397500ddd 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
@@ -8,7 +8,7 @@
 #include "base/task.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
-#include "chrome/browser/extensions/extension_uninstall_dialog.h"
+#include "chrome/browser/extensions/extension_uninstall_ui.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -35,23 +35,23 @@
 // A class that loads the extension icon on the I/O thread before showing the
 // confirmation dialog to uninstall the given extension.
 // Also acts as the extension's UI delegate in order to display the dialog.
-class AsyncUninstaller : public ExtensionUninstallDialog::Delegate {
+class AsyncUninstaller : public ExtensionUninstallUI::Delegate {
  public:
   AsyncUninstaller(const Extension* extension, Profile* profile)
       : extension_(extension),
         profile_(profile) {
-    extension_uninstall_dialog_.reset(new ExtensionUninstallDialog(profile));
-    extension_uninstall_dialog_->ConfirmUninstall(this, extension_);
+    extension_uninstall_ui_.reset(new ExtensionUninstallUI(profile));
+    extension_uninstall_ui_->ConfirmUninstall(this, extension_);
   }
 
   ~AsyncUninstaller() {}
 
-  // ExtensionUninstallDialog::Delegate:
-  virtual void ExtensionDialogAccepted() {
+  // ExtensionUninstallUI::Delegate:
+  virtual void ExtensionUninstallAccepted() {
     profile_->GetExtensionService()->
         UninstallExtension(extension_->id(), false, NULL);
   }
-  virtual void ExtensionDialogCanceled() {}
+  virtual void ExtensionUninstallCanceled() {}
 
  private:
   // The extension that we're loading the icon for. Weak.
@@ -60,7 +60,7 @@ class AsyncUninstaller : public ExtensionUninstallDialog::Delegate {
   // The current profile. Weak.
   Profile* profile_;
 
-  scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_;
+  scoped_ptr<ExtensionUninstallUI> extension_uninstall_ui_;
 
   DISALLOW_COPY_AND_ASSIGN(AsyncUninstaller);
 };