Revert 56059 - Merge 55103 - Refactored extension privilege enumeration and i...

chrome/common/extensions/extension.cc

 // Copyright (c) 2010 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.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 832 matching lines @@
   // Otherwise, if the new extension has a plugin, it's a privilege increase.
   if (new_extension->plugins().size() > 0)
     return true;
 
   // If we are increasing the set of hosts we have access to, it's a privilege
   // increase.
   if (!old_extension->HasAccessToAllHosts()) {
     if (new_extension->HasAccessToAllHosts())
       return true;
 
-    ExtensionExtent::PatternList old_hosts =
-        old_extension->GetEffectiveHostPermissions().patterns();
-    ExtensionExtent::PatternList new_hosts =
-        new_extension->GetEffectiveHostPermissions().patterns();
+    std::set<std::string> old_hosts =
+        old_extension->GetEffectiveHostPermissions();
+    std::set<std::string> new_hosts =
+        new_extension->GetEffectiveHostPermissions();
 
-    std::set<URLPattern, URLPattern::EffectiveHostCompareFunctor> diff;
+    std::set<std::string> difference;
     std::set_difference(new_hosts.begin(), new_hosts.end(),
-        old_hosts.begin(), old_hosts.end(),
-        std::insert_iterator<std::set<URLPattern,
-            URLPattern::EffectiveHostCompareFunctor> >(diff, diff.end()),
-        URLPattern::EffectiveHostCompare);
-    if (diff.size() > 0)
+                        old_hosts.begin(), old_hosts.end(),
+                        std::insert_iterator<std::set<std::string> >(
+                            difference, difference.end()));
+    if (difference.size() > 0)
       return true;
   }
 
   if (!old_extension->HasEffectiveBrowsingHistoryPermission() &&
       new_extension->HasEffectiveBrowsingHistoryPermission()) {
     return true;
   }
 
   const SimplePermissions& simple_permissions = GetSimplePermissions();
   for (SimplePermissions::const_iterator iter = simple_permissions.begin();
@@ skipping 797 matching lines @@
 
 bool Extension::HasHostPermission(const GURL& url) const {
   for (URLPatternList::const_iterator host = host_permissions_.begin();
        host != host_permissions_.end(); ++host) {
     if (host->MatchesUrl(url))
       return true;
   }
   return false;
 }
 
-const ExtensionExtent Extension::GetEffectiveHostPermissions() const {
-  ExtensionExtent effective_hosts;
+const std::set<std::string> Extension::GetEffectiveHostPermissions() const {
+  std::set<std::string> effective_hosts;
 
   for (URLPatternList::const_iterator host = host_permissions_.begin();
        host != host_permissions_.end(); ++host)
-    effective_hosts.AddPattern(*host);
+    effective_hosts.insert(host->host());
 
   for (UserScriptList::const_iterator content_script = content_scripts_.begin();
        content_script != content_scripts_.end(); ++content_script) {
     UserScript::PatternList::const_iterator pattern =
         content_script->url_patterns().begin();
     for (; pattern != content_script->url_patterns().end(); ++pattern)
-      effective_hosts.AddPattern(*pattern);
+      effective_hosts.insert(pattern->host());
   }
 
   return effective_hosts;
 }
 
 bool Extension::HasAccessToAllHosts() const {
   for (URLPatternList::const_iterator host = host_permissions_.begin();
        host != host_permissions_.end(); ++host) {
     if (host->match_subdomains() && host->host().empty())
       return true;
@@ skipping 26 matching lines @@
         } else {
           return false;
         }
       } else {
         return true;
       }
     }
   }
   return false;
 }