Separate PermissionsData::CanExecuteScriptOnPage into two functions

chrome/common/extensions/extension_unittest.cc

 // Copyright (c) 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/file_util.h"
 #include "base/format_macros.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 218 matching lines @@
 TEST(ExtensionTest, WantsFileAccess) {
   scoped_refptr<Extension> extension;
   GURL file_url("file:///etc/passwd");
 
   // Ignore the policy delegate for this test.
   PermissionsData::SetPolicyDelegate(NULL);
 
   // <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()->CanRunContentScriptOnPage(
+      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()->CanRunContentScriptOnPage(
+      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()->CanRunContentScriptOnPage(
+      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()->CanRunContentScriptOnPage(
+      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()->CanRunContentScriptOnPage(
+      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()->CanRunContentScriptOnPage(
+      extension, file_url, file_url, -1, -1, NULL));
 }
 
 TEST(ExtensionTest, ExtraFlags) {
   scoped_refptr<Extension> extension;
   extension = LoadManifest("app", "manifest.json", Extension::FROM_WEBSTORE);
   EXPECT_TRUE(extension->from_webstore());
 
   extension = LoadManifest("app", "manifest.json", Extension::FROM_BOOKMARK);
   EXPECT_TRUE(extension->from_bookmark());
 
   extension = LoadManifest("app", "manifest.json", Extension::NO_FLAGS);
   EXPECT_FALSE(extension->from_bookmark());
   EXPECT_FALSE(extension->from_webstore());
 }
 
 }  // namespace extensions