Move URLPattern::ParseOption into a field.

chrome/common/extensions/url_pattern_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/memory/scoped_ptr.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "googleurl/src/gurl.h"
 
 // See url_pattern.h for examples of valid and invalid patterns.
@@ skipping 17 matching lines @@
     { "http://", URLPattern::PARSE_ERROR_EMPTY_HOST },
     { "http:///", URLPattern::PARSE_ERROR_EMPTY_HOST },
     { "http://*foo/bar", URLPattern::PARSE_ERROR_INVALID_HOST_WILDCARD },
     { "http://foo.*.bar/baz", URLPattern::PARSE_ERROR_INVALID_HOST_WILDCARD },
     { "http://fo.*.ba:123/baz", URLPattern::PARSE_ERROR_INVALID_HOST_WILDCARD },
     { "http:/bar", URLPattern::PARSE_ERROR_WRONG_SCHEME_SEPARATOR },
     { "http://bar", URLPattern::PARSE_ERROR_EMPTY_PATH },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kInvalidPatterns); ++i) {
-    URLPattern pattern(URLPattern::SCHEME_ALL);
+    URLPattern pattern(URLPattern::IGNORE_PORTS, URLPattern::SCHEME_ALL);
     EXPECT_EQ(kInvalidPatterns[i].expected_result,
-              pattern.Parse(kInvalidPatterns[i].pattern,
-                            URLPattern::IGNORE_PORTS))
+              pattern.Parse(kInvalidPatterns[i].pattern))
         << kInvalidPatterns[i].pattern;
   }
 };
 
 TEST(ExtensionURLPatternTest, Ports) {
   const struct {
     const char* pattern;
     URLPattern::ParseResult expected_result_error_on_ports;
     URLPattern::ParseResult expected_result_ignore_ports;
     URLPattern::ParseResult expected_result_use_ports;
@@ skipping 44 matching lines @@
       "*", "*", "*" },
     { "http://*.foo/bar:1234", URLPattern::PARSE_SUCCESS,
       URLPattern::PARSE_SUCCESS, URLPattern::PARSE_SUCCESS,
       "*.foo", "*.foo", "*" },
     { "http://foo/bar:1234/path", URLPattern::PARSE_SUCCESS,
       URLPattern::PARSE_SUCCESS, URLPattern::PARSE_SUCCESS,
       "foo", "foo", "*" },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestPatterns); ++i) {
-    URLPattern use_ports_pattern(URLPattern::SCHEME_ALL);
+    URLPattern use_ports_pattern(URLPattern::USE_PORTS, URLPattern::SCHEME_ALL);
     // Check results with |USE_PORTS|.
     EXPECT_EQ(kTestPatterns[i].expected_result_use_ports,
-              use_ports_pattern.Parse(kTestPatterns[i].pattern,
-                                      URLPattern::USE_PORTS))
+              use_ports_pattern.Parse(kTestPatterns[i].pattern))
         << "Got unexpected result for URL pattern: "
         << kTestPatterns[i].pattern;
     EXPECT_EQ(kTestPatterns[i].expected_port, use_ports_pattern.port())
         << "Got unexpected port for URL pattern: " << kTestPatterns[i].pattern;
 
-    URLPattern ignore_ports_pattern(URLPattern::SCHEME_ALL);
+    URLPattern ignore_ports_pattern(URLPattern::IGNORE_PORTS,
+                                    URLPattern::SCHEME_ALL);
     // Check results with |IGNORE_PORTS|.
     EXPECT_EQ(kTestPatterns[i].expected_result_ignore_ports,
-              ignore_ports_pattern.Parse(kTestPatterns[i].pattern,
-                                         URLPattern::IGNORE_PORTS))
+              ignore_ports_pattern.Parse(kTestPatterns[i].pattern))
         << "Got unexpected result for URL pattern: "
         << kTestPatterns[i].pattern;
     EXPECT_EQ("*", ignore_ports_pattern.port())
         << "Got unexpected port for URL pattern: " << kTestPatterns[i].pattern;
 
-    URLPattern error_on_ports_pattern(URLPattern::SCHEME_ALL);
+    URLPattern error_on_ports_pattern(URLPattern::ERROR_ON_PORTS,
+                                      URLPattern::SCHEME_ALL);
     // Check results with |ERROR_ON_PORTS|.
     EXPECT_EQ(kTestPatterns[i].expected_result_error_on_ports,
-              error_on_ports_pattern.Parse(kTestPatterns[i].pattern,
-                                           URLPattern::ERROR_ON_PORTS))
+              error_on_ports_pattern.Parse(kTestPatterns[i].pattern))
         << "Got unexpected result for URL pattern: "
         << kTestPatterns[i].pattern;
   }
 };
 
 // all pages for a given scheme
 TEST(ExtensionURLPatternTest, Match1) {
-  URLPattern pattern(kAllSchemes);
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("http://*/*", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("http://*/*"));
   EXPECT_EQ("http", pattern.scheme());
   EXPECT_EQ("", pattern.host());
   EXPECT_TRUE(pattern.match_subdomains());
   EXPECT_FALSE(pattern.match_all_urls());
   EXPECT_EQ("/*", pattern.path());
   EXPECT_TRUE(pattern.MatchesURL(GURL("http://google.com")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("http://yahoo.com")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("http://google.com/foo")));
   EXPECT_FALSE(pattern.MatchesURL(GURL("https://google.com")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("http://74.125.127.100/search")));
 }
 
 // all domains
 TEST(ExtensionURLPatternTest, Match2) {
-  URLPattern pattern(kAllSchemes);
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("https://*/foo*", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("https://*/foo*"));
   EXPECT_EQ("https", pattern.scheme());
   EXPECT_EQ("", pattern.host());
   EXPECT_TRUE(pattern.match_subdomains());
   EXPECT_FALSE(pattern.match_all_urls());
   EXPECT_EQ("/foo*", pattern.path());
   EXPECT_TRUE(pattern.MatchesURL(GURL("https://www.google.com/foo")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("https://www.google.com/foobar")));
   EXPECT_FALSE(pattern.MatchesURL(GURL("http://www.google.com/foo")));
   EXPECT_FALSE(pattern.MatchesURL(GURL("https://www.google.com/")));
 }
 
 // subdomains
 TEST(URLPatternTest, Match3) {
-  URLPattern pattern(kAllSchemes);
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
   EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("http://*.google.com/foo*bar",
-                          URLPattern::ERROR_ON_PORTS));
+            pattern.Parse("http://*.google.com/foo*bar"));
   EXPECT_EQ("http", pattern.scheme());
   EXPECT_EQ("google.com", pattern.host());
   EXPECT_TRUE(pattern.match_subdomains());
   EXPECT_FALSE(pattern.match_all_urls());
   EXPECT_EQ("/foo*bar", pattern.path());
   EXPECT_TRUE(pattern.MatchesURL(GURL("http://google.com/foobar")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("http://www.google.com/foo?bar")));
   EXPECT_TRUE(pattern.MatchesURL(
       GURL("http://monkey.images.google.com/foooobar")));
   EXPECT_FALSE(pattern.MatchesURL(GURL("http://yahoo.com/foobar")));
 }
 
 // glob escaping
 TEST(ExtensionURLPatternTest, Match5) {
-  URLPattern pattern(kAllSchemes);
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("file:///foo?bar\\*baz", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("file:///foo?bar\\*baz"));
   EXPECT_EQ("file", pattern.scheme());
   EXPECT_EQ("", pattern.host());
   EXPECT_FALSE(pattern.match_subdomains());
   EXPECT_FALSE(pattern.match_all_urls());
   EXPECT_EQ("/foo?bar\\*baz", pattern.path());
   EXPECT_TRUE(pattern.MatchesURL(GURL("file:///foo?bar\\hellobaz")));
   EXPECT_FALSE(pattern.MatchesURL(GURL("file:///fooXbar\\hellobaz")));
 }
 
 // ip addresses
 TEST(ExtensionURLPatternTest, Match6) {
-  URLPattern pattern(kAllSchemes);
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("http://127.0.0.1/*", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("http://127.0.0.1/*"));
   EXPECT_EQ("http", pattern.scheme());
   EXPECT_EQ("127.0.0.1", pattern.host());
   EXPECT_FALSE(pattern.match_subdomains());
   EXPECT_FALSE(pattern.match_all_urls());
   EXPECT_EQ("/*", pattern.path());
   EXPECT_TRUE(pattern.MatchesURL(GURL("http://127.0.0.1")));
 }
 
 // subdomain matching with ip addresses
 TEST(ExtensionURLPatternTest, Match7) {
-  URLPattern pattern(kAllSchemes);
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("http://*.0.0.1/*",
-                          URLPattern::ERROR_ON_PORTS)); // allowed, but useless
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  // allowed, but useless
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("http://*.0.0.1/*"));
   EXPECT_EQ("http", pattern.scheme());
   EXPECT_EQ("0.0.1", pattern.host());
   EXPECT_TRUE(pattern.match_subdomains());
   EXPECT_FALSE(pattern.match_all_urls());
   EXPECT_EQ("/*", pattern.path());
   // Subdomain matching is never done if the argument has an IP address host.
   EXPECT_FALSE(pattern.MatchesURL(GURL("http://127.0.0.1")));
 };
 
 // unicode
 TEST(ExtensionURLPatternTest, Match8) {
-  URLPattern pattern(kAllSchemes);
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
   // The below is the ASCII encoding of the following URL:
   // http://*.\xe1\x80\xbf/a\xc2\x81\xe1*
   EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("http://*.xn--gkd/a%C2%81%E1*",
-                          URLPattern::ERROR_ON_PORTS));
+            pattern.Parse("http://*.xn--gkd/a%C2%81%E1*"));
   EXPECT_EQ("http", pattern.scheme());
   EXPECT_EQ("xn--gkd", pattern.host());
   EXPECT_TRUE(pattern.match_subdomains());
   EXPECT_FALSE(pattern.match_all_urls());
   EXPECT_EQ("/a%C2%81%E1*", pattern.path());
   EXPECT_TRUE(pattern.MatchesURL(
       GURL("http://abc.\xe1\x80\xbf/a\xc2\x81\xe1xyz")));
   EXPECT_TRUE(pattern.MatchesURL(
       GURL("http://\xe1\x80\xbf/a\xc2\x81\xe1\xe1")));
 };
 
 // chrome://
 TEST(ExtensionURLPatternTest, Match9) {
-  URLPattern pattern(kAllSchemes);
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("chrome://favicon/*", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("chrome://favicon/*"));
   EXPECT_EQ("chrome", pattern.scheme());
   EXPECT_EQ("favicon", pattern.host());
   EXPECT_FALSE(pattern.match_subdomains());
   EXPECT_FALSE(pattern.match_all_urls());
   EXPECT_EQ("/*", pattern.path());
   EXPECT_TRUE(pattern.MatchesURL(GURL("chrome://favicon/http://google.com")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("chrome://favicon/https://google.com")));
   EXPECT_FALSE(pattern.MatchesURL(GURL("chrome://history")));
 };
 
 // *://
 TEST(ExtensionURLPatternTest, Match10) {
-  URLPattern pattern(kAllSchemes);
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("*://*/*", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("*://*/*"));
   EXPECT_TRUE(pattern.MatchesScheme("http"));
   EXPECT_TRUE(pattern.MatchesScheme("https"));
   EXPECT_FALSE(pattern.MatchesScheme("chrome"));
   EXPECT_FALSE(pattern.MatchesScheme("file"));
   EXPECT_FALSE(pattern.MatchesScheme("ftp"));
   EXPECT_TRUE(pattern.match_subdomains());
   EXPECT_FALSE(pattern.match_all_urls());
   EXPECT_EQ("/*", pattern.path());
   EXPECT_TRUE(pattern.MatchesURL(GURL("http://127.0.0.1")));
   EXPECT_FALSE(pattern.MatchesURL(GURL("chrome://favicon/http://google.com")));
   EXPECT_FALSE(pattern.MatchesURL(GURL("file:///foo/bar")));
   EXPECT_FALSE(pattern.MatchesURL(GURL("file://localhost/foo/bar")));
 };
 
 // <all_urls>
 TEST(ExtensionURLPatternTest, Match11) {
-  URLPattern pattern(kAllSchemes);
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("<all_urls>", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("<all_urls>"));
   EXPECT_TRUE(pattern.MatchesScheme("chrome"));
   EXPECT_TRUE(pattern.MatchesScheme("http"));
   EXPECT_TRUE(pattern.MatchesScheme("https"));
   EXPECT_TRUE(pattern.MatchesScheme("file"));
   EXPECT_TRUE(pattern.match_subdomains());
   EXPECT_TRUE(pattern.match_all_urls());
   EXPECT_EQ("/*", pattern.path());
   EXPECT_TRUE(pattern.MatchesURL(GURL("chrome://favicon/http://google.com")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("http://127.0.0.1")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("file:///foo/bar")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("file://localhost/foo/bar")));
 
   // Make sure the properties are the same when creating an <all_urls> pattern
   // via SetMatchAllURLs and by parsing <all_urls>.
-  URLPattern pattern2(kAllSchemes);
+  URLPattern pattern2(URLPattern::ERROR_ON_PORTS, kAllSchemes);
   pattern2.SetMatchAllURLs(true);
 
   EXPECT_EQ(pattern.valid_schemes(), pattern2.valid_schemes());
   EXPECT_EQ(pattern.match_subdomains(), pattern2.match_subdomains());
   EXPECT_EQ(pattern.path(), pattern2.path());
   EXPECT_EQ(pattern.match_all_urls(), pattern2.match_all_urls());
   EXPECT_EQ(pattern.scheme(), pattern2.scheme());
   EXPECT_EQ(pattern.port(), pattern2.port());
   EXPECT_EQ(pattern.GetAsString(), pattern2.GetAsString());
 };
 
 // SCHEME_ALL matches all schemes.
 TEST(ExtensionURLPatternTest, Match12) {
-  URLPattern pattern(URLPattern::SCHEME_ALL);
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("<all_urls>", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, URLPattern::SCHEME_ALL);
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("<all_urls>"));
   EXPECT_TRUE(pattern.MatchesScheme("chrome"));
   EXPECT_TRUE(pattern.MatchesScheme("http"));
   EXPECT_TRUE(pattern.MatchesScheme("https"));
   EXPECT_TRUE(pattern.MatchesScheme("file"));
   EXPECT_TRUE(pattern.MatchesScheme("javascript"));
   EXPECT_TRUE(pattern.MatchesScheme("data"));
   EXPECT_TRUE(pattern.MatchesScheme("about"));
   EXPECT_TRUE(pattern.MatchesScheme("chrome-extension"));
   EXPECT_TRUE(pattern.match_subdomains());
   EXPECT_TRUE(pattern.match_all_urls());
@@ skipping 17 matching lines @@
   {"about:blank", "about:blank"},
   {"about:*", "about:version"},
   {"chrome-extension://*/*", "chrome-extension://FTW"},
   {"data:*", "data:monkey"},
   {"javascript:*", "javascript:atemyhomework"},
 };
 
 // SCHEME_ALL and specific schemes.
 TEST(ExtensionURLPatternTest, Match13) {
   for (size_t i = 0; i < arraysize(kMatch13UrlPatternTestCases); ++i) {
-    URLPattern pattern(URLPattern::SCHEME_ALL);
+    URLPattern pattern(URLPattern::ERROR_ON_PORTS, URLPattern::SCHEME_ALL);
     EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-              pattern.Parse(kMatch13UrlPatternTestCases[i].pattern,
-                            URLPattern::ERROR_ON_PORTS))
+              pattern.Parse(kMatch13UrlPatternTestCases[i].pattern))
         << " while parsing " << kMatch13UrlPatternTestCases[i].pattern;
     EXPECT_TRUE(pattern.MatchesURL(
         GURL(kMatch13UrlPatternTestCases[i].matches)))
         << " while matching " << kMatch13UrlPatternTestCases[i].matches;
   }
 
   // Negative test.
-  URLPattern pattern(URLPattern::SCHEME_ALL);
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("data:*", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, URLPattern::SCHEME_ALL);
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("data:*"));
   EXPECT_FALSE(pattern.MatchesURL(GURL("about:blank")));
 };
 
 // file scheme with empty hostname
 TEST(ExtensionURLPatternTest, Match14) {
-  URLPattern pattern(kAllSchemes);
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("file:///foo*", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("file:///foo*"));
   EXPECT_EQ("file", pattern.scheme());
   EXPECT_EQ("", pattern.host());
   EXPECT_FALSE(pattern.match_subdomains());
   EXPECT_FALSE(pattern.match_all_urls());
   EXPECT_EQ("/foo*", pattern.path());
   EXPECT_FALSE(pattern.MatchesURL(GURL("file://foo")));
   EXPECT_FALSE(pattern.MatchesURL(GURL("file://foobar")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("file:///foo")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("file:///foobar")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("file://localhost/foo")));
 }
 
 // file scheme without hostname part
 TEST(ExtensionURLPatternTest, Match15) {
-  URLPattern pattern(kAllSchemes);
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("file://foo*", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("file://foo*"));
   EXPECT_EQ("file", pattern.scheme());
   EXPECT_EQ("", pattern.host());
   EXPECT_FALSE(pattern.match_subdomains());
   EXPECT_FALSE(pattern.match_all_urls());
   EXPECT_EQ("/foo*", pattern.path());
   EXPECT_FALSE(pattern.MatchesURL(GURL("file://foo")));
   EXPECT_FALSE(pattern.MatchesURL(GURL("file://foobar")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("file:///foo")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("file:///foobar")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("file://localhost/foo")));
 }
 
 // file scheme with hostname
 TEST(ExtensionURLPatternTest, Match16) {
-  URLPattern pattern(kAllSchemes);
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("file://localhost/foo*", URLPattern::ERROR_ON_PORTS));
+  URLPattern pattern(URLPattern::ERROR_ON_PORTS, kAllSchemes);
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("file://localhost/foo*"));
   EXPECT_EQ("file", pattern.scheme());
   // Since hostname is ignored for file://.
   EXPECT_EQ("", pattern.host());
   EXPECT_FALSE(pattern.match_subdomains());
   EXPECT_FALSE(pattern.match_all_urls());
   EXPECT_EQ("/foo*", pattern.path());
   EXPECT_FALSE(pattern.MatchesURL(GURL("file://foo")));
   EXPECT_FALSE(pattern.MatchesURL(GURL("file://foobar")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("file:///foo")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("file:///foobar")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("file://localhost/foo")));
 }
 
 // Specific port
 TEST(ExtensionURLPatternTest, Match17) {
-  URLPattern pattern(kAllSchemes);
+  URLPattern pattern(URLPattern::USE_PORTS, kAllSchemes);
   EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("http://www.example.com:80/foo",
-                          URLPattern::USE_PORTS));
+            pattern.Parse("http://www.example.com:80/foo"));
   EXPECT_EQ("http", pattern.scheme());
   EXPECT_EQ("www.example.com", pattern.host());
   EXPECT_FALSE(pattern.match_subdomains());
   EXPECT_FALSE(pattern.match_all_urls());
   EXPECT_EQ("/foo", pattern.path());
   EXPECT_EQ("80", pattern.port());
   EXPECT_TRUE(pattern.MatchesURL(GURL("http://www.example.com:80/foo")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("http://www.example.com/foo")));
   EXPECT_FALSE(pattern.MatchesURL(GURL("http://www.example.com:8080/foo")));
 }
 
 // Explicit port wildcard
 TEST(ExtensionURLPatternTest, Match18) {
-  URLPattern pattern(kAllSchemes);
+  URLPattern pattern(URLPattern::USE_PORTS, kAllSchemes);
   EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern.Parse("http://www.example.com:*/foo",
-                          URLPattern::USE_PORTS));
+            pattern.Parse("http://www.example.com:*/foo"));
   EXPECT_EQ("http", pattern.scheme());
   EXPECT_EQ("www.example.com", pattern.host());
   EXPECT_FALSE(pattern.match_subdomains());
   EXPECT_FALSE(pattern.match_all_urls());
   EXPECT_EQ("/foo", pattern.path());
   EXPECT_EQ("*", pattern.port());
   EXPECT_TRUE(pattern.MatchesURL(GURL("http://www.example.com:80/foo")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("http://www.example.com/foo")));
   EXPECT_TRUE(pattern.MatchesURL(GURL("http://www.example.com:8080/foo")));
 }
@@ skipping 11 matching lines @@
   { "chrome-extension://FTW/" },
   { "data:*" },
   { "data:monkey" },
   { "javascript:*" },
   { "javascript:atemyhomework" },
   { "http://www.example.com:8080/foo" },
 };
 
 TEST(ExtensionURLPatternTest, GetAsString) {
   for (size_t i = 0; i < arraysize(kGetAsStringTestCases); ++i) {
-    URLPattern pattern1(URLPattern::SCHEME_ALL);
+    URLPattern pattern1(URLPattern::USE_PORTS, URLPattern::SCHEME_ALL);
     EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-              pattern1.Parse(kGetAsStringTestCases[i].pattern,
-                             URLPattern::USE_PORTS))
+              pattern1.Parse(kGetAsStringTestCases[i].pattern))
         << "Error parsing " << kGetAsStringTestCases[i].pattern;
     EXPECT_EQ(kGetAsStringTestCases[i].pattern,
               pattern1.GetAsString());
-    URLPattern pattern2(URLPattern::SCHEME_ALL);
 
+    URLPattern pattern2(URLPattern::IGNORE_PORTS, URLPattern::SCHEME_ALL);
     EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-              pattern2.Parse(kGetAsStringTestCases[i].pattern,
-                             URLPattern::IGNORE_PORTS))
+              pattern2.Parse(kGetAsStringTestCases[i].pattern))
         << "Error parsing " << kGetAsStringTestCases[i].pattern;
     EXPECT_EQ(kGetAsStringTestCases[i].pattern,
               pattern2.GetAsString());
   }
 }
 
 void TestPatternOverlap(const URLPattern& pattern1, const URLPattern& pattern2,
                         bool expect_overlap) {
   EXPECT_EQ(expect_overlap, pattern1.OverlapsWith(pattern2))
       << pattern1.GetAsString() << ", " << pattern2.GetAsString();
@@ skipping 74 matching lines @@
   EXPECT_EQ("http://google.com/foo", all_schemes[0].GetAsString());
   EXPECT_EQ("https://google.com/foo", all_schemes[1].GetAsString());
 
   EXPECT_EQ("http://google.com/monkey", monkey[0].GetAsString());
 }
 
 TEST(ExtensionURLPatternTest, IgnorePorts) {
   std::string pattern_str = "http://www.example.com:8080/foo";
   GURL url("http://www.example.com:1234/foo");
 
-  URLPattern pattern1(kAllSchemes);
-  URLPattern pattern2(kAllSchemes);
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern1.Parse(pattern_str, URLPattern::IGNORE_PORTS));
-  EXPECT_EQ(URLPattern::PARSE_SUCCESS,
-            pattern2.Parse(pattern_str, URLPattern::USE_PORTS));
+  URLPattern pattern1(URLPattern::IGNORE_PORTS, kAllSchemes);
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern1.Parse(pattern_str));
+
+  URLPattern pattern2(URLPattern::USE_PORTS, kAllSchemes);
+  EXPECT_EQ(URLPattern::PARSE_SUCCESS, pattern2.Parse(pattern_str));
 
   EXPECT_EQ(pattern_str, pattern1.GetAsString());
   EXPECT_EQ(pattern_str, pattern2.GetAsString());
   EXPECT_FALSE(pattern1.MatchesURL(url));
   EXPECT_FALSE(pattern2.MatchesURL(url));
 }
 
 TEST(ExtensionURLPatternTest, Equals) {
   const struct {
     const char* pattern1;
@@ skipping 71 matching lines @@
       "http://*/*",
       false
     }
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kEqualsTestCases); ++i) {
     std::string message = kEqualsTestCases[i].pattern1;
     message += " ";
     message += kEqualsTestCases[i].pattern2;
 
-    URLPattern pattern1(URLPattern::SCHEME_ALL);
-    URLPattern pattern2(URLPattern::SCHEME_ALL);
+    URLPattern pattern1(URLPattern::USE_PORTS, URLPattern::SCHEME_ALL);
+    URLPattern pattern2(URLPattern::USE_PORTS, URLPattern::SCHEME_ALL);
 
-    pattern1.Parse(kEqualsTestCases[i].pattern1, URLPattern::USE_PORTS);
-    pattern2.Parse(kEqualsTestCases[i].pattern2, URLPattern::USE_PORTS);
+    pattern1.Parse(kEqualsTestCases[i].pattern1);
+    pattern2.Parse(kEqualsTestCases[i].pattern2);
     EXPECT_EQ(kEqualsTestCases[i].expected_equal, pattern1 == pattern2)
         << message;
   }
 }