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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/extension_unittest.cc

Issue 321533003: Separate PermissionsData::CanExecuteScriptOnPage into two functions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc ('k') | chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension_unittest.cc
diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc
index 1ee777cc6ed6c7485844c72deebfedc1224c7b59..04aea3bb89d93889340420095d2ff9013bcea03f 100644
--- a/chrome/common/extensions/extension_unittest.cc
+++ b/chrome/common/extensions/extension_unittest.cc
@@ -236,106 +236,70 @@ TEST(ExtensionTest, WantsFileAccess) {
// <all_urls> permission
extension = LoadManifest("permissions", "permissions_all_urls.json");
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_FALSE(extension->permissions_data()->CanExecuteScriptOnPage(
- extension, file_url, file_url, -1, NULL, -1, NULL));
+ EXPECT_FALSE(extension->permissions_data()->CanAccessPage(
+ extension, file_url, file_url, -1, -1, NULL));
extension = LoadManifest(
"permissions", "permissions_all_urls.json", Extension::ALLOW_FILE_ACCESS);
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_TRUE(extension->permissions_data()->CanExecuteScriptOnPage(
- extension, file_url, file_url, -1, NULL, -1, NULL));
+ EXPECT_TRUE(extension->permissions_data()->CanAccessPage(
+ extension, file_url, file_url, -1, -1, NULL));
// file:///* permission
extension = LoadManifest("permissions", "permissions_file_scheme.json");
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_FALSE(extension->permissions_data()->CanExecuteScriptOnPage(
- extension, file_url, file_url, -1, NULL, -1, NULL));
+ EXPECT_FALSE(extension->permissions_data()->CanAccessPage(
+ extension, file_url, file_url, -1, -1, NULL));
extension = LoadManifest("permissions",
"permissions_file_scheme.json",
Extension::ALLOW_FILE_ACCESS);
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_TRUE(extension->permissions_data()->CanExecuteScriptOnPage(
- extension, file_url, file_url, -1, NULL, -1, NULL));
+ EXPECT_TRUE(extension->permissions_data()->CanAccessPage(
+ extension, file_url, file_url, -1, -1, NULL));
// http://* permission
extension = LoadManifest("permissions", "permissions_http_scheme.json");
EXPECT_FALSE(extension->wants_file_access());
- EXPECT_FALSE(extension->permissions_data()->CanExecuteScriptOnPage(
- extension, file_url, file_url, -1, NULL, -1, NULL));
+ EXPECT_FALSE(extension->permissions_data()->CanAccessPage(
+ extension, file_url, file_url, -1, -1, NULL));
extension = LoadManifest("permissions",
"permissions_http_scheme.json",
Extension::ALLOW_FILE_ACCESS);
EXPECT_FALSE(extension->wants_file_access());
- EXPECT_FALSE(extension->permissions_data()->CanExecuteScriptOnPage(
- extension, file_url, file_url, -1, NULL, -1, NULL));
+ EXPECT_FALSE(extension->permissions_data()->CanAccessPage(
+ extension, file_url, file_url, -1, -1, NULL));
// <all_urls> content script match
extension = LoadManifest("permissions", "content_script_all_urls.json");
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_FALSE(extension->permissions_data()->CanExecuteScriptOnPage(
- extension,
- file_url,
- file_url,
- -1,
- &ContentScriptsInfo::GetContentScripts(extension.get())[0],
- -1,
- NULL));
+ EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage(
+ extension, file_url, file_url, -1, -1, NULL));
extension = LoadManifest("permissions", "content_script_all_urls.json",
Extension::ALLOW_FILE_ACCESS);
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_TRUE(extension->permissions_data()->CanExecuteScriptOnPage(
- extension,
- file_url,
- file_url,
- -1,
- &ContentScriptsInfo::GetContentScripts(extension)[0],
- -1,
- NULL));
+ EXPECT_TRUE(extension->permissions_data()->CanRunContentScriptOnPage(
+ extension, file_url, file_url, -1, -1, NULL));
// file:///* content script match
extension = LoadManifest("permissions", "content_script_file_scheme.json");
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_FALSE(extension->permissions_data()->CanExecuteScriptOnPage(
- extension,
- file_url,
- file_url,
- -1,
- &ContentScriptsInfo::GetContentScripts(extension)[0],
- -1,
- NULL));
+ EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage(
+ extension, file_url, file_url, -1, -1, NULL));
extension = LoadManifest("permissions", "content_script_file_scheme.json",
Extension::ALLOW_FILE_ACCESS);
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_TRUE(extension->permissions_data()->CanExecuteScriptOnPage(
- extension,
- file_url,
- file_url,
- -1,
- &ContentScriptsInfo::GetContentScripts(extension)[0],
- -1,
- NULL));
+ EXPECT_TRUE(extension->permissions_data()->CanRunContentScriptOnPage(
+ extension, file_url, file_url, -1, -1, NULL));
// http://* content script match
extension = LoadManifest("permissions", "content_script_http_scheme.json");
EXPECT_FALSE(extension->wants_file_access());
- EXPECT_FALSE(extension->permissions_data()->CanExecuteScriptOnPage(
- extension,
- file_url,
- file_url,
- -1,
- &ContentScriptsInfo::GetContentScripts(extension)[0],
- -1,
- NULL));
+ EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage(
+ extension, file_url, file_url, -1, -1, NULL));
extension = LoadManifest("permissions", "content_script_http_scheme.json",
Extension::ALLOW_FILE_ACCESS);
EXPECT_FALSE(extension->wants_file_access());
- EXPECT_FALSE(extension->permissions_data()->CanExecuteScriptOnPage(
- extension,
- file_url,
- file_url,
- -1,
- &ContentScriptsInfo::GetContentScripts(extension)[0],
- -1,
- NULL));
+ EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage(
+ extension, file_url, file_url, -1, -1, NULL));
}
TEST(ExtensionTest, ExtraFlags) {
« no previous file with comments | « chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc ('k') | chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698