Index: chrome/common/extensions/permissions/permission_set_unittest.cc |
diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc |
index 637cd15819dc043eb59499bee0450fef765c8a5d..864bfbf65d3a2e13cf0f4bb3c1283b49f77eecc3 100644 |
--- a/chrome/common/extensions/permissions/permission_set_unittest.cc |
+++ b/chrome/common/extensions/permissions/permission_set_unittest.cc |
@@ -133,7 +133,7 @@ TEST(PermissionsTest, EffectiveHostPermissions) { |
extension = LoadManifest("effective_host_permissions", "empty.json"); |
permissions = extension->GetActivePermissions(); |
EXPECT_EQ(0u, |
- PermissionsData::ForExtension(extension) |
+ extension->permissions_data() |
->GetEffectiveHostPermissions() |
.patterns() |
.size()); |
@@ -914,7 +914,7 @@ TEST(PermissionsTest, GetWarningMessages_ManyHosts) { |
extension = LoadManifest("permissions", "many-hosts.json"); |
std::vector<base::string16> warnings = |
- PermissionsData::ForExtension(extension)->GetPermissionMessageStrings(); |
+ extension->permissions_data()->GetPermissionMessageStrings(); |
ASSERT_EQ(1u, warnings.size()); |
EXPECT_EQ( |
"Read and modify your data on encrypted.google.com and " |
@@ -928,7 +928,7 @@ TEST(PermissionsTest, GetWarningMessages_Plugins) { |
extension = LoadManifest("permissions", "plugins.json"); |
std::vector<base::string16> warnings = |
- PermissionsData::ForExtension(extension)->GetPermissionMessageStrings(); |
+ extension->permissions_data()->GetPermissionMessageStrings(); |
// We don't parse the plugins key on Chrome OS, so it should not ask for any |
// permissions. |
#if defined(OS_CHROMEOS) |
@@ -1016,7 +1016,7 @@ TEST(PermissionsTest, GetWarningMessages_Serial) { |
EXPECT_TRUE(extension->is_platform_app()); |
EXPECT_TRUE(extension->HasAPIPermission(APIPermission::kSerial)); |
std::vector<base::string16> warnings = |
- PermissionsData::ForExtension(extension)->GetPermissionMessageStrings(); |
+ extension->permissions_data()->GetPermissionMessageStrings(); |
EXPECT_TRUE( |
Contains(warnings, "Use serial devices attached to your computer")); |
ASSERT_EQ(1u, warnings.size()); |
@@ -1030,7 +1030,7 @@ TEST(PermissionsTest, GetWarningMessages_Socket_AnyHost) { |
EXPECT_TRUE(extension->is_platform_app()); |
EXPECT_TRUE(extension->HasAPIPermission(APIPermission::kSocket)); |
std::vector<base::string16> warnings = |
- PermissionsData::ForExtension(extension)->GetPermissionMessageStrings(); |
+ extension->permissions_data()->GetPermissionMessageStrings(); |
EXPECT_EQ(1u, warnings.size()); |
EXPECT_TRUE(Contains(warnings, "Exchange data with any computer " |
"on the local network or internet")); |
@@ -1044,7 +1044,7 @@ TEST(PermissionsTest, GetWarningMessages_Socket_OneDomainTwoHostnames) { |
EXPECT_TRUE(extension->is_platform_app()); |
EXPECT_TRUE(extension->HasAPIPermission(APIPermission::kSocket)); |
std::vector<base::string16> warnings = |
- PermissionsData::ForExtension(extension)->GetPermissionMessageStrings(); |
+ extension->permissions_data()->GetPermissionMessageStrings(); |
// Verify the warnings, including support for unicode characters, the fact |
// that domain host warnings come before specific host warnings, and the fact |
@@ -1070,7 +1070,7 @@ TEST(PermissionsTest, GetWarningMessages_Socket_TwoDomainsOneHostname) { |
EXPECT_TRUE(extension->is_platform_app()); |
EXPECT_TRUE(extension->HasAPIPermission(APIPermission::kSocket)); |
std::vector<base::string16> warnings = |
- PermissionsData::ForExtension(extension)->GetPermissionMessageStrings(); |
+ extension->permissions_data()->GetPermissionMessageStrings(); |
// Verify the warnings, including the fact that domain host warnings come |
// before specific host warnings and the fact that domains and hostnames are |
@@ -1092,13 +1092,12 @@ TEST(PermissionsTest, GetWarningMessages_PlatformApppHosts) { |
extension = LoadManifest("permissions", "platform_app_hosts.json"); |
EXPECT_TRUE(extension->is_platform_app()); |
std::vector<base::string16> warnings = |
- PermissionsData::ForExtension(extension)->GetPermissionMessageStrings(); |
+ extension->permissions_data()->GetPermissionMessageStrings(); |
ASSERT_EQ(0u, warnings.size()); |
extension = LoadManifest("permissions", "platform_app_all_urls.json"); |
EXPECT_TRUE(extension->is_platform_app()); |
- warnings = |
- PermissionsData::ForExtension(extension)->GetPermissionMessageStrings(); |
+ warnings = extension->permissions_data()->GetPermissionMessageStrings(); |
ASSERT_EQ(0u, warnings.size()); |
} |
@@ -1113,7 +1112,7 @@ bool ShowsAllHostsWarning(const std::string& pattern) { |
.Build(); |
std::vector<base::string16> warnings = |
- PermissionsData::ForExtension(extension)->GetPermissionMessageStrings(); |
+ extension->permissions_data()->GetPermissionMessageStrings(); |
if (warnings.empty()) |
return false; |
@@ -1546,7 +1545,7 @@ TEST(PermissionsTest, SyncFileSystemPermission) { |
EXPECT_TRUE(extension->is_platform_app()); |
EXPECT_TRUE(extension->HasAPIPermission(APIPermission::kSyncFileSystem)); |
std::vector<base::string16> warnings = |
- PermissionsData::ForExtension(extension)->GetPermissionMessageStrings(); |
+ extension->permissions_data()->GetPermissionMessageStrings(); |
EXPECT_TRUE(Contains(warnings, "Store data in your Google Drive account")); |
ASSERT_EQ(1u, warnings.size()); |
} |