[Refactor] Move creating a browser if necessary to ExtensionInstallDialogView

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "chrome/browser/extensions/extension_install_prompt.h"
@@ skipping 30 matching lines @@
 
   std::vector<base::string16> permissions;
   permissions.push_back(base::UTF8ToUTF16("warning 1"));
   prompt->SetPermissions(permissions, type);
   // No details provided with this permission.
   std::vector<base::string16> details;
   details.push_back(base::string16());
   prompt->SetPermissionsDetails(details, type);
 
   base::scoped_nsobject<ExtensionInstallViewController> controller(
-      [[ExtensionInstallViewController alloc] initWithNavigator:browser()
-                                                       delegate:&delegate
-                                                         prompt:prompt]);
+      [[ExtensionInstallViewController alloc] initWithProfile:profile()
+                                                    navigator:browser()
+                                                     delegate:&delegate
+                                                       prompt:prompt]);
 
   [controller view];  // Force nib load.
 
   // Test the right nib loaded.
   EXPECT_NSEQ(@"ExtensionInstallPrompt", [controller nibName]);
 
   // Check all the controls.
   // Make sure everything is non-nil, and that the fields that are
   // auto-translated don't start with a caret (that would indicate that they
   // were not translated).
@@ skipping 35 matching lines @@
 
   std::vector<base::string16> permissions;
   permissions.push_back(base::UTF8ToUTF16("warning 1"));
   prompt->SetPermissions(permissions, type);
   // No details provided with this permission.
   std::vector<base::string16> details;
   details.push_back(base::string16());
   prompt->SetPermissionsDetails(details, type);
 
   base::scoped_nsobject<ExtensionInstallViewController> controller(
-      [[ExtensionInstallViewController alloc] initWithNavigator:browser()
-                                                       delegate:&delegate
-                                                         prompt:prompt]);
+      [[ExtensionInstallViewController alloc] initWithProfile:profile()
+                                                    navigator:browser()
+                                                     delegate:&delegate
+                                                       prompt:prompt]);
 
   [controller view];  // Force nib load.
   [controller ok:nil];
 
   EXPECT_EQ(0, delegate.abort_count());
   EXPECT_EQ(1, delegate.proceed_count());
 }
 
 // Test that controls get repositioned when there are two warnings vs one
 // warning.
@@ skipping 17 matching lines @@
   scoped_refptr<ExtensionInstallPrompt::Prompt> two_warnings_prompt =
       chrome::BuildExtensionInstallPrompt(extension_.get());
   permissions.push_back(base::UTF8ToUTF16("warning 2"));
   two_warnings_prompt->SetPermissions(permissions, type);
   // No details provided with this permission.
   details.push_back(base::string16());
   two_warnings_prompt->SetPermissionsDetails(details, type);
 
   base::scoped_nsobject<ExtensionInstallViewController> controller1(
       [[ExtensionInstallViewController alloc]
-          initWithNavigator:browser()
-                   delegate:&delegate1
-                     prompt:one_warning_prompt]);
+          initWithProfile:profile()
+                navigator:browser()
+                 delegate:&delegate1
+                   prompt:one_warning_prompt]);
 
   [controller1 view];  // Force nib load.
 
   base::scoped_nsobject<ExtensionInstallViewController> controller2(
       [[ExtensionInstallViewController alloc]
-          initWithNavigator:browser()
-                   delegate:&delegate2
-                     prompt:two_warnings_prompt]);
+          initWithProfile:profile()
+                navigator:browser()
+                 delegate:&delegate2
+                   prompt:two_warnings_prompt]);
 
   [controller2 view];  // Force nib load.
 
   // Test control positioning. We don't test exact positioning because we don't
   // want this to depend on string details and localization. But we do know the
   // relative effect that adding a second warning should have on the layout.
   ASSERT_LT([[controller1 view] frame].size.height,
             [[controller2 view] frame].size.height);
 
   ASSERT_LT([[controller1 view] frame].size.height,
             [[controller2 view] frame].size.height);
 }
 
 // Test that we can load the skinny prompt correctly, and that the outlets are
 // are hooked up.
 TEST_F(ExtensionInstallViewControllerTest, BasicsSkinny) {
   chrome::MockExtensionInstallPromptDelegate delegate;
 
   // No warnings should trigger skinny prompt.
   scoped_refptr<ExtensionInstallPrompt::Prompt> no_warnings_prompt =
       chrome::BuildExtensionInstallPrompt(extension_.get());
 
   base::scoped_nsobject<ExtensionInstallViewController> controller(
       [[ExtensionInstallViewController alloc]
-          initWithNavigator:browser()
-                   delegate:&delegate
-                     prompt:no_warnings_prompt]);
+          initWithProfile:profile()
+                navigator:browser()
+                 delegate:&delegate
+                   prompt:no_warnings_prompt]);
 
   [controller view];  // Force nib load.
 
   // Test the right nib loaded.
   EXPECT_NSEQ(@"ExtensionInstallPromptNoWarnings", [controller nibName]);
 
   // Check all the controls.
   // In the skinny prompt, only the icon, title and buttons are non-nill.
   // Everything else is nil.
   EXPECT_TRUE([controller iconView]);
@@ skipping 21 matching lines @@
 
   // No warnings should trigger skinny prompt.
   scoped_refptr<ExtensionInstallPrompt::Prompt> inline_prompt =
       new ExtensionInstallPrompt::Prompt(
           ExtensionInstallPrompt::INLINE_INSTALL_PROMPT);
   inline_prompt->SetWebstoreData("1,000", true, 3.5, 200);
   inline_prompt->set_extension(extension_.get());
   inline_prompt->set_icon(chrome::LoadInstallPromptIcon());
 
   base::scoped_nsobject<ExtensionInstallViewController> controller(
-      [[ExtensionInstallViewController alloc] initWithNavigator:browser()
-                                                       delegate:&delegate
-                                                         prompt:inline_prompt]);
+      [[ExtensionInstallViewController alloc] initWithProfile:profile()
+                                                    navigator:browser()
+                                                     delegate:&delegate
+                                                       prompt:inline_prompt]);
 
   [controller view];  // Force nib load.
 
   // Test the right nib loaded.
   EXPECT_NSEQ(@"ExtensionInstallPromptWebstoreData", [controller nibName]);
 
   // Check all the controls.
   EXPECT_TRUE([controller iconView]);
   EXPECT_TRUE([[controller iconView] image]);
 
@@ skipping 40 matching lines @@
 
   std::vector<base::string16> permissions;
   permissions.push_back(base::UTF8ToUTF16("warning 1"));
   prompt->SetPermissions(permissions, type);
   // No details provided with this permission.
   std::vector<base::string16> details;
   details.push_back(base::string16());
   prompt->SetPermissionsDetails(details, type);
 
   base::scoped_nsobject<ExtensionInstallViewController> controller(
-      [[ExtensionInstallViewController alloc] initWithNavigator:browser()
-                                                       delegate:&delegate
-                                                         prompt:prompt]);
+      [[ExtensionInstallViewController alloc] initWithProfile:profile()
+                                                    navigator:browser()
+                                                     delegate:&delegate
+                                                       prompt:prompt]);
 
   [controller view];  // Force nib load.
 
   EXPECT_TRUE([controller cancelButton]);
   EXPECT_FALSE([controller okButton]);
 
   [controller cancel:nil];
   EXPECT_EQ(1, delegate.abort_count());
 }
 
 // Test that permission details show up.
 TEST_F(ExtensionInstallViewControllerTest, PermissionsDetails) {
   chrome::MockExtensionInstallPromptDelegate delegate;
 
   scoped_refptr<ExtensionInstallPrompt::Prompt> prompt =
       chrome::BuildExtensionInstallPrompt(extension_.get());
   ExtensionInstallPrompt::PermissionsType type =
       ExtensionInstallPrompt::PermissionsType::REGULAR_PERMISSIONS;
 
   std::vector<base::string16> permissions;
   permissions.push_back(base::UTF8ToUTF16("warning 1"));
   std::vector<base::string16> permissions_details;
   permissions_details.push_back(base::UTF8ToUTF16("Detail 1"));
   prompt->SetPermissions(permissions, type);
   prompt->SetPermissionsDetails(permissions_details, type);
   prompt->SetIsShowingDetails(
       ExtensionInstallPrompt::PERMISSIONS_DETAILS, 0, true);
 
   base::scoped_nsobject<ExtensionInstallViewController> controller(
-      [[ExtensionInstallViewController alloc] initWithNavigator:browser()
-                                                       delegate:&delegate
-                                                         prompt:prompt]);
+      [[ExtensionInstallViewController alloc] initWithProfile:profile()
+                                                    navigator:browser()
+                                                     delegate:&delegate
+                                                       prompt:prompt]);
 
   [controller view];  // Force nib load.
 
   NSOutlineView* outlineView = [controller outlineView];
   EXPECT_TRUE(outlineView);
   EXPECT_EQ(4, [outlineView numberOfRows]);
   EXPECT_NSEQ(base::SysUTF16ToNSString(prompt->GetPermissionsDetails(0, type)),
               [[outlineView dataSource] outlineView:outlineView
                           objectValueForTableColumn:nil
                                              byItem:[outlineView itemAtRow:2]]);
 }