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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 501273002: Update extension install prompt to reflect withheld permissions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update cocoa test, add default cases for compiler Created 6 years, 3 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
« no previous file with comments | « chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm ('k') | chrome/browser/ui/views/extensions/extension_install_dialog_view.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 d4295501ab1743f9b598b73498b94f7399c665d7..7758f01620ad0a0e53dfd04327f3fef08b056fd3 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
@@ -36,14 +36,16 @@ TEST_F(ExtensionInstallViewControllerTest, BasicsNormalCancel) {
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"));
- prompt->SetPermissions(permissions);
+ prompt->SetPermissions(permissions, type);
// No details provided with this permission.
std::vector<base::string16> details;
details.push_back(base::string16());
- prompt->SetPermissionsDetails(details);
+ prompt->SetPermissionsDetails(details, type);
base::scoped_nsobject<ExtensionInstallViewController> controller(
[[ExtensionInstallViewController alloc] initWithNavigator:browser()
@@ -68,7 +70,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, type)),
[[outlineView dataSource] outlineView:outlineView
objectValueForTableColumn:nil
byItem:[outlineView itemAtRow:1]]);
@@ -92,13 +94,16 @@ TEST_F(ExtensionInstallViewControllerTest, BasicsNormalOK) {
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"));
- prompt->SetPermissions(permissions);
+ prompt->SetPermissions(permissions, type);
// No details provided with this permission.
std::vector<base::string16> details;
details.push_back(base::string16());
- prompt->SetPermissionsDetails(details);
+ prompt->SetPermissionsDetails(details, type);
base::scoped_nsobject<ExtensionInstallViewController> controller(
[[ExtensionInstallViewController alloc] initWithNavigator:browser()
@@ -120,21 +125,24 @@ TEST_F(ExtensionInstallViewControllerTest, MultipleWarnings) {
scoped_refptr<ExtensionInstallPrompt::Prompt> one_warning_prompt =
chrome::BuildExtensionInstallPrompt(extension_.get());
+ ExtensionInstallPrompt::PermissionsType type =
+ ExtensionInstallPrompt::PermissionsType::REGULAR_PERMISSIONS;
+
std::vector<base::string16> permissions;
permissions.push_back(base::UTF8ToUTF16("warning 1"));
- one_warning_prompt->SetPermissions(permissions);
+ one_warning_prompt->SetPermissions(permissions, type);
// 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, type);
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, type);
// No details provided with this permission.
details.push_back(base::string16());
- two_warnings_prompt->SetPermissionsDetails(details);
+ two_warnings_prompt->SetPermissionsDetails(details, type);
base::scoped_nsobject<ExtensionInstallViewController> controller1(
[[ExtensionInstallViewController alloc]
@@ -268,13 +276,16 @@ TEST_F(ExtensionInstallViewControllerTest, PostInstallPermissionsPrompt) {
scoped_refptr<ExtensionInstallPrompt::Prompt> prompt =
chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get());
+ ExtensionInstallPrompt::PermissionsType type =
+ ExtensionInstallPrompt::PermissionsType::REGULAR_PERMISSIONS;
+
std::vector<base::string16> permissions;
permissions.push_back(base::UTF8ToUTF16("warning 1"));
- prompt->SetPermissions(permissions);
+ prompt->SetPermissions(permissions, type);
// No details provided with this permission.
std::vector<base::string16> details;
details.push_back(base::string16());
- prompt->SetPermissionsDetails(details);
+ prompt->SetPermissionsDetails(details, type);
base::scoped_nsobject<ExtensionInstallViewController> controller(
[[ExtensionInstallViewController alloc] initWithNavigator:browser()
@@ -296,13 +307,15 @@ TEST_F(ExtensionInstallViewControllerTest, PermissionsDetails) {
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);
- prompt->SetPermissionsDetails(permissions_details);
+ prompt->SetPermissions(permissions, type);
+ prompt->SetPermissionsDetails(permissions_details, type);
prompt->SetIsShowingDetails(
ExtensionInstallPrompt::PERMISSIONS_DETAILS, 0, true);
@@ -316,7 +329,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, type)),
[[outlineView dataSource] outlineView:outlineView
objectValueForTableColumn:nil
byItem:[outlineView itemAtRow:2]]);
« no previous file with comments | « chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm ('k') | chrome/browser/ui/views/extensions/extension_install_dialog_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698