diff options
Diffstat (limited to 'chrome/common/extensions/extension_unittest.cc')
| -rw-r--r-- | chrome/common/extensions/extension_unittest.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index eb5d088..57d7d6b 100644 --- a/chrome/common/extensions/extension_unittest.cc +++ b/chrome/common/extensions/extension_unittest.cc @@ -245,69 +245,69 @@ TEST(ExtensionTest, WantsFileAccess) { extension = LoadManifest("permissions", "permissions_all_urls.json"); EXPECT_TRUE(extension->wants_file_access()); EXPECT_FALSE(extension->permissions_data()->CanAccessPage( - extension.get(), file_url, -1, -1, NULL)); + extension.get(), file_url, -1, nullptr)); extension = LoadManifest( "permissions", "permissions_all_urls.json", Extension::ALLOW_FILE_ACCESS); EXPECT_TRUE(extension->wants_file_access()); EXPECT_TRUE(extension->permissions_data()->CanAccessPage( - extension.get(), file_url, -1, -1, NULL)); + extension.get(), file_url, -1, nullptr)); // file:///* permission extension = LoadManifest("permissions", "permissions_file_scheme.json"); EXPECT_TRUE(extension->wants_file_access()); EXPECT_FALSE(extension->permissions_data()->CanAccessPage( - extension.get(), file_url, -1, -1, NULL)); + extension.get(), file_url, -1, nullptr)); extension = LoadManifest("permissions", "permissions_file_scheme.json", Extension::ALLOW_FILE_ACCESS); EXPECT_TRUE(extension->wants_file_access()); EXPECT_TRUE(extension->permissions_data()->CanAccessPage( - extension.get(), file_url, -1, -1, NULL)); + extension.get(), file_url, -1, nullptr)); // http://* permission extension = LoadManifest("permissions", "permissions_http_scheme.json"); EXPECT_FALSE(extension->wants_file_access()); EXPECT_FALSE(extension->permissions_data()->CanAccessPage( - extension.get(), file_url, -1, -1, NULL)); + extension.get(), file_url, -1, nullptr)); extension = LoadManifest("permissions", "permissions_http_scheme.json", Extension::ALLOW_FILE_ACCESS); EXPECT_FALSE(extension->wants_file_access()); EXPECT_FALSE(extension->permissions_data()->CanAccessPage( - extension.get(), file_url, -1, -1, NULL)); + extension.get(), file_url, -1, nullptr)); // <all_urls> content script match extension = LoadManifest("permissions", "content_script_all_urls.json"); EXPECT_TRUE(extension->wants_file_access()); EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage( - extension.get(), file_url, -1, -1, NULL)); + extension.get(), file_url, -1, nullptr)); extension = LoadManifest("permissions", "content_script_all_urls.json", Extension::ALLOW_FILE_ACCESS); EXPECT_TRUE(extension->wants_file_access()); EXPECT_TRUE(extension->permissions_data()->CanRunContentScriptOnPage( - extension.get(), file_url, -1, -1, NULL)); + extension.get(), file_url, -1, nullptr)); // file:///* content script match extension = LoadManifest("permissions", "content_script_file_scheme.json"); EXPECT_TRUE(extension->wants_file_access()); EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage( - extension.get(), file_url, -1, -1, NULL)); + extension.get(), file_url, -1, nullptr)); extension = LoadManifest("permissions", "content_script_file_scheme.json", Extension::ALLOW_FILE_ACCESS); EXPECT_TRUE(extension->wants_file_access()); EXPECT_TRUE(extension->permissions_data()->CanRunContentScriptOnPage( - extension.get(), file_url, -1, -1, NULL)); + extension.get(), file_url, -1, nullptr)); // http://* content script match extension = LoadManifest("permissions", "content_script_http_scheme.json"); EXPECT_FALSE(extension->wants_file_access()); EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage( - extension.get(), file_url, -1, -1, NULL)); + extension.get(), file_url, -1, nullptr)); extension = LoadManifest("permissions", "content_script_http_scheme.json", Extension::ALLOW_FILE_ACCESS); EXPECT_FALSE(extension->wants_file_access()); EXPECT_FALSE(extension->permissions_data()->CanRunContentScriptOnPage( - extension.get(), file_url, -1, -1, NULL)); + extension.get(), file_url, -1, nullptr)); } TEST(ExtensionTest, ExtraFlags) { |