summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/extension_permission_set_unittest.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-27 07:56:43 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-27 07:56:43 +0000
commit22991bed3fe4146efc22ae368f3637edd3f8182e (patch)
treef5592aea6db444845a933b711c41ff56c787d693 /chrome/common/extensions/extension_permission_set_unittest.cc
parenta47a6fe323a07681d3a0715660b1a9c6515ec9c9 (diff)
downloadchromium_src-22991bed3fe4146efc22ae368f3637edd3f8182e.zip
chromium_src-22991bed3fe4146efc22ae368f3637edd3f8182e.tar.gz
chromium_src-22991bed3fe4146efc22ae368f3637edd3f8182e.tar.bz2
Revert 90496 - Probable cause of InstantTest.On[Change/Submit/Cancel]Event failures.
Added a private chromeAuthPrivate API. Ceated a component hosted app that uses this to set cloud print credentials. BUG=None TEST=Unit-tests Review URL: http://codereview.chromium.org/7253001 TBR=sanjeevr@chromium.org Review URL: http://codereview.chromium.org/7264016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension_permission_set_unittest.cc')
-rw-r--r--chrome/common/extensions/extension_permission_set_unittest.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/common/extensions/extension_permission_set_unittest.cc b/chrome/common/extensions/extension_permission_set_unittest.cc
index 75e12fa..9cfa698 100644
--- a/chrome/common/extensions/extension_permission_set_unittest.cc
+++ b/chrome/common/extensions/extension_permission_set_unittest.cc
@@ -162,7 +162,6 @@ TEST(ExtensionAPIPermissionTest, HostedAppPermissions) {
hosted_perms.insert(ExtensionAPIPermission::kBackground);
hosted_perms.insert(ExtensionAPIPermission::kClipboardRead);
hosted_perms.insert(ExtensionAPIPermission::kClipboardWrite);
- hosted_perms.insert(ExtensionAPIPermission::kChromeAuthPrivate);
hosted_perms.insert(ExtensionAPIPermission::kChromePrivate);
hosted_perms.insert(ExtensionAPIPermission::kExperimental);
hosted_perms.insert(ExtensionAPIPermission::kGeolocation);
@@ -178,14 +177,13 @@ TEST(ExtensionAPIPermissionTest, HostedAppPermissions) {
EXPECT_EQ(hosted_perms.count(*i) > 0, info->GetByID(*i)->is_hosted_app());
}
- EXPECT_EQ(10u, count);
- EXPECT_EQ(10u, info->get_hosted_app_permission_count());
+ EXPECT_EQ(9u, count);
+ EXPECT_EQ(9u, info->get_hosted_app_permission_count());
}
TEST(ExtensionAPIPermissionTest, ComponentOnlyPermissions) {
ExtensionPermissionsInfo* info = ExtensionPermissionsInfo::GetInstance();
ExtensionAPIPermissionSet private_perms;
- private_perms.insert(ExtensionAPIPermission::kChromeAuthPrivate);
private_perms.insert(ExtensionAPIPermission::kChromeosInfoPrivate);
private_perms.insert(ExtensionAPIPermission::kFileBrowserPrivate);
private_perms.insert(ExtensionAPIPermission::kMediaPlayerPrivate);
@@ -200,7 +198,7 @@ TEST(ExtensionAPIPermissionTest, ComponentOnlyPermissions) {
info->GetByID(*i)->is_component_only());
}
- EXPECT_EQ(5, count);
+ EXPECT_EQ(4, count);
}
TEST(ExtensionPermissionSetTest, EffectiveHostPermissions) {
@@ -499,7 +497,6 @@ TEST(ExtensionPermissionSetTest, PermissionMessages) {
skip.insert(ExtensionAPIPermission::kWebstorePrivate);
skip.insert(ExtensionAPIPermission::kFileBrowserPrivate);
skip.insert(ExtensionAPIPermission::kMediaPlayerPrivate);
- skip.insert(ExtensionAPIPermission::kChromeAuthPrivate);
skip.insert(ExtensionAPIPermission::kChromePrivate);
skip.insert(ExtensionAPIPermission::kChromeosInfoPrivate);
skip.insert(ExtensionAPIPermission::kWebSocketProxyPrivate);