chrome/common/extensions/user_script_unittest.cc - Issue 7229012: Use extension match pattern syntax in content settings extension API

Unified Diff: chrome/common/extensions/user_script_unittest.cc

Issue 7229012: Use extension match pattern syntax in content settings extension API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: initialize port Created 9 years, 6 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

« chrome/common/extensions/url_pattern.h ('K') | « chrome/common/extensions/user_script.cc ('k') | chrome/test/data/extensions/api_test/content_settings/standard/test.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/user_script_unittest.cc

diff --git a/chrome/common/extensions/user_script_unittest.cc b/chrome/common/extensions/user_script_unittest.cc

index 47cec8f17bee7a7a9f760aa0ff4d55c7e8f8e44c..c04e54dc9ac28637c03e97ee8e3db8353ced27a6 100644

--- a/chrome/common/extensions/user_script_unittest.cc

+++ b/chrome/common/extensions/user_script_unittest.cc

@@ -73,7 +73,7 @@ TEST(ExtensionUserScriptTest, Glob_StringAnywhere) {

TEST(ExtensionUserScriptTest, UrlPattern) {

URLPattern pattern(kAllSchemes);

ASSERT_EQ(URLPattern::PARSE_SUCCESS,

- pattern.Parse("http://*/foo*", URLPattern::PARSE_STRICT));

+ pattern.Parse("http://*/foo*", URLPattern::ERROR_ON_PORTS));

UserScript script;

script.add_url_pattern(pattern);

@@ -88,12 +88,12 @@ TEST(ExtensionUserScriptTest, ExcludeUrlPattern) {

URLPattern pattern(kAllSchemes);

ASSERT_EQ(URLPattern::PARSE_SUCCESS,

- pattern.Parse("http://*.nytimes.com/*", URLPattern::PARSE_STRICT));

+ pattern.Parse("http://*.nytimes.com/*", URLPattern::ERROR_ON_PORTS));

script.add_url_pattern(pattern);

URLPattern exclude(kAllSchemes);

ASSERT_EQ(URLPattern::PARSE_SUCCESS,

- exclude.Parse("*://*/*business*", URLPattern::PARSE_STRICT));

+ exclude.Parse("*://*/*business*", URLPattern::ERROR_ON_PORTS));

script.add_exclude_url_pattern(exclude);

EXPECT_TRUE(script.MatchesURL(GURL("http://www.nytimes.com/health")));

@@ -106,7 +106,7 @@ TEST(ExtensionUserScriptTest, UrlPatternAndIncludeGlobs) {

URLPattern pattern(kAllSchemes);

ASSERT_EQ(URLPattern::PARSE_SUCCESS,

- pattern.Parse("http://*.nytimes.com/*", URLPattern::PARSE_STRICT));

+ pattern.Parse("http://*.nytimes.com/*", URLPattern::ERROR_ON_PORTS));

script.add_url_pattern(pattern);

script.add_glob("*nytimes.com/???s/*");

@@ -121,7 +121,7 @@ TEST(ExtensionUserScriptTest, UrlPatternAndExcludeGlobs) {

URLPattern pattern(kAllSchemes);

ASSERT_EQ(URLPattern::PARSE_SUCCESS,

- pattern.Parse("http://*.nytimes.com/*", URLPattern::PARSE_STRICT));

+ pattern.Parse("http://*.nytimes.com/*", URLPattern::ERROR_ON_PORTS));

script.add_url_pattern(pattern);

script.add_exclude_glob("*science*");

@@ -138,7 +138,7 @@ TEST(ExtensionUserScriptTest, UrlPatternGlobInteraction) {

URLPattern pattern(kAllSchemes);

ASSERT_EQ(URLPattern::PARSE_SUCCESS,

pattern.Parse("http://www.google.com/*",

- URLPattern::PARSE_STRICT));

+ URLPattern::ERROR_ON_PORTS));

script.add_url_pattern(pattern);

script.add_glob("*bar*");

@@ -167,9 +167,9 @@ TEST(ExtensionUserScriptTest, Pickle) {

URLPattern pattern1(kAllSchemes);

URLPattern pattern2(kAllSchemes);

ASSERT_EQ(URLPattern::PARSE_SUCCESS,

- pattern1.Parse("http://*/foo*", URLPattern::PARSE_STRICT));

+ pattern1.Parse("http://*/foo*", URLPattern::ERROR_ON_PORTS));

ASSERT_EQ(URLPattern::PARSE_SUCCESS,

- pattern2.Parse("http://bar/baz*", URLPattern::PARSE_STRICT));

+ pattern2.Parse("http://bar/baz*", URLPattern::ERROR_ON_PORTS));

UserScript script1;

script1.js_scripts().push_back(UserScript::File(