Fix crashes related to the extension uninstall dialog.

chrome/browser/extensions/extension_context_menu_model.h

Index: chrome/browser/extensions/extension_context_menu_model.h
diff --git a/chrome/browser/extensions/extension_context_menu_model.h b/chrome/browser/extensions/extension_context_menu_model.h
index 9dbf8556e906c8d29dec126b0019c160be48c3f4..6e2f20b65ebd21a58e19018c752b8ffd53de1da8 100644
--- a/chrome/browser/extensions/extension_context_menu_model.h
+++ b/chrome/browser/extensions/extension_context_menu_model.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "chrome/browser/extensions/extension_uninstall_dialog.h"
+#include "chrome/browser/extensions/extension_uninstall_ui.h"
 #include "ui/base/models/simple_menu_model.h"
 
 class Browser;
@@ -22,7 +22,7 @@ class ExtensionContextMenuModel
     : public base::RefCounted<ExtensionContextMenuModel>,
       public ui::SimpleMenuModel,
       public ui::SimpleMenuModel::Delegate,
-      public ExtensionUninstallDialog::Delegate {
+      public ExtensionUninstallUI::Delegate {
  public:
   // Delegate to handle showing an ExtensionAction popup.
   class PopupDelegate {
@@ -51,9 +51,9 @@ class ExtensionContextMenuModel
                                           ui::Accelerator* accelerator);
   virtual void ExecuteCommand(int command_id);
 
-  // ExtensionUninstallDialog::Delegate:
-  virtual void ExtensionDialogAccepted();
-  virtual void ExtensionDialogCanceled();
+  // ExtensionUninstallUI::Delegate:
+  virtual void ExtensionUninstallAccepted();
+  virtual void ExtensionUninstallCanceled();
 
  private:
   void InitCommonCommands();
@@ -75,8 +75,8 @@ class ExtensionContextMenuModel
   // The delegate which handles the 'inspect popup' menu command (or NULL).
   PopupDelegate* delegate_;
 
-  // Keeps track of the extension uninstall dialog.
-  scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_;
+  // Keeps track of the extension uninstall ui.
+  scoped_ptr<ExtensionUninstallUI> extension_uninstall_ui_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionContextMenuModel);
 };