Refactoring ExtenionInstallUI to abstract the Browser references.

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

Index: chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm
index 167eff54d75890bda187804f2922df6795fd83af..4ddb9dba37c45af923a37205c6983ad440a1785f 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm
@@ -13,7 +13,7 @@
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#import "chrome/browser/extensions/extension_install_ui.h"
+#import "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h"
 #include "chrome/common/chrome_paths.h"
@@ -78,15 +78,16 @@ public:
 };
 
 
-// Mock out the ExtensionInstallUI::Delegate interface so we can ensure the
+// Mock out the ExtensionInstallPrompt::Delegate interface so we can ensure the
 // dialog is interacting with it correctly.
-class MockExtensionInstallUIDelegate : public ExtensionInstallUI::Delegate {
+class MockExtensionInstallPromptDelegate
+    : public ExtensionInstallPrompt::Delegate {
  public:
-  MockExtensionInstallUIDelegate()
+  MockExtensionInstallPromptDelegate()
       : proceed_count_(0),
         abort_count_(0) {}
 
-  // ExtensionInstallUI::Delegate overrides.
+  // ExtensionInstallPrompt::Delegate overrides.
   virtual void InstallUIProceed() OVERRIDE {
     proceed_count_++;
   }
@@ -106,9 +107,9 @@ class MockExtensionInstallUIDelegate : public ExtensionInstallUI::Delegate {
 // Test that we can load the two kinds of prompts correctly, that the outlets
 // are hooked up, and that the dialog calls cancel when cancel is pressed.
 TEST_F(ExtensionInstallDialogControllerTest, BasicsNormalCancel) {
-  MockExtensionInstallUIDelegate delegate;
+  MockExtensionInstallPromptDelegate delegate;
 
-  ExtensionInstallUI::Prompt prompt(ExtensionInstallUI::INSTALL_PROMPT);
+  ExtensionInstallPrompt::Prompt prompt(ExtensionInstallPrompt::INSTALL_PROMPT);
   std::vector<string16> permissions;
   permissions.push_back(UTF8ToUTF16("warning 1"));
   prompt.SetPermissions(permissions);
@@ -161,9 +162,10 @@ TEST_F(ExtensionInstallDialogControllerTest, BasicsNormalCancel) {
 
 
 TEST_F(ExtensionInstallDialogControllerTest, BasicsNormalOK) {
-  MockExtensionInstallUIDelegate delegate;
+  MockExtensionInstallPromptDelegate delegate;
 
-  ExtensionInstallUI::Prompt prompt(ExtensionInstallUI::INSTALL_PROMPT);
+  ExtensionInstallPrompt::Prompt prompt(
+      ExtensionInstallPrompt::INSTALL_PROMPT);
   std::vector<string16> permissions;
   permissions.push_back(UTF8ToUTF16("warning 1"));
   prompt.SetPermissions(permissions);
@@ -187,19 +189,19 @@ TEST_F(ExtensionInstallDialogControllerTest, BasicsNormalOK) {
 // Test that controls get repositioned when there are two warnings vs one
 // warning.
 TEST_F(ExtensionInstallDialogControllerTest, MultipleWarnings) {
-  MockExtensionInstallUIDelegate delegate1;
-  MockExtensionInstallUIDelegate delegate2;
+  MockExtensionInstallPromptDelegate delegate1;
+  MockExtensionInstallPromptDelegate delegate2;
 
-  ExtensionInstallUI::Prompt one_warning_prompt(
-      ExtensionInstallUI::INSTALL_PROMPT);
+  ExtensionInstallPrompt::Prompt one_warning_prompt(
+      ExtensionInstallPrompt::INSTALL_PROMPT);
   std::vector<string16> permissions;
   permissions.push_back(UTF8ToUTF16("warning 1"));
   one_warning_prompt.SetPermissions(permissions);
   one_warning_prompt.set_extension(extension_.get());
   one_warning_prompt.set_icon(icon_);
 
-  ExtensionInstallUI::Prompt two_warnings_prompt(
-      ExtensionInstallUI::INSTALL_PROMPT);
+  ExtensionInstallPrompt::Prompt two_warnings_prompt(
+      ExtensionInstallPrompt::INSTALL_PROMPT);
   permissions.push_back(UTF8ToUTF16("warning 2"));
   two_warnings_prompt.SetPermissions(permissions);
   two_warnings_prompt.set_extension(extension_.get());
@@ -242,11 +244,11 @@ TEST_F(ExtensionInstallDialogControllerTest, MultipleWarnings) {
 // Test that we can load the skinny prompt correctly, and that the outlets are
 // are hooked up.
 TEST_F(ExtensionInstallDialogControllerTest, BasicsSkinny) {
-  MockExtensionInstallUIDelegate delegate;
+  MockExtensionInstallPromptDelegate delegate;
 
   // No warnings should trigger skinny prompt.
-  ExtensionInstallUI::Prompt no_warnings_prompt(
-      ExtensionInstallUI::INSTALL_PROMPT);
+  ExtensionInstallPrompt::Prompt no_warnings_prompt(
+      ExtensionInstallPrompt::INSTALL_PROMPT);
   no_warnings_prompt.set_extension(extension_.get());
   no_warnings_prompt.set_icon(icon_);
 
@@ -287,11 +289,11 @@ TEST_F(ExtensionInstallDialogControllerTest, BasicsSkinny) {
 // Test that we can load the inline prompt correctly, and that the outlets are
 // are hooked up.
 TEST_F(ExtensionInstallDialogControllerTest, BasicsInline) {
-  MockExtensionInstallUIDelegate delegate;
+  MockExtensionInstallPromptDelegate delegate;
 
   // No warnings should trigger skinny prompt.
-  ExtensionInstallUI::Prompt inline_prompt(
-      ExtensionInstallUI::INLINE_INSTALL_PROMPT);
+  ExtensionInstallPrompt::Prompt inline_prompt(
+      ExtensionInstallPrompt::INLINE_INSTALL_PROMPT);
   inline_prompt.SetInlineInstallWebstoreData("1,000", 3.5, 200);
   inline_prompt.set_extension(extension_.get());
   inline_prompt.set_icon(icon_);