Separate PermissionsData::CanExecuteScriptOnPage into two functions

chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h"
 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h"
 #include "content/public/test/mock_render_process_host.h"
@@ skipping 42 matching lines @@
           .Set("name", "Extension with ID " + id)
           .Set("version", "1.0")
           .Set("manifest_version", 2)
           .Set("permissions", ListBuilder().Append("<all_urls>")))
       .SetID(id)
       .Build();
 }
 
 }  // namespace
 
-// Tests that CanExecuteScriptOnPage returns false for the signin process,
+// Tests that CanAccessPage returns false for the signin process,
 // all else being equal.
 TEST_F(RendererPermissionsPolicyDelegateTest, CannotScriptSigninProcess) {
   GURL kSigninUrl(
       "https://accounts.google.com/ServiceLogin?service=chromiumsync");
   scoped_refptr<const Extension> extension(CreateTestExtension("a"));
   std::string error;
 
-  EXPECT_TRUE(extension->permissions_data()->CanExecuteScriptOnPage(
-      extension, kSigninUrl, kSigninUrl, -1, NULL, -1, &error))
+  EXPECT_TRUE(extension->permissions_data()->CanAccessPage(
+      extension, kSigninUrl, kSigninUrl, -1, -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(extension->permissions_data()->CanExecuteScriptOnPage(
-      extension, kSigninUrl, kSigninUrl, -1, NULL, -1, &error))
+  EXPECT_FALSE(extension->permissions_data()->CanAccessPage(
+      extension, kSigninUrl, kSigninUrl, -1, -1, &error))
       << error;
 }
 
-// Tests that CanExecuteScriptOnPage returns false for the any process
+// Tests that CanAccessPage returns false for the any process
 // which hosts the webstore.
 TEST_F(RendererPermissionsPolicyDelegateTest, CannotScriptWebstore) {
   GURL kAnyUrl("http://example.com/");
   scoped_refptr<const Extension> extension(CreateTestExtension("a"));
   std::string error;
 
-  EXPECT_TRUE(extension->permissions_data()->CanExecuteScriptOnPage(
-      extension, kAnyUrl, kAnyUrl, -1, NULL, -1, &error))
+  EXPECT_TRUE(extension->permissions_data()->CanAccessPage(
+      extension, kAnyUrl, kAnyUrl, -1, -1, &error))
       << error;
 
   // Pretend we are in the webstore process. We should not be able to execute
   // script.
   scoped_refptr<const Extension> webstore_extension(
       CreateTestExtension(extension_misc::kWebStoreAppId));
   extension_dispatcher_->OnLoadedInternal(webstore_extension);
   extension_dispatcher_->OnActivateExtension(extension_misc::kWebStoreAppId);
-  EXPECT_FALSE(extension->permissions_data()->CanExecuteScriptOnPage(
-      extension, kAnyUrl, kAnyUrl, -1, NULL, -1, &error))
+  EXPECT_FALSE(extension->permissions_data()->CanAccessPage(
+      extension, kAnyUrl, kAnyUrl, -1, -1, &error))
       << error;
 }
 
 }  // namespace extensions