[Extensions] Use document url (not top url) for tab-specific permissions

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 2d1973372f45bc324b315925fab17b3c1e050e49..18d06da84643eb392e99f66b2dba122eb1483050 100644
--- a/chrome/common/extensions/extension_unittest.cc
+++ b/chrome/common/extensions/extension_unittest.cc
@@ -242,69 +242,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, file_url, -1, -1, NULL));
+      extension.get(), 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()->CanAccessPage(
-      extension.get(), file_url, file_url, -1, -1, NULL));
+      extension.get(), 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()->CanAccessPage(
-      extension.get(), file_url, file_url, -1, -1, NULL));
+      extension.get(), 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()->CanAccessPage(
-      extension.get(), file_url, file_url, -1, -1, NULL));
+      extension.get(), 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()->CanAccessPage(
-      extension.get(), file_url, file_url, -1, -1, NULL));
+      extension.get(), 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()->CanAccessPage(
-      extension.get(), file_url, file_url, -1, -1, NULL));
+      extension.get(), 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()->CanRunContentScriptOnPage(
-      extension.get(), file_url, file_url, -1, -1, NULL));
+      extension.get(), 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()->CanRunContentScriptOnPage(
-      extension.get(), file_url, file_url, -1, -1, NULL));
+      extension.get(), 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()->CanRunContentScriptOnPage(
-      extension.get(), file_url, file_url, -1, -1, NULL));
+      extension.get(), 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()->CanRunContentScriptOnPage(
-      extension.get(), file_url, file_url, -1, -1, NULL));
+      extension.get(), 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()->CanRunContentScriptOnPage(
-      extension.get(), file_url, file_url, -1, -1, NULL));
+      extension.get(), 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()->CanRunContentScriptOnPage(
-      extension.get(), file_url, file_url, -1, -1, NULL));
+      extension.get(), file_url, -1, -1, NULL));
 }
 
 TEST(ExtensionTest, ExtraFlags) {