Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3628)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/manifest_tests/extension_manifests_webview_accessible_resources_unittest.cc

Issue 1312653003: Fix for WebView accessible resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small fix. Rebased. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/plugins/plugin_info_message_filter.cc ('k') | chrome/renderer/chrome_content_renderer_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/manifest_tests/extension_manifests_webview_accessible_resources_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_webview_accessible_resources_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_webview_accessible_resources_unittest.cc
index 86c20aa3bc6adaa24a6d9475882fda19c80e4d7c..47bd9758cbe0a69cbd7233126fa0025f58f5377c 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_webview_accessible_resources_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_webview_accessible_resources_unittest.cc
@@ -18,66 +18,47 @@ class WebviewAccessibleResourcesManifestTest : public ChromeManifestTest {
TEST_F(WebviewAccessibleResourcesManifestTest, WebviewAccessibleResources) {
// Manifest version 2 with webview accessible resources specified.
- scoped_refptr<Extension> extension1(
+ scoped_refptr<Extension> extension(
LoadAndExpectSuccess("webview_accessible_resources_1.json"));
- scoped_refptr<Extension> extension2(
- LoadAndExpectSuccess("webview_accessible_resources_2.json"));
- DCHECK(extension1->id() != extension2->id());
- const WebviewInfo* webview_info1 =
- static_cast<const WebviewInfo*>(extension1->GetManifestData(
- extensions::manifest_keys::kWebviewAccessibleResources));
- const WebviewInfo* webview_info2 =
- static_cast<const WebviewInfo*>(extension2->GetManifestData(
- extensions::manifest_keys::kWebviewAccessibleResources));
- EXPECT_FALSE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "fail", "a.html"));
- EXPECT_FALSE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "fail", "b.html"));
- EXPECT_FALSE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "fail", "c.html"));
- EXPECT_FALSE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "fail", "d.html"));
+ EXPECT_FALSE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "fail", "a.html"));
+ EXPECT_FALSE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "fail", "b.html"));
+ EXPECT_FALSE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "fail", "c.html"));
+ EXPECT_FALSE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "fail", "d.html"));
- EXPECT_TRUE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "foo", "a.html"));
- EXPECT_TRUE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "foo", "b.html"));
- EXPECT_FALSE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "foo", "c.html"));
- EXPECT_FALSE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "foo", "d.html"));
+ EXPECT_TRUE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "foo", "a.html"));
+ EXPECT_TRUE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "foo", "b.html"));
+ EXPECT_FALSE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "foo", "c.html"));
+ EXPECT_FALSE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "foo", "d.html"));
- EXPECT_TRUE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "bar", "a.html"));
- EXPECT_FALSE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "bar", "b.html"));
- EXPECT_TRUE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "bar", "c.html"));
- EXPECT_FALSE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "bar", "d.html"));
+ EXPECT_TRUE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "bar", "a.html"));
+ EXPECT_FALSE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "bar", "b.html"));
+ EXPECT_TRUE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "bar", "c.html"));
+ EXPECT_FALSE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "bar", "d.html"));
- EXPECT_TRUE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "foobar", "a.html"));
- EXPECT_TRUE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "foobar", "b.html"));
- EXPECT_TRUE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "foobar", "c.html"));
- EXPECT_FALSE(webview_info1->IsResourceWebviewAccessible(extension1.get(),
- "foobar", "d.html"));
+ EXPECT_TRUE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "foobar", "a.html"));
+ EXPECT_TRUE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "foobar", "b.html"));
+ EXPECT_TRUE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "foobar", "c.html"));
+ EXPECT_FALSE(WebviewInfo::IsResourceWebviewAccessible(extension.get(),
+ "foobar", "d.html"));
- // Check that if the owner extension doesn't match the request extension
- // the resource will not be accessible.
- EXPECT_FALSE(webview_info2->IsResourceWebviewAccessible(extension1.get(),
- "foobar", "a.html"));
- EXPECT_FALSE(webview_info1->IsResourceWebviewAccessible(extension2.get(),
- "foobar", "a.html"));
- EXPECT_TRUE(webview_info2->IsResourceWebviewAccessible(extension2.get(),
- "foobar", "a.html"));
- EXPECT_FALSE(
- webview_info1->IsResourceWebviewAccessible(nullptr, "foobar", "a.html"));
- EXPECT_FALSE(
- webview_info2->IsResourceWebviewAccessible(nullptr, "foobar", "a.html"));
+ EXPECT_FALSE(WebviewInfo::IsResourceWebviewAccessible(nullptr,
+ "foobar", "a.html"));
}
TEST_F(WebviewAccessibleResourcesManifestTest, InvalidManifest) {
« no previous file with comments | « chrome/browser/plugins/plugin_info_message_filter.cc ('k') | chrome/renderer/chrome_content_renderer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698