Revert of Change how the quota system computes the total poolsize for temporary storage

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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 96 matching lines @@
          content_capabilities_unlimited_extensions_.GrantsCapabilitiesTo(
              origin);
 }
 
 bool ExtensionSpecialStoragePolicy::IsStorageSessionOnly(const GURL& origin) {
   if (cookie_settings_.get() == NULL)
     return false;
   return cookie_settings_->IsCookieSessionOnly(origin);
 }
 
+bool ExtensionSpecialStoragePolicy::CanQueryDiskSize(const GURL& origin) {
+  base::AutoLock locker(lock_);
+  return installed_apps_.Contains(origin);
+}
+
 bool ExtensionSpecialStoragePolicy::HasSessionOnlyOrigins() {
   if (cookie_settings_.get() == NULL)
     return false;
   if (cookie_settings_->GetDefaultCookieSetting(NULL) ==
       CONTENT_SETTING_SESSION_ONLY)
     return true;
   ContentSettingsForOneType entries;
   cookie_settings_->GetCookieSettings(&entries);
   for (size_t i = 0; i < entries.size(); ++i) {
     if (entries[i].setting == CONTENT_SETTING_SESSION_ONLY)
@@ skipping 38 matching lines @@
 
   if (NeedsProtection(extension) ||
       extension->permissions_data()->HasAPIPermission(
           APIPermission::kUnlimitedStorage) ||
       extension->permissions_data()->HasAPIPermission(
           APIPermission::kFileBrowserHandler) ||
       extensions::AppIsolationInfo::HasIsolatedStorage(extension) ||
       extension->is_app()) {
     if (NeedsProtection(extension) && protected_apps_.Add(extension))
       change_flags |= SpecialStoragePolicy::STORAGE_PROTECTED;
+    // FIXME: Does GrantRightsForExtension imply |extension| is installed?
+    if (extension->is_app())
+      installed_apps_.Add(extension);
 
     if (extension->permissions_data()->HasAPIPermission(
             APIPermission::kUnlimitedStorage) &&
         unlimited_extensions_.Add(extension)) {
       if (extension->is_hosted_app())
         LogHostedAppUnlimitedStorageUsage(extension, browser_context);
       change_flags |= SpecialStoragePolicy::STORAGE_UNLIMITED;
     }
 
     if (extension->permissions_data()->HasAPIPermission(
@@ skipping 25 matching lines @@
   if (NeedsProtection(extension) ||
       extension->permissions_data()->HasAPIPermission(
           APIPermission::kUnlimitedStorage) ||
       extension->permissions_data()->HasAPIPermission(
           APIPermission::kFileBrowserHandler) ||
       extensions::AppIsolationInfo::HasIsolatedStorage(extension) ||
       extension->is_app()) {
     if (NeedsProtection(extension) && protected_apps_.Remove(extension))
       change_flags |= SpecialStoragePolicy::STORAGE_PROTECTED;
 
+    if (extension->is_app())
+      installed_apps_.Remove(extension);
+
     if (extension->permissions_data()->HasAPIPermission(
             APIPermission::kUnlimitedStorage) &&
         unlimited_extensions_.Remove(extension))
       change_flags |= SpecialStoragePolicy::STORAGE_UNLIMITED;
 
     if (extension->permissions_data()->HasAPIPermission(
             APIPermission::kFileBrowserHandler))
       file_handler_extensions_.Remove(extension);
 
     if (extensions::AppIsolationInfo::HasIsolatedStorage(extension))
       isolated_extensions_.Remove(extension);
   }
 
   if (change_flags) {
     NotifyRevoked(Extension::GetBaseURLFromExtensionId(extension->id()),
                   change_flags);
   }
 }
 
 void ExtensionSpecialStoragePolicy::RevokeRightsForAllExtensions() {
   {
     base::AutoLock locker(lock_);
     protected_apps_.Clear();
+    installed_apps_.Clear();
     unlimited_extensions_.Clear();
     file_handler_extensions_.Clear();
     isolated_extensions_.Clear();
     content_capabilities_unlimited_extensions_.Clear();
   }
 
   NotifyCleared();
 }
 
 void ExtensionSpecialStoragePolicy::NotifyGranted(
@@ skipping 90 matching lines @@
 }
 
 void ExtensionSpecialStoragePolicy::SpecialCollection::Clear() {
   ClearCache();
   extensions_.Clear();
 }
 
 void ExtensionSpecialStoragePolicy::SpecialCollection::ClearCache() {
   cached_results_.clear();
 }