diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-30 08:47:58 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-30 08:47:58 +0000 |
| commit | 188827c86eca6fa38e6cef5ac9852a26826a658a (patch) | |
| tree | 68d51db12b35ee9fb4653edd45594dcc28ae19b2 /chrome/common/extensions/user_script_unittest.cc | |
| parent | adf46b69ad590589a13477f2b8ddce9d071e92a9 (diff) | |
| download | chromium_src-188827c86eca6fa38e6cef5ac9852a26826a658a.zip chromium_src-188827c86eca6fa38e6cef5ac9852a26826a658a.tar.gz chromium_src-188827c86eca6fa38e6cef5ac9852a26826a658a.tar.bz2 | |
Use extension match pattern syntax in content settings extension API.
This requires adding a port to a URLPattern, but that shouldn't change existing behavior, as we already have a lenient parsing mode there.
BUG=71067
Review URL: http://codereview.chromium.org/7229012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/user_script_unittest.cc')
| -rw-r--r-- | chrome/common/extensions/user_script_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/common/extensions/user_script_unittest.cc b/chrome/common/extensions/user_script_unittest.cc index 47cec8f..c04e54d 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( |