Move URLPattern::ParseOption into a field.

chrome/common/extensions/user_script.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 "chrome/common/extensions/user_script.h"
 
 #include "base/pickle.h"
 #include "base/string_util.h"
 
 namespace {
@@ skipping 165 matching lines @@
 
   // Read url patterns.
   size_t num_patterns = 0;
   CHECK(pickle.ReadSize(iter, &num_patterns));
 
   url_set_.ClearPatterns();
   for (size_t i = 0; i < num_patterns; ++i) {
     int valid_schemes;
     CHECK(pickle.ReadInt(iter, &valid_schemes));
     std::string pattern_str;
-    URLPattern pattern(valid_schemes);
+    URLPattern pattern(URLPattern::IGNORE_PORTS, valid_schemes);
     CHECK(pickle.ReadString(iter, &pattern_str));
 
     // We remove the file scheme if it's not actually allowed (see Extension::
     // LoadUserScriptHelper), but we need it temporarily while loading the
     // pattern so that it's valid.
     bool had_file_scheme = (valid_schemes & URLPattern::SCHEME_FILE) != 0;
     if (!had_file_scheme)
       pattern.SetValidSchemes(valid_schemes | URLPattern::SCHEME_FILE);
-    CHECK(URLPattern::PARSE_SUCCESS ==
-          pattern.Parse(pattern_str, URLPattern::IGNORE_PORTS));
+    CHECK(URLPattern::PARSE_SUCCESS == pattern.Parse(pattern_str));
     if (!had_file_scheme)
       pattern.SetValidSchemes(valid_schemes);
 
     url_set_.AddPattern(pattern);
   }
 
   // Read js scripts.
   size_t num_js_files = 0;
   CHECK(pickle.ReadSize(iter, &num_js_files));
   js_scripts_.clear();
   for (size_t i = 0; i < num_js_files; ++i) {
     File file;
     file.Unpickle(pickle, iter);
     js_scripts_.push_back(file);
   }
 
   // Read css scripts.
   size_t num_css_files = 0;
   CHECK(pickle.ReadSize(iter, &num_css_files));
   css_scripts_.clear();
   for (size_t i = 0; i < num_css_files; ++i) {
     File file;
     file.Unpickle(pickle, iter);
     css_scripts_.push_back(file);
   }
 }