Separate PermissionsData::CanExecuteScriptOnPage into two functions

chrome/common/extensions/extension_unittest.cc

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..6a48ab85d5cff631b72b5db0a66de96ea0dc49a5 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()->CanContentScriptPage(
+      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()->CanContentScriptPage(
+      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()->CanContentScriptPage(
+      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()->CanContentScriptPage(
+      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()->CanContentScriptPage(
+      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()->CanContentScriptPage(
+      extension, file_url, file_url, -1, -1, NULL));
 }
 
 TEST(ExtensionTest, ExtraFlags) {