Add 'web_accessible_resource" keyword for version 2 extension manifests. This makes extension resources web accessible only when explicitly intended. Behavior is unaffected unless an extension specifies a manifest_version of 2 or more.

BUG=46002
TEST=ExtensionResourceRequestPolicyTest.WebAccessibleResources
Review URL: http://codereview.chromium.org/8849010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115401 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 34 insertions, 0 deletions

diff --git a/chrome/common/extensions/extension_manifests_unittest.cc b/chrome/common/extensions/extension_manifests_unittest.cc
index 1a54e03..6fd314e 100644
--- a/chrome/common/extensions/extension_manifests_unittest.cc
+++ b/chrome/common/extensions/extension_manifests_unittest.cc
@@ -844,6 +844,40 @@ TEST_F(ExtensionManifestTest, PortsInPermissions) {
   LoadAndExpectSuccess("ports_in_permissions.json");
 }
 
+TEST_F(ExtensionManifestTest, WebAccessibleResources) {
+  // Manifest version 2 with web accessible resources specified.
+  scoped_refptr<Extension> extension1(
+      LoadAndExpectSuccess("web_accessible_resources_1.json"));
+
+  // Manifest version 2 with no web accessible resources.
+  scoped_refptr<Extension> extension2(
+      LoadAndExpectSuccess("web_accessible_resources_2.json"));
+
+  // Default manifest version with web accessible resources specified.
+  scoped_refptr<Extension> extension3(
+      LoadAndExpectSuccess("web_accessible_resources_3.json"));
+
+  // Default manifest version with no web accessible resources.
+  scoped_refptr<Extension> extension4(
+      LoadAndExpectSuccess("web_accessible_resources_4.json"));
+
+  EXPECT_TRUE(extension1->HasWebAccessibleResources());
+  EXPECT_FALSE(extension2->HasWebAccessibleResources());
+  EXPECT_TRUE(extension3->HasWebAccessibleResources());
+  EXPECT_FALSE(extension4->HasWebAccessibleResources());
+
+  EXPECT_TRUE(extension1->IsResourceWebAccessible("/test"));
+  EXPECT_FALSE(extension1->IsResourceWebAccessible("/none"));
+
+  EXPECT_FALSE(extension2->IsResourceWebAccessible("/test"));
+
+  EXPECT_TRUE(extension3->IsResourceWebAccessible("/test"));
+  EXPECT_FALSE(extension3->IsResourceWebAccessible("/none"));
+
+  EXPECT_TRUE(extension4->IsResourceWebAccessible("/test"));
+  EXPECT_TRUE(extension4->IsResourceWebAccessible("/none"));
+}
+
 TEST_F(ExtensionManifestTest, IsolatedApps) {
   // Requires --enable-experimental-extension-apis
   LoadAndExpectError("isolated_app_valid.json",