Move c/c/e/extension_set to top-level extensions/

chrome/browser/extensions/extension_special_storage_policy.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/browser/extensions/extension_special_storage_policy.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 
 using content::BrowserThread;
 using extensions::APIPermission;
 using extensions::Extension;
 using quota::SpecialStoragePolicy;
 
 ExtensionSpecialStoragePolicy::ExtensionSpecialStoragePolicy(
     CookieSettings* cookie_settings)
     : cookie_settings_(cookie_settings) {}
 
@@ skipping 48 matching lines @@
 bool ExtensionSpecialStoragePolicy::HasIsolatedStorage(const GURL& origin) {
   base::AutoLock locker(lock_);
   return isolated_extensions_.Contains(origin);
 }
 
 bool ExtensionSpecialStoragePolicy::NeedsProtection(
     const extensions::Extension* extension) {
   return extension->is_hosted_app() && !extension->from_bookmark();
 }
 
-const ExtensionSet* ExtensionSpecialStoragePolicy::ExtensionsProtectingOrigin(
+const extensions::ExtensionSet*
+ExtensionSpecialStoragePolicy::ExtensionsProtectingOrigin(
     const GURL& origin) {
   base::AutoLock locker(lock_);
   return protected_apps_.ExtensionsContaining(origin);
 }
 
 void ExtensionSpecialStoragePolicy::GrantRightsForExtension(
     const extensions::Extension* extension) {
   DCHECK(extension);
   if (!(NeedsProtection(extension) ||
         extension->HasAPIPermission(APIPermission::kUnlimitedStorage) ||
@@ skipping 122 matching lines @@
 
 ExtensionSpecialStoragePolicy::SpecialCollection::~SpecialCollection() {
   STLDeleteValues(&cached_results_);
 }
 
 bool ExtensionSpecialStoragePolicy::SpecialCollection::Contains(
     const GURL& origin) {
   return !ExtensionsContaining(origin)->is_empty();
 }
 
-const ExtensionSet*
+const extensions::ExtensionSet*
 ExtensionSpecialStoragePolicy::SpecialCollection::ExtensionsContaining(
     const GURL& origin) {
   CachedResults::const_iterator found = cached_results_.find(origin);
   if (found != cached_results_.end())
     return found->second;
 
-  ExtensionSet* result = new ExtensionSet();
-  for (ExtensionSet::const_iterator iter = extensions_.begin();
+  extensions::ExtensionSet* result = new extensions::ExtensionSet();
+  for (extensions::ExtensionSet::const_iterator iter = extensions_.begin();
        iter != extensions_.end(); ++iter) {
     if ((*iter)->OverlapsWithOrigin(origin))
       result->Insert(*iter);
   }
   cached_results_[origin] = result;
   return result;
 }
 
 bool ExtensionSpecialStoragePolicy::SpecialCollection::ContainsExtension(
     const std::string& extension_id) {
@@ skipping 14 matching lines @@
 
 void ExtensionSpecialStoragePolicy::SpecialCollection::Clear() {
   ClearCache();
   extensions_.Clear();
 }
 
 void ExtensionSpecialStoragePolicy::SpecialCollection::ClearCache() {
   STLDeleteValues(&cached_results_);
   cached_results_.clear();
 }