Move/replace/rename URL-based extension getters from ExtensionService to/in ExtensionSet.

chrome/common/extensions/extension_set.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/extension_set.h"
 
 #include "base/logging.h"
 #include "chrome/common/url_constants.h"
 
 using WebKit::WebSecurityOrigin;
@@ skipping 56 matching lines @@
   // but in some rare cases involving sandboxing, the two will be different.
   // We catch those cases by checking whether the document's origin is unique.
   // If that's not the case, then we conclude that the document's security
   // context is well-described by its URL and proceed to use only the URL.
   if (!info.origin().isNull() && info.origin().isUnique())
     return NULL;
 
   if (info.url().SchemeIs(chrome::kExtensionScheme))
     return GetByID(info.url().host());
 
-  ExtensionMap::const_iterator i = extensions_.begin();
-  for (; i != extensions_.end(); ++i) {
-    if (i->second->web_extent().MatchesURL(info.url()))
-      return i->second.get();
+  return GetByWebExtent(info.url());
+}
+
+const Extension* ExtensionSet::GetByWebExtent(const GURL& url) const {
+  for (ExtensionMap::const_iterator iter = extensions_.begin();
+       iter != extensions_.end(); ++iter) {
+    if (iter->second->web_extent().MatchesURL(url))
+      return iter->second.get();
   }
 
   return NULL;
+}
+
+const Extension* ExtensionSet::GetByOverlappingWebExtent(
+    const URLPatternSet& extent) const {
+  for (ExtensionMap::const_iterator iter = extensions_.begin();
+       iter != extensions_.end(); ++iter) {
+    if (iter->second->web_extent().OverlapsWith(extent))
+      return iter->second.get();
+  }
+
+  return NULL;
 }
 
 bool ExtensionSet::InSameExtent(const GURL& old_url,
                                 const GURL& new_url) const {
   return GetByURL(ExtensionURLInfo(old_url)) ==
       GetByURL(ExtensionURLInfo(new_url));
 }
 
 const Extension* ExtensionSet::GetByID(const std::string& id) const {
   ExtensionMap::const_iterator i = extensions_.find(id);
@@ skipping 13 matching lines @@
 
   ExtensionMap::const_iterator i = extensions_.begin();
   for (; i != extensions_.end(); ++i) {
     if (i->second->location() == Extension::COMPONENT &&
         i->second->web_extent().MatchesURL(info.url()))
       return true;
   }
 
   return false;
 }