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

chrome/renderer/extensions/user_script_slave.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/renderer/extensions/user_script_slave.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 66 matching lines @@
   frame->setIsolatedWorldSecurityOrigin(
       new_id,
       WebSecurityOrigin::create(extension->url()));
   return new_id;
 }
 
 // static
 void UserScriptSlave::InitializeIsolatedWorld(
     int isolated_world_id,
     const Extension* extension) {
-  const URLPatternList& permissions =
-      extension->GetEffectiveHostPermissions().patterns();
-  for (size_t i = 0; i < permissions.size(); ++i) {
+  const URLPatternSet& permissions =
+      extension->GetEffectiveHostPermissions();
+  for (URLPatternSet::const_iterator i = permissions.begin();
+       i != permissions.end(); ++i) {
     const char* schemes[] = {
       chrome::kHttpScheme,
       chrome::kHttpsScheme,
       chrome::kFileScheme,
       chrome::kChromeUIScheme,
     };
     for (size_t j = 0; j < arraysize(schemes); ++j) {
-      if (permissions[i].MatchesScheme(schemes[j])) {
+      if (i->MatchesScheme(schemes[j])) {
         WebSecurityPolicy::addOriginAccessWhitelistEntry(
             extension->url(),
             WebString::fromUTF8(schemes[j]),
-            WebString::fromUTF8(permissions[i].host()),
-            permissions[i].match_subdomains());
+            WebString::fromUTF8(i->host()),
+            i->match_subdomains());
       }
     }
   }
 }
 
 // static
 void UserScriptSlave::RemoveIsolatedWorld(const std::string& extension_id) {
   isolated_world_ids_.erase(extension_id);
 }
 
@@ skipping 78 matching lines @@
 
   // Push user styles down into WebCore
   WebView::removeAllUserContent();
   for (size_t i = 0; i < scripts_.size(); ++i) {
     UserScript* script = scripts_[i];
     if (script->css_scripts().empty())
       continue;
 
     WebVector<WebString> patterns;
     std::vector<WebString> temp_patterns;
-    for (size_t k = 0; k < script->url_patterns().size(); ++k) {
-      URLPatternList explicit_patterns =
-          script->url_patterns()[k].ConvertToExplicitSchemes();
+    const URLPatternSet& url_patterns = script->url_patterns();
+    for (URLPatternSet::const_iterator k = url_patterns.begin();
+         k != url_patterns.end(); ++k) {
+      URLPatternList explicit_patterns = k->ConvertToExplicitSchemes();
       for (size_t m = 0; m < explicit_patterns.size(); ++m) {
         temp_patterns.push_back(WebString::fromUTF8(
             explicit_patterns[m].GetAsString()));
       }
     }
     patterns.assign(temp_patterns);
 
     for (size_t j = 0; j < script->css_scripts().size(); ++j) {
       const UserScript::File& file = scripts_[i]->css_scripts()[j];
       std::string content = file.GetContent().as_string();
@@ skipping 119 matching lines @@
     if (num_scripts)
       UMA_HISTOGRAM_TIMES("Extensions.InjectEnd_Time", timer.Elapsed());
   } else if (location == UserScript::DOCUMENT_IDLE) {
     UMA_HISTOGRAM_COUNTS_100("Extensions.InjectIdle_ScriptCount", num_scripts);
     if (num_scripts)
       UMA_HISTOGRAM_TIMES("Extensions.InjectIdle_Time", timer.Elapsed());
   } else {
     NOTREACHED();
   }
 }