| Index: chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc
|
| diff --git a/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc b/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc
|
| index 0da26f34b4afcdafbf3d2610a2637020cc3c2961..4d5d003fd067eded319d71550b9bf2917c1e1468 100644
|
| --- a/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc
|
| +++ b/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc
|
| @@ -56,23 +56,13 @@ TEST_F(RendererPermissionsPolicyDelegateTest, CannotScriptSigninProcess) {
|
| scoped_refptr<const Extension> extension(CreateTestExtension("a"));
|
| std::string error;
|
|
|
| - EXPECT_TRUE(PermissionsData::CanExecuteScriptOnPage(extension,
|
| - kSigninUrl,
|
| - kSigninUrl,
|
| - -1,
|
| - NULL,
|
| - -1,
|
| - &error)) << error;
|
| + EXPECT_TRUE(PermissionsData::CanExecuteScriptOnPage(
|
| + extension.get(), kSigninUrl, kSigninUrl, -1, NULL, -1, &error)) << error;
|
| // Pretend we are in the signin process. We should not be able to execute
|
| // script.
|
| CommandLine::ForCurrentProcess()->AppendSwitch(switches::kSigninProcess);
|
| - EXPECT_FALSE(PermissionsData::CanExecuteScriptOnPage(extension,
|
| - kSigninUrl,
|
| - kSigninUrl,
|
| - -1,
|
| - NULL,
|
| - -1,
|
| - &error)) << error;
|
| + EXPECT_FALSE(PermissionsData::CanExecuteScriptOnPage(
|
| + extension.get(), kSigninUrl, kSigninUrl, -1, NULL, -1, &error)) << error;
|
| }
|
|
|
| // Tests that CanExecuteScriptOnPage returns false for the any process
|
| @@ -82,13 +72,8 @@ TEST_F(RendererPermissionsPolicyDelegateTest, CannotScriptWebstore) {
|
| scoped_refptr<const Extension> extension(CreateTestExtension("a"));
|
| std::string error;
|
|
|
| - EXPECT_TRUE(PermissionsData::CanExecuteScriptOnPage(extension,
|
| - kAnyUrl,
|
| - kAnyUrl,
|
| - -1,
|
| - NULL,
|
| - -1,
|
| - &error)) << error;
|
| + EXPECT_TRUE(PermissionsData::CanExecuteScriptOnPage(
|
| + extension.get(), kAnyUrl, kAnyUrl, -1, NULL, -1, &error)) << error;
|
|
|
| // Pretend we are in the webstore process. We should not be able to execute
|
| // script.
|
| @@ -96,13 +81,8 @@ TEST_F(RendererPermissionsPolicyDelegateTest, CannotScriptWebstore) {
|
| CreateTestExtension(extension_misc::kWebStoreAppId));
|
| extension_dispatcher_->OnLoadedInternal(webstore_extension);
|
| extension_dispatcher_->OnActivateExtension(extension_misc::kWebStoreAppId);
|
| - EXPECT_FALSE(PermissionsData::CanExecuteScriptOnPage(extension,
|
| - kAnyUrl,
|
| - kAnyUrl,
|
| - -1,
|
| - NULL,
|
| - -1,
|
| - &error)) << error;
|
| + EXPECT_FALSE(PermissionsData::CanExecuteScriptOnPage(
|
| + extension.get(), kAnyUrl, kAnyUrl, -1, NULL, -1, &error)) << error;
|
| }
|
|
|
| } // namespace extensions
|
|
|