extensions/common/permissions/permissions_data_unittest.cc - Issue 309533007: Refactor PermissionsData pt1

Unified Diff: extensions/common/permissions/permissions_data_unittest.cc

Issue 309533007: Refactor PermissionsData pt1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 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

Index: extensions/common/permissions/permissions_data_unittest.cc

diff --git a/extensions/common/permissions/permissions_data_unittest.cc b/extensions/common/permissions/permissions_data_unittest.cc

index 3ca34e970f4ff8347ce557e540a4f376f20d5813..ff5ca86d9981e46e70479779d4c1541abb33116c 100644

--- a/extensions/common/permissions/permissions_data_unittest.cc

+++ b/extensions/common/permissions/permissions_data_unittest.cc

@@ -46,8 +46,8 @@ bool CheckSocketPermission(

const char* host,

int port) {

SocketPermission::CheckParam param(type, host, port);

- return PermissionsData::CheckAPIPermissionWithParam(

- extension.get(), APIPermission::kSocket, &param);

+ return PermissionsData::ForExtension(extension)

+ ->CheckAPIPermissionWithParam(APIPermission::kSocket, &param);

}

// Creates and returns an extension with the given |id|, |host_permissions|, and

@@ -81,10 +81,10 @@ bool RequiresActionForScriptExecution(const std::string& extension_id,

GetExtensionWithHostPermission(extension_id,

host_permissions,

location);

- return PermissionsData::RequiresActionForScriptExecution(

- extension,

- -1, // Ignore tab id for these.

- GURL::EmptyGURL());

+ return PermissionsData::ForExtension(extension)

+ ->RequiresActionForScriptExecution(extension,

+ -1, // Ignore tab id for these.

+ GURL::EmptyGURL());

}

} // namespace

@@ -95,40 +95,52 @@ TEST(ExtensionPermissionsTest, EffectiveHostPermissions) {

extension = LoadManifest("effective_host_permissions", "empty.json");

EXPECT_EQ(0u,

- PermissionsData::GetEffectiveHostPermissions(extension.get())

- .patterns().size());

+ PermissionsData::ForExtension(extension)

not at google - send to devlin 2014/06/02 23:20:06 here at this point I feel pretty bad asking you t

Devlin 2014/06/03 15:28:21 Again, we reassign extension every 5 lines. :)

+ ->GetEffectiveHostPermissions()

+ .patterns()

+ .size());

EXPECT_FALSE(hosts.MatchesURL(GURL("http://www.google.com")));

- EXPECT_FALSE(PermissionsData::HasEffectiveAccessToAllHosts(extension.get()));

+ EXPECT_FALSE(

+ PermissionsData::ForExtension(extension)->HasEffectiveAccessToAllHosts());

extension = LoadManifest("effective_host_permissions", "one_host.json");

- hosts = PermissionsData::GetEffectiveHostPermissions(extension.get());

+ hosts =

+ PermissionsData::ForExtension(extension)->GetEffectiveHostPermissions();

EXPECT_TRUE(hosts.MatchesURL(GURL("http://www.google.com")));

EXPECT_FALSE(hosts.MatchesURL(GURL("https://www.google.com")));

- EXPECT_FALSE(PermissionsData::HasEffectiveAccessToAllHosts(extension.get()));

+ EXPECT_FALSE(

+ PermissionsData::ForExtension(extension)->HasEffectiveAccessToAllHosts());

extension = LoadManifest("effective_host_permissions",

"one_host_wildcard.json");

- hosts = PermissionsData::GetEffectiveHostPermissions(extension.get());

+ hosts =

+ PermissionsData::ForExtension(extension)->GetEffectiveHostPermissions();

EXPECT_TRUE(hosts.MatchesURL(GURL("http://google.com")));

EXPECT_TRUE(hosts.MatchesURL(GURL("http://foo.google.com")));

- EXPECT_FALSE(PermissionsData::HasEffectiveAccessToAllHosts(extension.get()));

+ EXPECT_FALSE(

+ PermissionsData::ForExtension(extension)->HasEffectiveAccessToAllHosts());

extension = LoadManifest("effective_host_permissions", "two_hosts.json");

- hosts = PermissionsData::GetEffectiveHostPermissions(extension.get());

+ hosts =

+ PermissionsData::ForExtension(extension)->GetEffectiveHostPermissions();

EXPECT_TRUE(hosts.MatchesURL(GURL("http://www.google.com")));

EXPECT_TRUE(hosts.MatchesURL(GURL("http://www.reddit.com")));

- EXPECT_FALSE(PermissionsData::HasEffectiveAccessToAllHosts(extension.get()));

+ EXPECT_FALSE(

+ PermissionsData::ForExtension(extension)->HasEffectiveAccessToAllHosts());

extension = LoadManifest("effective_host_permissions",

"https_not_considered.json");

- hosts = PermissionsData::GetEffectiveHostPermissions(extension.get());

+ hosts =

+ PermissionsData::ForExtension(extension)->GetEffectiveHostPermissions();

EXPECT_TRUE(hosts.MatchesURL(GURL("http://google.com")));

EXPECT_TRUE(hosts.MatchesURL(GURL("https://google.com")));

- EXPECT_FALSE(PermissionsData::HasEffectiveAccessToAllHosts(extension.get()));

+ EXPECT_FALSE(

+ PermissionsData::ForExtension(extension)->HasEffectiveAccessToAllHosts());

extension = LoadManifest("effective_host_permissions",

"two_content_scripts.json");

- hosts = PermissionsData::GetEffectiveHostPermissions(extension.get());

+ hosts =

+ PermissionsData::ForExtension(extension)->GetEffectiveHostPermissions();

EXPECT_TRUE(hosts.MatchesURL(GURL("http://google.com")));

EXPECT_TRUE(hosts.MatchesURL(GURL("http://www.reddit.com")));

EXPECT_TRUE(extension->GetActivePermissions()->HasEffectiveAccessToURL(

@@ -136,27 +148,34 @@ TEST(ExtensionPermissionsTest, EffectiveHostPermissions) {

EXPECT_TRUE(hosts.MatchesURL(GURL("http://news.ycombinator.com")));

EXPECT_TRUE(extension->GetActivePermissions()->HasEffectiveAccessToURL(

GURL("http://news.ycombinator.com")));

- EXPECT_FALSE(PermissionsData::HasEffectiveAccessToAllHosts(extension.get()));

+ EXPECT_FALSE(

+ PermissionsData::ForExtension(extension)->HasEffectiveAccessToAllHosts());

extension = LoadManifest("effective_host_permissions", "all_hosts.json");

- hosts = PermissionsData::GetEffectiveHostPermissions(extension.get());

+ hosts =

+ PermissionsData::ForExtension(extension)->GetEffectiveHostPermissions();

EXPECT_TRUE(hosts.MatchesURL(GURL("http://test/")));

EXPECT_FALSE(hosts.MatchesURL(GURL("https://test/")));

EXPECT_TRUE(hosts.MatchesURL(GURL("http://www.google.com")));

- EXPECT_TRUE(PermissionsData::HasEffectiveAccessToAllHosts(extension.get()));

+ EXPECT_TRUE(

+ PermissionsData::ForExtension(extension)->HasEffectiveAccessToAllHosts());

extension = LoadManifest("effective_host_permissions", "all_hosts2.json");

- hosts = PermissionsData::GetEffectiveHostPermissions(extension.get());

+ hosts =

+ PermissionsData::ForExtension(extension)->GetEffectiveHostPermissions();

EXPECT_TRUE(hosts.MatchesURL(GURL("http://test/")));

EXPECT_TRUE(hosts.MatchesURL(GURL("http://www.google.com")));

- EXPECT_TRUE(PermissionsData::HasEffectiveAccessToAllHosts(extension.get()));

+ EXPECT_TRUE(

+ PermissionsData::ForExtension(extension)->HasEffectiveAccessToAllHosts());

extension = LoadManifest("effective_host_permissions", "all_hosts3.json");

- hosts = PermissionsData::GetEffectiveHostPermissions(extension.get());

+ hosts =

+ PermissionsData::ForExtension(extension)->GetEffectiveHostPermissions();

EXPECT_FALSE(hosts.MatchesURL(GURL("http://test/")));

EXPECT_TRUE(hosts.MatchesURL(GURL("https://test/")));

EXPECT_TRUE(hosts.MatchesURL(GURL("http://www.google.com")));

- EXPECT_TRUE(PermissionsData::HasEffectiveAccessToAllHosts(extension.get()));

+ EXPECT_TRUE(

+ PermissionsData::ForExtension(extension)->HasEffectiveAccessToAllHosts());

}

TEST(ExtensionPermissionsTest, SocketPermissions) {

@@ -231,16 +250,18 @@ TEST(ExtensionPermissionsTest, RequiresActionForScriptExecution) {

ManifestPermissionSet(),

allowed_hosts,

URLPatternSet()));

- PermissionsData::UpdateTabSpecificPermissions(extension, 0, tab_permissions);

- EXPECT_FALSE(PermissionsData::RequiresActionForScriptExecution(

- extension, 0, GURL("https://www.google.com/")));

+ PermissionsData::ForExtension(extension)

+ ->UpdateTabSpecificPermissions(0, tab_permissions);

+ EXPECT_FALSE(PermissionsData::ForExtension(extension)

+ ->RequiresActionForScriptExecution(

+ extension, 0, GURL("https://www.google.com/")));

}

TEST(ExtensionPermissionsTest, GetPermissionMessages_ManyAPIPermissions) {

scoped_refptr<Extension> extension;

extension = LoadManifest("permissions", "many-apis.json");

std::vector<base::string16> warnings =

- PermissionsData::GetPermissionMessageStrings(extension.get());

+ PermissionsData::ForExtension(extension)->GetPermissionMessageStrings();

// Warning for "tabs" is suppressed by "history" permission.

ASSERT_EQ(5u, warnings.size());

EXPECT_EQ("Read and modify your data on api.flickr.com",

@@ -256,9 +277,10 @@ TEST(ExtensionPermissionsTest, GetPermissionMessages_ManyHostsPermissions) {

scoped_refptr<Extension> extension;

extension = LoadManifest("permissions", "more-than-3-hosts.json");

std::vector<base::string16> warnings =

- PermissionsData::GetPermissionMessageStrings(extension.get());

+ PermissionsData::ForExtension(extension)->GetPermissionMessageStrings();

std::vector<base::string16> warnings_details =

- PermissionsData::GetPermissionMessageDetailsStrings(extension.get());

+ PermissionsData::ForExtension(extension)

+ ->GetPermissionMessageDetailsStrings();

ASSERT_EQ(1u, warnings.size());

ASSERT_EQ(1u, warnings_details.size());

EXPECT_EQ("Read and modify your data on 5 websites",

@@ -274,7 +296,7 @@ TEST(ExtensionPermissionsTest, GetPermissionMessages_LocationApiPermission) {

Manifest::COMPONENT,

Extension::NO_FLAGS);

std::vector<base::string16> warnings =

- PermissionsData::GetPermissionMessageStrings(extension.get());

+ PermissionsData::ForExtension(extension)->GetPermissionMessageStrings();

ASSERT_EQ(1u, warnings.size());

EXPECT_EQ("Detect your physical location", UTF16ToUTF8(warnings[0]));

}

@@ -283,7 +305,7 @@ TEST(ExtensionPermissionsTest, GetPermissionMessages_ManyHosts) {

scoped_refptr<Extension> extension;

extension = LoadManifest("permissions", "many-hosts.json");

std::vector<base::string16> warnings =

- PermissionsData::GetPermissionMessageStrings(extension.get());

+ PermissionsData::ForExtension(extension)->GetPermissionMessageStrings();

ASSERT_EQ(1u, warnings.size());

EXPECT_EQ(

"Read and modify your data on encrypted.google.com and www.google.com",

@@ -294,7 +316,7 @@ TEST(ExtensionPermissionsTest, GetPermissionMessages_Plugins) {

scoped_refptr<Extension> extension;

extension = LoadManifest("permissions", "plugins.json");

std::vector<base::string16> warnings =

- PermissionsData::GetPermissionMessageStrings(extension.get());

+ PermissionsData::ForExtension(extension)->GetPermissionMessageStrings();

// We don't parse the plugins key on Chrome OS, so it should not ask for any

// permissions.

#if defined(OS_CHROMEOS)

@@ -342,13 +364,13 @@ class ExtensionScriptAndCaptureVisibleTest : public testing::Test {

bool AllowedScript(const Extension* extension, const GURL& url,

const GURL& top_url, int tab_id) {

- return PermissionsData::CanExecuteScriptOnPage(

+ return PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(

extension, url, top_url, tab_id, NULL, -1, NULL);

}

bool BlockedScript(const Extension* extension, const GURL& url,

const GURL& top_url) {

- return !PermissionsData::CanExecuteScriptOnPage(

+ return !PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(

extension, url, top_url, -1, NULL, -1, NULL);

}

@@ -357,10 +379,10 @@ class ExtensionScriptAndCaptureVisibleTest : public testing::Test {

}

bool Allowed(const Extension* extension, const GURL& url, int tab_id) {

- return (PermissionsData::CanExecuteScriptOnPage(

+ return (PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(

extension, url, url, tab_id, NULL, -1, NULL) &&

- PermissionsData::CanCaptureVisiblePage(

- extension, tab_id, NULL));

+ PermissionsData::ForExtension(extension)

+ ->CanCaptureVisiblePage(tab_id, NULL));

}

bool CaptureOnly(const Extension* extension, const GURL& url) {

@@ -368,9 +390,10 @@ class ExtensionScriptAndCaptureVisibleTest : public testing::Test {

}

bool CaptureOnly(const Extension* extension, const GURL& url, int tab_id) {

- return !PermissionsData::CanExecuteScriptOnPage(

- extension, url, url, tab_id, NULL, -1, NULL) &&

- PermissionsData::CanCaptureVisiblePage(extension, tab_id, NULL);

+ return !PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(

+ extension, url, url, tab_id, NULL, -1, NULL) &&

+ PermissionsData::ForExtension(extension)

+ ->CanCaptureVisiblePage(tab_id, NULL);

}

bool ScriptOnly(const Extension* extension, const GURL& url,

@@ -381,7 +404,8 @@ class ExtensionScriptAndCaptureVisibleTest : public testing::Test {

bool ScriptOnly(const Extension* extension, const GURL& url,

const GURL& top_url, int tab_id) {

return AllowedScript(extension, url, top_url, tab_id) &&

- !PermissionsData::CanCaptureVisiblePage(extension, tab_id, NULL);

+ !PermissionsData::ForExtension(extension)

+ ->CanCaptureVisiblePage(tab_id, NULL);

}

bool Blocked(const Extension* extension, const GURL& url) {

@@ -389,10 +413,10 @@ class ExtensionScriptAndCaptureVisibleTest : public testing::Test {

}

bool Blocked(const Extension* extension, const GURL& url, int tab_id) {

- return !(PermissionsData::CanExecuteScriptOnPage(

+ return !(PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(

extension, url, url, tab_id, NULL, -1, NULL) ||

- PermissionsData::CanCaptureVisiblePage(

- extension, tab_id, NULL));

+ PermissionsData::ForExtension(extension)

+ ->CanCaptureVisiblePage(tab_id, NULL));

}

bool ScriptAllowedExclusivelyOnTab(

@@ -453,10 +477,12 @@ TEST_F(ExtensionScriptAndCaptureVisibleTest, Permissions) {

EXPECT_TRUE(BlockedScript(extension.get(), http_url, extension_url));

EXPECT_TRUE(BlockedScript(extension.get(), https_url, extension_url));

+ EXPECT_FALSE(PermissionsData::ForExtension(extension)

+ ->HasHostPermission(settings_url));

EXPECT_FALSE(

- PermissionsData::HasHostPermission(extension.get(), settings_url));

- EXPECT_FALSE(PermissionsData::HasHostPermission(extension.get(), about_url));

- EXPECT_TRUE(PermissionsData::HasHostPermission(extension.get(), favicon_url));

+ PermissionsData::ForExtension(extension)->HasHostPermission(about_url));

+ EXPECT_TRUE(

+ PermissionsData::ForExtension(extension)->HasHostPermission(favicon_url));

// Test * for scheme, which implies just the http/https schemes.

extension = LoadManifestStrict("script_and_capture",

@@ -494,7 +520,8 @@ TEST_F(ExtensionScriptAndCaptureVisibleTest, Permissions) {

EXPECT_TRUE(Blocked(extension.get(), settings_url));

EXPECT_TRUE(Blocked(extension.get(), favicon_url));

EXPECT_TRUE(Blocked(extension.get(), about_url));

- EXPECT_TRUE(PermissionsData::HasHostPermission(extension.get(), favicon_url));

+ EXPECT_TRUE(

+ PermissionsData::ForExtension(extension)->HasHostPermission(favicon_url));

// Having http://favicon should not give you chrome://favicon

extension = LoadManifestStrict("script_and_capture",

@@ -510,7 +537,8 @@ TEST_F(ExtensionScriptAndCaptureVisibleTest, Permissions) {

EXPECT_TRUE(Allowed(extension.get(), settings_url));

EXPECT_TRUE(Allowed(extension.get(), about_url));

EXPECT_TRUE(Allowed(extension.get(), favicon_url));

- EXPECT_TRUE(PermissionsData::HasHostPermission(extension.get(), favicon_url));

+ EXPECT_TRUE(

+ PermissionsData::ForExtension(extension)->HasHostPermission(favicon_url));

// Component extensions should only get access to what they ask for.

extension = LoadManifest("script_and_capture",

@@ -523,8 +551,8 @@ TEST_F(ExtensionScriptAndCaptureVisibleTest, Permissions) {

EXPECT_TRUE(Blocked(extension.get(), favicon_url));

EXPECT_TRUE(Blocked(extension.get(), about_url));

EXPECT_TRUE(Blocked(extension.get(), extension_url));

- EXPECT_FALSE(

- PermissionsData::HasHostPermission(extension.get(), settings_url));

+ EXPECT_FALSE(PermissionsData::ForExtension(extension)

+ ->HasHostPermission(settings_url));

}

TEST_F(ExtensionScriptAndCaptureVisibleTest, PermissionsWithChromeURLsEnabled) {

@@ -553,10 +581,11 @@ TEST_F(ExtensionScriptAndCaptureVisibleTest, PermissionsWithChromeURLsEnabled) {

EXPECT_TRUE(BlockedScript(extension.get(), http_url, extension_url));

EXPECT_TRUE(BlockedScript(extension.get(), https_url, extension_url));

- EXPECT_FALSE(

- PermissionsData::HasHostPermission(extension.get(), settings_url));

- EXPECT_FALSE(PermissionsData::HasHostPermission(extension.get(), about_url));

- EXPECT_TRUE(PermissionsData::HasHostPermission(extension.get(), favicon_url));

+ const PermissionsData* permissions_data =

+ PermissionsData::ForExtension(extension);

+ EXPECT_FALSE(permissions_data->HasHostPermission(settings_url));

+ EXPECT_FALSE(permissions_data->HasHostPermission(about_url));

+ EXPECT_TRUE(permissions_data->HasHostPermission(favicon_url));

// Test * for scheme, which implies just the http/https schemes.

extension = LoadManifestStrict("script_and_capture",

@@ -592,7 +621,8 @@ TEST_F(ExtensionScriptAndCaptureVisibleTest, PermissionsWithChromeURLsEnabled) {

EXPECT_TRUE(Blocked(extension.get(), settings_url));

EXPECT_TRUE(ScriptOnly(extension.get(), favicon_url, favicon_url));

EXPECT_TRUE(Blocked(extension.get(), about_url));

- EXPECT_TRUE(PermissionsData::HasHostPermission(extension.get(), favicon_url));

+ EXPECT_TRUE(

+ PermissionsData::ForExtension(extension)->HasHostPermission(favicon_url));

// Having http://favicon should not give you chrome://favicon

extension = LoadManifestStrict("script_and_capture",

@@ -608,7 +638,8 @@ TEST_F(ExtensionScriptAndCaptureVisibleTest, PermissionsWithChromeURLsEnabled) {

EXPECT_TRUE(Allowed(extension.get(), settings_url));

EXPECT_TRUE(Allowed(extension.get(), about_url));

EXPECT_TRUE(Allowed(extension.get(), favicon_url));

- EXPECT_TRUE(PermissionsData::HasHostPermission(extension.get(), favicon_url));

+ EXPECT_TRUE(

+ PermissionsData::ForExtension(extension)->HasHostPermission(favicon_url));

// Component extensions should only get access to what they ask for.

extension = LoadManifest("script_and_capture",

@@ -621,20 +652,19 @@ TEST_F(ExtensionScriptAndCaptureVisibleTest, PermissionsWithChromeURLsEnabled) {

EXPECT_TRUE(Blocked(extension.get(), favicon_url));

EXPECT_TRUE(Blocked(extension.get(), about_url));

EXPECT_TRUE(Blocked(extension.get(), extension_url));

- EXPECT_FALSE(

- PermissionsData::HasHostPermission(extension.get(), settings_url));

+ EXPECT_FALSE(PermissionsData::ForExtension(extension)

+ ->HasHostPermission(settings_url));

}

TEST_F(ExtensionScriptAndCaptureVisibleTest, TabSpecific) {

scoped_refptr<Extension> extension =

LoadManifestStrict("script_and_capture", "tab_specific.json");

- EXPECT_FALSE(PermissionsData::GetTabSpecificPermissions(extension.get(), 0)

- .get());

- EXPECT_FALSE(PermissionsData::GetTabSpecificPermissions(extension.get(), 1)

- .get());

- EXPECT_FALSE(PermissionsData::GetTabSpecificPermissions(extension.get(), 2)

- .get());

+ const PermissionsData* permissions_data =

+ PermissionsData::ForExtension(extension);

+ EXPECT_FALSE(permissions_data->GetTabSpecificPermissionsForTesting(0));

+ EXPECT_FALSE(permissions_data->GetTabSpecificPermissionsForTesting(1));

+ EXPECT_FALSE(permissions_data->GetTabSpecificPermissionsForTesting(2));

std::set<GURL> no_urls;

@@ -656,10 +686,9 @@ TEST_F(ExtensionScriptAndCaptureVisibleTest, TabSpecific) {

scoped_refptr<PermissionSet> permissions(

new PermissionSet(APIPermissionSet(), ManifestPermissionSet(),

allowed_hosts, URLPatternSet()));

- PermissionsData::UpdateTabSpecificPermissions(

- extension.get(), 0, permissions);

+ permissions_data->UpdateTabSpecificPermissions(0, permissions);

EXPECT_EQ(permissions->explicit_hosts(),

- PermissionsData::GetTabSpecificPermissions(extension.get(), 0)

+ permissions_data->GetTabSpecificPermissionsForTesting(0)

->explicit_hosts());

}

@@ -667,9 +696,8 @@ TEST_F(ExtensionScriptAndCaptureVisibleTest, TabSpecific) {

EXPECT_TRUE(ScriptAllowedExclusivelyOnTab(extension.get(), no_urls, 1));

EXPECT_TRUE(ScriptAllowedExclusivelyOnTab(extension.get(), no_urls, 2));

- PermissionsData::ClearTabSpecificPermissions(extension.get(), 0);

- EXPECT_FALSE(PermissionsData::GetTabSpecificPermissions(extension.get(), 0)

- .get());

+ permissions_data->ClearTabSpecificPermissions(0);

+ EXPECT_FALSE(permissions_data->GetTabSpecificPermissionsForTesting(0));

EXPECT_TRUE(ScriptAllowedExclusivelyOnTab(extension.get(), no_urls, 0));

EXPECT_TRUE(ScriptAllowedExclusivelyOnTab(extension.get(), no_urls, 1));

@@ -685,20 +713,18 @@ TEST_F(ExtensionScriptAndCaptureVisibleTest, TabSpecific) {

scoped_refptr<PermissionSet> permissions(

new PermissionSet(APIPermissionSet(), ManifestPermissionSet(),

allowed_hosts, URLPatternSet()));

- PermissionsData::UpdateTabSpecificPermissions(

- extension.get(), 0, permissions);

+ permissions_data->UpdateTabSpecificPermissions(0, permissions);

EXPECT_EQ(permissions->explicit_hosts(),

- PermissionsData::GetTabSpecificPermissions(extension.get(), 0)

+ permissions_data->GetTabSpecificPermissionsForTesting(0)

->explicit_hosts());

permissions = new PermissionSet(APIPermissionSet(),

ManifestPermissionSet(),

more_allowed_hosts,

URLPatternSet());

- PermissionsData::UpdateTabSpecificPermissions(

- extension.get(), 1, permissions);

+ permissions_data->UpdateTabSpecificPermissions(1, permissions);

EXPECT_EQ(permissions->explicit_hosts(),

- PermissionsData::GetTabSpecificPermissions(extension.get(), 1)

+ permissions_data->GetTabSpecificPermissionsForTesting(1)

->explicit_hosts());

}

@@ -707,18 +733,16 @@ TEST_F(ExtensionScriptAndCaptureVisibleTest, TabSpecific) {

ScriptAllowedExclusivelyOnTab(extension.get(), more_allowed_urls, 1));

EXPECT_TRUE(ScriptAllowedExclusivelyOnTab(extension.get(), no_urls, 2));

- PermissionsData::ClearTabSpecificPermissions(extension.get(), 0);

- EXPECT_FALSE(PermissionsData::GetTabSpecificPermissions(extension.get(), 0)

- .get());

+ permissions_data->ClearTabSpecificPermissions(0);

+ EXPECT_FALSE(permissions_data->GetTabSpecificPermissionsForTesting(0));

EXPECT_TRUE(ScriptAllowedExclusivelyOnTab(extension.get(), no_urls, 0));

EXPECT_TRUE(

ScriptAllowedExclusivelyOnTab(extension.get(), more_allowed_urls, 1));

EXPECT_TRUE(ScriptAllowedExclusivelyOnTab(extension.get(), no_urls, 2));

- PermissionsData::ClearTabSpecificPermissions(extension.get(), 1);

- EXPECT_FALSE(PermissionsData::GetTabSpecificPermissions(extension.get(), 1)

- .get());

+ permissions_data->ClearTabSpecificPermissions(1);

+ EXPECT_FALSE(permissions_data->GetTabSpecificPermissionsForTesting(1));

EXPECT_TRUE(ScriptAllowedExclusivelyOnTab(extension.get(), no_urls, 0));

EXPECT_TRUE(ScriptAllowedExclusivelyOnTab(extension.get(), no_urls, 1));

« extensions/common/permissions/permissions_data.cc ('K') | « extensions/common/permissions/permissions_data.cc ('k') | extensions/extensions.gyp » ('j') | no next file with comments »