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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/extension_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
Download patch
« chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.cc ('K') | « chrome/common/extensions/api/storage/storage_schema_manifest_handler.cc ('k') | chrome/common/extensions/manifest_handlers/app_isolation_info.cc » ('j') | chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc » ('J')
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 9fe1027e914aba807a450b5e85cbedc7111aa85a..c2f73b623b54ae7cc3ab905a618336a78ff74e23 100644
--- a/chrome/common/extensions/extension_unittest.cc
+++ b/chrome/common/extensions/extension_unittest.cc
@@ -236,43 +236,43 @@ TEST(ExtensionTest, WantsFileAccess) {
// <all_urls> permission
extension = LoadManifest("permissions", "permissions_all_urls.json");
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_FALSE(PermissionsData::CanExecuteScriptOnPage(
- extension.get(), file_url, file_url, -1, NULL, -1, NULL));
+ EXPECT_FALSE(PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(
not at google - send to devlin 2014/06/02 23:20:06 here!
Devlin 2014/06/03 15:28:21 No! ;) Look closer. We reassign extension, like,
+ extension, file_url, file_url, -1, NULL, -1, NULL));
extension = LoadManifest(
"permissions", "permissions_all_urls.json", Extension::ALLOW_FILE_ACCESS);
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_TRUE(PermissionsData::CanExecuteScriptOnPage(
- extension.get(), file_url, file_url, -1, NULL, -1, NULL));
+ EXPECT_TRUE(PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(
+ extension, file_url, file_url, -1, NULL, -1, NULL));
// file:///* permission
extension = LoadManifest("permissions", "permissions_file_scheme.json");
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_FALSE(PermissionsData::CanExecuteScriptOnPage(
- extension.get(), file_url, file_url, -1, NULL, -1, NULL));
+ EXPECT_FALSE(PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(
+ extension, file_url, file_url, -1, NULL, -1, NULL));
extension = LoadManifest("permissions",
"permissions_file_scheme.json",
Extension::ALLOW_FILE_ACCESS);
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_TRUE(PermissionsData::CanExecuteScriptOnPage(
- extension.get(), file_url, file_url, -1, NULL, -1, NULL));
+ EXPECT_TRUE(PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(
+ extension, file_url, file_url, -1, NULL, -1, NULL));
// http://* permission
extension = LoadManifest("permissions", "permissions_http_scheme.json");
EXPECT_FALSE(extension->wants_file_access());
- EXPECT_FALSE(PermissionsData::CanExecuteScriptOnPage(
- extension.get(), file_url, file_url, -1, NULL, -1, NULL));
+ EXPECT_FALSE(PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(
+ extension, file_url, file_url, -1, NULL, -1, NULL));
extension = LoadManifest("permissions",
"permissions_http_scheme.json",
Extension::ALLOW_FILE_ACCESS);
EXPECT_FALSE(extension->wants_file_access());
- EXPECT_FALSE(PermissionsData::CanExecuteScriptOnPage(
- extension.get(), file_url, file_url, -1, NULL, -1, NULL));
+ EXPECT_FALSE(PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(
+ extension, file_url, file_url, -1, NULL, -1, NULL));
// <all_urls> content script match
extension = LoadManifest("permissions", "content_script_all_urls.json");
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_FALSE(PermissionsData::CanExecuteScriptOnPage(
- extension.get(),
+ EXPECT_FALSE(PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(
+ extension,
file_url,
file_url,
-1,
@@ -282,58 +282,58 @@ TEST(ExtensionTest, WantsFileAccess) {
extension = LoadManifest("permissions", "content_script_all_urls.json",
Extension::ALLOW_FILE_ACCESS);
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_TRUE(PermissionsData::CanExecuteScriptOnPage(
- extension.get(),
+ EXPECT_TRUE(PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(
+ extension,
file_url,
file_url,
-1,
- &ContentScriptsInfo::GetContentScripts(extension.get())[0],
+ &ContentScriptsInfo::GetContentScripts(extension)[0],
-1,
NULL));
// file:///* content script match
extension = LoadManifest("permissions", "content_script_file_scheme.json");
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_FALSE(PermissionsData::CanExecuteScriptOnPage(
- extension.get(),
+ EXPECT_FALSE(PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(
+ extension,
file_url,
file_url,
-1,
- &ContentScriptsInfo::GetContentScripts(extension.get())[0],
+ &ContentScriptsInfo::GetContentScripts(extension)[0],
-1,
NULL));
extension = LoadManifest("permissions", "content_script_file_scheme.json",
Extension::ALLOW_FILE_ACCESS);
EXPECT_TRUE(extension->wants_file_access());
- EXPECT_TRUE(PermissionsData::CanExecuteScriptOnPage(
- extension.get(),
+ EXPECT_TRUE(PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(
+ extension,
file_url,
file_url,
-1,
- &ContentScriptsInfo::GetContentScripts(extension.get())[0],
+ &ContentScriptsInfo::GetContentScripts(extension)[0],
-1,
NULL));
// http://* content script match
extension = LoadManifest("permissions", "content_script_http_scheme.json");
EXPECT_FALSE(extension->wants_file_access());
- EXPECT_FALSE(PermissionsData::CanExecuteScriptOnPage(
- extension.get(),
+ EXPECT_FALSE(PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(
+ extension,
file_url,
file_url,
-1,
- &ContentScriptsInfo::GetContentScripts(extension.get())[0],
+ &ContentScriptsInfo::GetContentScripts(extension)[0],
-1,
NULL));
extension = LoadManifest("permissions", "content_script_http_scheme.json",
Extension::ALLOW_FILE_ACCESS);
EXPECT_FALSE(extension->wants_file_access());
- EXPECT_FALSE(PermissionsData::CanExecuteScriptOnPage(
- extension.get(),
+ EXPECT_FALSE(PermissionsData::ForExtension(extension)->CanExecuteScriptOnPage(
+ extension,
file_url,
file_url,
-1,
- &ContentScriptsInfo::GetContentScripts(extension.get())[0],
+ &ContentScriptsInfo::GetContentScripts(extension)[0],
-1,
NULL));
}
« chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.cc ('K') | « chrome/common/extensions/api/storage/storage_schema_manifest_handler.cc ('k') | chrome/common/extensions/manifest_handlers/app_isolation_info.cc » ('j') | chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698