Fix ExtensionSpecialStoragePolicy.IsInstalledApp

chrome/browser/extensions/extension_special_storage_policy.cc

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 4017d034bbb258ade245a6c40da6b39839deebca..d142a76c900ba64a920a2f003ff6da028a4065ec 100644
--- a/chrome/browser/extensions/extension_special_storage_policy.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy.cc
@@ -87,11 +87,10 @@ const ExtensionSet* ExtensionSpecialStoragePolicy::ExtensionsProtectingOrigin(
 void ExtensionSpecialStoragePolicy::GrantRightsForExtension(
     const extensions::Extension* extension) {
   DCHECK(extension);
-  if (!NeedsProtection(extension) &&
-      !extension->HasAPIPermission(
-          APIPermission::kUnlimitedStorage) &&
-      !extension->HasAPIPermission(
-          APIPermission::kFileBrowserHandler)) {
+  if (!(NeedsProtection(extension) ||
+        extension->HasAPIPermission(APIPermission::kUnlimitedStorage) ||
+        extension->HasAPIPermission(APIPermission::kFileBrowserHandler) ||
+        extension->is_app())) {

[michaeln, 2013/04/16 21:14:09]

much more readable that way :)

     return;
   }
   {
@@ -103,8 +102,7 @@ void ExtensionSpecialStoragePolicy::GrantRightsForExtension(
       installed_apps_.Add(extension);
     if (extension->HasAPIPermission(APIPermission::kUnlimitedStorage))
       unlimited_extensions_.Add(extension);
-    if (extension->HasAPIPermission(
-            APIPermission::kFileBrowserHandler))
+    if (extension->HasAPIPermission(APIPermission::kFileBrowserHandler))
       file_handler_extensions_.Add(extension);
   }
   NotifyChanged();
@@ -113,11 +111,10 @@ void ExtensionSpecialStoragePolicy::GrantRightsForExtension(
 void ExtensionSpecialStoragePolicy::RevokeRightsForExtension(
     const extensions::Extension* extension) {
   DCHECK(extension);
-  if (!NeedsProtection(extension) &&
-      !extension->HasAPIPermission(
-          APIPermission::kUnlimitedStorage) &&
-      !extension->HasAPIPermission(
-          APIPermission::kFileBrowserHandler)) {
+  if (!(NeedsProtection(extension) ||
+        extension->HasAPIPermission(APIPermission::kUnlimitedStorage) ||
+        extension->HasAPIPermission(APIPermission::kFileBrowserHandler) ||
+        extension->is_app())) {
     return;
   }
   {