Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2381)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm

Issue 313203004: Make ExtensionInstallPrompt::Prompt ref-counted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Latest master Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm ('K') | « chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm ('k') | chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm
index e23ac4fd1aeafe443f2522618ce81c852bda00f7..d4295501ab1743f9b598b73498b94f7399c665d7 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm
@@ -34,16 +34,16 @@ class ExtensionInstallViewControllerTest : public CocoaProfileTest {
TEST_F(ExtensionInstallViewControllerTest, BasicsNormalCancel) {
chrome::MockExtensionInstallPromptDelegate delegate;
- ExtensionInstallPrompt::Prompt prompt =
+ scoped_refptr<ExtensionInstallPrompt::Prompt> prompt =
chrome::BuildExtensionInstallPrompt(extension_.get());
std::vector<base::string16> permissions;
permissions.push_back(base::UTF8ToUTF16("warning 1"));
- prompt.SetPermissions(permissions);
+ prompt->SetPermissions(permissions);
// No details provided with this permission.
std::vector<base::string16> details;
details.push_back(base::string16());
- prompt.SetPermissionsDetails(details);
+ prompt->SetPermissionsDetails(details);
base::scoped_nsobject<ExtensionInstallViewController> controller(
[[ExtensionInstallViewController alloc] initWithNavigator:browser()
@@ -68,7 +68,7 @@ TEST_F(ExtensionInstallViewControllerTest, BasicsNormalCancel) {
NSOutlineView* outlineView = [controller outlineView];
EXPECT_TRUE(outlineView);
EXPECT_EQ(2, [outlineView numberOfRows]);
- EXPECT_NSEQ(base::SysUTF16ToNSString(prompt.GetPermission(0)),
+ EXPECT_NSEQ(base::SysUTF16ToNSString(prompt->GetPermission(0)),
[[outlineView dataSource] outlineView:outlineView
objectValueForTableColumn:nil
byItem:[outlineView itemAtRow:1]]);
@@ -90,15 +90,15 @@ TEST_F(ExtensionInstallViewControllerTest, BasicsNormalCancel) {
TEST_F(ExtensionInstallViewControllerTest, BasicsNormalOK) {
chrome::MockExtensionInstallPromptDelegate delegate;
- ExtensionInstallPrompt::Prompt prompt =
+ scoped_refptr<ExtensionInstallPrompt::Prompt> prompt =
chrome::BuildExtensionInstallPrompt(extension_.get());
std::vector<base::string16> permissions;
permissions.push_back(base::UTF8ToUTF16("warning 1"));
- prompt.SetPermissions(permissions);
+ prompt->SetPermissions(permissions);
// No details provided with this permission.
std::vector<base::string16> details;
details.push_back(base::string16());
- prompt.SetPermissionsDetails(details);
+ prompt->SetPermissionsDetails(details);
base::scoped_nsobject<ExtensionInstallViewController> controller(
[[ExtensionInstallViewController alloc] initWithNavigator:browser()
@@ -118,23 +118,23 @@ TEST_F(ExtensionInstallViewControllerTest, MultipleWarnings) {
chrome::MockExtensionInstallPromptDelegate delegate1;
chrome::MockExtensionInstallPromptDelegate delegate2;
- ExtensionInstallPrompt::Prompt one_warning_prompt =
+ scoped_refptr<ExtensionInstallPrompt::Prompt> one_warning_prompt =
chrome::BuildExtensionInstallPrompt(extension_.get());
std::vector<base::string16> permissions;
permissions.push_back(base::UTF8ToUTF16("warning 1"));
- one_warning_prompt.SetPermissions(permissions);
+ one_warning_prompt->SetPermissions(permissions);
// No details provided with this permission.
std::vector<base::string16> details;
details.push_back(base::string16());
- one_warning_prompt.SetPermissionsDetails(details);
+ one_warning_prompt->SetPermissionsDetails(details);
- ExtensionInstallPrompt::Prompt two_warnings_prompt =
+ scoped_refptr<ExtensionInstallPrompt::Prompt> two_warnings_prompt =
chrome::BuildExtensionInstallPrompt(extension_.get());
permissions.push_back(base::UTF8ToUTF16("warning 2"));
- two_warnings_prompt.SetPermissions(permissions);
+ two_warnings_prompt->SetPermissions(permissions);
// No details provided with this permission.
details.push_back(base::string16());
- two_warnings_prompt.SetPermissionsDetails(details);
+ two_warnings_prompt->SetPermissionsDetails(details);
base::scoped_nsobject<ExtensionInstallViewController> controller1(
[[ExtensionInstallViewController alloc]
@@ -168,7 +168,7 @@ TEST_F(ExtensionInstallViewControllerTest, BasicsSkinny) {
chrome::MockExtensionInstallPromptDelegate delegate;
// No warnings should trigger skinny prompt.
- ExtensionInstallPrompt::Prompt no_warnings_prompt =
+ scoped_refptr<ExtensionInstallPrompt::Prompt> no_warnings_prompt =
chrome::BuildExtensionInstallPrompt(extension_.get());
base::scoped_nsobject<ExtensionInstallViewController> controller(
@@ -209,11 +209,12 @@ TEST_F(ExtensionInstallViewControllerTest, BasicsInline) {
chrome::MockExtensionInstallPromptDelegate delegate;
// No warnings should trigger skinny prompt.
- ExtensionInstallPrompt::Prompt inline_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());
+ 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()
@@ -265,15 +266,15 @@ TEST_F(ExtensionInstallViewControllerTest, BasicsInline) {
TEST_F(ExtensionInstallViewControllerTest, PostInstallPermissionsPrompt) {
chrome::MockExtensionInstallPromptDelegate delegate;
- ExtensionInstallPrompt::Prompt prompt =
+ scoped_refptr<ExtensionInstallPrompt::Prompt> prompt =
chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get());
std::vector<base::string16> permissions;
permissions.push_back(base::UTF8ToUTF16("warning 1"));
- prompt.SetPermissions(permissions);
+ prompt->SetPermissions(permissions);
// No details provided with this permission.
std::vector<base::string16> details;
details.push_back(base::string16());
- prompt.SetPermissionsDetails(details);
+ prompt->SetPermissionsDetails(details);
base::scoped_nsobject<ExtensionInstallViewController> controller(
[[ExtensionInstallViewController alloc] initWithNavigator:browser()
@@ -293,16 +294,16 @@ TEST_F(ExtensionInstallViewControllerTest, PostInstallPermissionsPrompt) {
TEST_F(ExtensionInstallViewControllerTest, PermissionsDetails) {
chrome::MockExtensionInstallPromptDelegate delegate;
- ExtensionInstallPrompt::Prompt prompt =
+ scoped_refptr<ExtensionInstallPrompt::Prompt> prompt =
chrome::BuildExtensionInstallPrompt(extension_.get());
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);
- prompt.SetPermissionsDetails(permissions_details);
- prompt.SetIsShowingDetails(
+ prompt->SetPermissions(permissions);
+ prompt->SetPermissionsDetails(permissions_details);
+ prompt->SetIsShowingDetails(
ExtensionInstallPrompt::PERMISSIONS_DETAILS, 0, true);
base::scoped_nsobject<ExtensionInstallViewController> controller(
@@ -315,7 +316,7 @@ TEST_F(ExtensionInstallViewControllerTest, PermissionsDetails) {
NSOutlineView* outlineView = [controller outlineView];
EXPECT_TRUE(outlineView);
EXPECT_EQ(4, [outlineView numberOfRows]);
- EXPECT_NSEQ(base::SysUTF16ToNSString(prompt.GetPermissionsDetails(0)),
+ EXPECT_NSEQ(base::SysUTF16ToNSString(prompt->GetPermissionsDetails(0)),
[[outlineView dataSource] outlineView:outlineView
objectValueForTableColumn:nil
byItem:[outlineView itemAtRow:2]]);
« chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm ('K') | « chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm ('k') | chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698