Update URLPatternSet to contain a std::set instead of std::vector.

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 103 matching lines @@
   pickle->WriteSize(globs_.size());
   for (glob = globs_.begin(); glob != globs_.end(); ++glob) {
     pickle->WriteString(*glob);
   }
   pickle->WriteSize(exclude_globs_.size());
   for (glob = exclude_globs_.begin(); glob != exclude_globs_.end(); ++glob) {
     pickle->WriteString(*glob);
   }
 
   // Write url patterns.
-  URLPatternList pattern_list = url_set_.patterns();
-  pickle->WriteSize(pattern_list.size());
-  for (URLPatternList::const_iterator pattern = pattern_list.begin();
+  URLPatternSet pattern_list = url_set_;
+  pickle->WriteSize(pattern_list.patterns().size());
+  for (URLPatternSet::const_iterator pattern = pattern_list.begin();
        pattern != pattern_list.end(); ++pattern) {
     pickle->WriteInt(pattern->valid_schemes());
     pickle->WriteString(pattern->GetAsString());
   }
 
   // Write js scripts.
   pickle->WriteSize(js_scripts_.size());
   for (FileList::const_iterator file = js_scripts_.begin();
     file != js_scripts_.end(); ++file) {
     file->Pickle(pickle);
@@ skipping 47 matching lines @@
     CHECK(pickle.ReadInt(iter, &valid_schemes));
     std::string pattern_str;
     URLPattern pattern(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.set_valid_schemes(valid_schemes | URLPattern::SCHEME_FILE);
+      pattern.SetValidSchemes(valid_schemes | URLPattern::SCHEME_FILE);
     CHECK(URLPattern::PARSE_SUCCESS ==
           pattern.Parse(pattern_str, URLPattern::IGNORE_PORTS));
     if (!had_file_scheme)
-      pattern.set_valid_schemes(valid_schemes);
+      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);
   }
 }