| Index: chrome/browser/extensions/extension_special_storage_policy.cc
|
| diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc
|
| index 8cf296d638f15832d671b671ae3e2ff96147723d..c79049c5719bd6f9094cbaf67bde5032f3a44872 100644
|
| --- a/chrome/browser/extensions/extension_special_storage_policy.cc
|
| +++ b/chrome/browser/extensions/extension_special_storage_policy.cc
|
| @@ -18,6 +18,7 @@
|
| #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;
|
| @@ -86,7 +87,8 @@ bool ExtensionSpecialStoragePolicy::NeedsProtection(
|
| 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);
|
| @@ -229,15 +231,15 @@ bool ExtensionSpecialStoragePolicy::SpecialCollection::Contains(
|
| 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);
|
|
|