Move URLPattern::ParseOption into a field.

chrome/browser/extensions/user_script_master.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/browser/extensions/user_script_master.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 94 matching lines @@
         script->set_name_space(value);
       } else if (GetDeclarationValue(line, kNameDeclaration, &value)) {
         script->set_name(value);
       } else if (GetDeclarationValue(line, kVersionDeclaration, &value)) {
         scoped_ptr<Version> version(Version::GetVersionFromString(value));
         if (version.get())
           script->set_version(version->GetString());
       } else if (GetDeclarationValue(line, kDescriptionDeclaration, &value)) {
         script->set_description(value);
       } else if (GetDeclarationValue(line, kMatchDeclaration, &value)) {
-        URLPattern pattern(UserScript::kValidUserScriptSchemes);
-        if (URLPattern::PARSE_SUCCESS !=
-            pattern.Parse(value, URLPattern::IGNORE_PORTS))
+        URLPattern pattern(URLPattern::IGNORE_PORTS,
+                           UserScript::kValidUserScriptSchemes);
+        if (URLPattern::PARSE_SUCCESS != pattern.Parse(value))
           return false;
         script->add_url_pattern(pattern);
       } else if (GetDeclarationValue(line, kRunAtDeclaration, &value)) {
         if (value == kRunAtDocumentStartValue)
           script->set_run_location(UserScript::DOCUMENT_START);
         else if (value == kRunAtDocumentEndValue)
           script->set_run_location(UserScript::DOCUMENT_END);
         else if (value == kRunAtDocumentIdleValue)
           script->set_run_location(UserScript::DOCUMENT_IDLE);
         else
@@ skipping 296 matching lines @@
   if (!handle)
     return;
 
   base::SharedMemoryHandle handle_for_process;
   if (!shared_memory->ShareToProcess(handle, &handle_for_process))
     return;  // This can legitimately fail if the renderer asserts at startup.
 
   if (base::SharedMemory::IsHandleValid(handle_for_process))
     process->Send(new ExtensionMsg_UpdateUserScripts(handle_for_process));
 }