Revert 170514

chrome/common/extensions/permissions/permission_set.cc

 // Copyright (c) 2012 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/permissions/permission_set.h"
 
 #include <algorithm>
 #include <iterator>
 #include <string>
 
@@ skipping 179 matching lines @@
                              &explicit_hosts);
 
   URLPatternSet scriptable_hosts;
   URLPatternSet::CreateUnion(set1_safe->scriptable_hosts(),
                              set2_safe->scriptable_hosts(),
                              &scriptable_hosts);
 
   return new PermissionSet(apis, explicit_hosts, scriptable_hosts);
 }
 
-// static
-PermissionSet* PermissionSet::ExcludeNotInManifestPermissions(
-    const PermissionSet* set) {
-  if (!set)
-    return new PermissionSet();
-
-  APIPermissionSet apis;
-  for (APIPermissionSet::const_iterator i = set->apis().begin();
-       i != set->apis().end(); ++i) {
-    if (!i->ManifestEntryForbidden())
-      apis.insert(i->Clone());
-  }
-
-  return new PermissionSet(
-      apis, set->explicit_hosts(), set->scriptable_hosts());
-}
-
 bool PermissionSet::operator==(
     const PermissionSet& rhs) const {
   return apis_ == rhs.apis_ &&
       scriptable_hosts_ == rhs.scriptable_hosts_ &&
       explicit_hosts_ == rhs.explicit_hosts_;
 }
 
 bool PermissionSet::Contains(const PermissionSet& set) const {
   // Every set includes the empty set.
   if (set.IsEmpty())
@@ skipping 379 matching lines @@
   std::set<std::string> new_hosts_only;
 
   std::set_difference(new_hosts_set.begin(), new_hosts_set.end(),
                       old_hosts_set.begin(), old_hosts_set.end(),
                       std::inserter(new_hosts_only, new_hosts_only.begin()));
 
   return !new_hosts_only.empty();
 }
 
 }  // namespace extensions