Move URLPattern::ParseOption into a field.

chrome/common/extensions/user_script_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_path.h"
 #include "base/pickle.h"
 #include "chrome/common/extensions/user_script.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 53 matching lines @@
 
 TEST(ExtensionUserScriptTest, Glob_StringAnywhere) {
   UserScript script;
   script.add_glob("*foo*");
   EXPECT_TRUE(script.MatchesURL(GURL("http://foo.com/bar")));
   EXPECT_TRUE(script.MatchesURL(GURL("http://baz.org/foo/bar")));
   EXPECT_FALSE(script.MatchesURL(GURL("http://baz.org")));
 }
 
 TEST(ExtensionUserScriptTest, UrlPattern) {
-  URLPattern pattern(kAllSchemes);
-  ASSERT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("http://*/foo*", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  ASSERT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("http://*/foo*"));
 
   UserScript script;
   script.add_url_pattern(pattern);
   EXPECT_TRUE(script.MatchesURL(GURL("http://monkey.com/foobar")));
   EXPECT_FALSE(script.MatchesURL(GURL("http://monkey.com/hotdog")));
 
   // NOTE: URLPattern is tested more extensively in url_pattern_unittest.cc.
 }
 
 TEST(ExtensionUserScriptTest, ExcludeUrlPattern) {
   UserScript script;
 
-  URLPattern pattern(kAllSchemes);
-  ASSERT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("http://*.nytimes.com/*", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  ASSERT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("http://*.nytimes.com/*"));
   script.add_url_pattern(pattern);
 
-  URLPattern exclude(kAllSchemes);
-  ASSERT_EQ(URLPattern::PARSE_SUCCESS,
-            exclude.Parse("*://*/*business*", URLPattern::ERROR_ON_PORTS));
+  URLPattern exclude(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  ASSERT_EQ(URLPattern::PARSE_SUCCESS, exclude.Parse("*://*/*business*"));
   script.add_exclude_url_pattern(exclude);
 
   EXPECT_TRUE(script.MatchesURL(GURL("http://www.nytimes.com/health")));
   EXPECT_FALSE(script.MatchesURL(GURL("http://www.nytimes.com/business")));
   EXPECT_TRUE(script.MatchesURL(GURL("http://business.nytimes.com")));
 }
 
 TEST(ExtensionUserScriptTest, UrlPatternAndIncludeGlobs) {
   UserScript script;
 
-  URLPattern pattern(kAllSchemes);
-  ASSERT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("http://*.nytimes.com/*", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  ASSERT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("http://*.nytimes.com/*"));
   script.add_url_pattern(pattern);
 
   script.add_glob("*nytimes.com/???s/*");
 
   EXPECT_TRUE(script.MatchesURL(GURL("http://www.nytimes.com/arts/1.html")));
   EXPECT_TRUE(script.MatchesURL(GURL("http://www.nytimes.com/jobs/1.html")));
   EXPECT_FALSE(script.MatchesURL(GURL("http://www.nytimes.com/sports/1.html")));
 }
 
 TEST(ExtensionUserScriptTest, UrlPatternAndExcludeGlobs) {
   UserScript script;
 
-  URLPattern pattern(kAllSchemes);
-  ASSERT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("http://*.nytimes.com/*", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  ASSERT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("http://*.nytimes.com/*"));
   script.add_url_pattern(pattern);
 
   script.add_exclude_glob("*science*");
 
   EXPECT_TRUE(script.MatchesURL(GURL("http://www.nytimes.com")));
   EXPECT_FALSE(script.MatchesURL(GURL("http://science.nytimes.com")));
   EXPECT_FALSE(script.MatchesURL(GURL("http://www.nytimes.com/science")));
 }
 
 TEST(ExtensionUserScriptTest, UrlPatternGlobInteraction) {
   // If there are both, match intersection(union(globs), union(urlpatterns)).
   UserScript script;
 
-  URLPattern pattern(kAllSchemes);
-  ASSERT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("http://www.google.com/*",
-                          URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  ASSERT_EQ(URLPattern::PARSE_SUCCESS,pattern.Parse("http://www.google.com/*"));
   script.add_url_pattern(pattern);
 
   script.add_glob("*bar*");
 
   // No match, because it doesn't match the glob.
   EXPECT_FALSE(script.MatchesURL(GURL("http://www.google.com/foo")));
 
   script.add_exclude_glob("*baz*");
 
   // No match, because it matches the exclude glob.
   EXPECT_FALSE(script.MatchesURL(GURL("http://www.google.com/baz")));
 
   // Match, because it matches the glob, doesn't match the exclude glob.
   EXPECT_TRUE(script.MatchesURL(GURL("http://www.google.com/bar")));
 
   // Try with just a single exclude glob.
   script.clear_globs();
   EXPECT_TRUE(script.MatchesURL(GURL("http://www.google.com/foo")));
 
   // Try with no globs or exclude globs.
   script.clear_exclude_globs();
   EXPECT_TRUE(script.MatchesURL(GURL("http://www.google.com/foo")));
 }
 
 TEST(ExtensionUserScriptTest, Pickle) {
-  URLPattern pattern1(kAllSchemes);
-  URLPattern pattern2(kAllSchemes);
-  ASSERT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern1.Parse("http://*/foo*", URLPattern::ERROR_ON_PORTS));
-  ASSERT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern2.Parse("http://bar/baz*", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern1(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  URLPattern pattern2(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  ASSERT_EQ(URLPattern::PARSE_SUCCESS, pattern1.Parse("http://*/foo*"));
+  ASSERT_EQ(URLPattern::PARSE_SUCCESS, pattern2.Parse("http://bar/baz*"));
 
   UserScript script1;
   script1.js_scripts().push_back(UserScript::File(
       FilePath(FILE_PATH_LITERAL("c:\\foo\\")),
       FilePath(FILE_PATH_LITERAL("foo.user.js")),
       GURL("chrome-extension://abc/foo.user.js")));
   script1.css_scripts().push_back(UserScript::File(
       FilePath(FILE_PATH_LITERAL("c:\\foo\\")),
       FilePath(FILE_PATH_LITERAL("foo.user.css")),
       GURL("chrome-extension://abc/foo.user.css")));
@@ skipping 26 matching lines @@
     EXPECT_EQ(script1.globs()[i], script2.globs()[i]);
   }
 
   ASSERT_EQ(script1.url_patterns(), script2.url_patterns());
 }
 
 TEST(ExtensionUserScriptTest, Defaults) {
   UserScript script;
   ASSERT_EQ(UserScript::DOCUMENT_IDLE, script.run_location());
 }