Fix ExtensionSpecialStoragePolicy.IsInstalledApp

chrome/browser/extensions/extension_special_storage_policy_unittest.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 "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
@@ skipping 111 matching lines @@
     list->Append(Value::CreateStringValue("fileSystem"));
     manifest.Set(keys::kPermissions, list);
     std::string error;
     scoped_refptr<Extension> handler_app = Extension::Create(
         path, Manifest::INVALID_LOCATION, manifest,
         Extension::NO_FLAGS, &error);
     EXPECT_TRUE(handler_app.get()) << error;
     return handler_app;
   }
 
+  scoped_refptr<Extension> CreateRegularApp() {
+#if defined(OS_WIN)
+    base::FilePath path(FILE_PATH_LITERAL("c:\\app"));
+#elif defined(OS_POSIX)
+    base::FilePath path(FILE_PATH_LITERAL("/app"));
+#endif
+    DictionaryValue manifest;
+    manifest.SetString(keys::kName, "App");
+    manifest.SetString(keys::kVersion, "1");
+    manifest.SetString(keys::kPlatformAppBackgroundPage, "background.html");
+    std::string error;
+    scoped_refptr<Extension> app = Extension::Create(
+        path, Manifest::INVALID_LOCATION, manifest,
+        Extension::NO_FLAGS, &error);
+    EXPECT_TRUE(app.get()) << error;
+    return app;
+  }
+
   // Verifies that the set of extensions protecting |url| is *exactly* equal to
   // |expected_extensions|. Pass in an empty set to verify that an origin is not
   // protected.
   void ExpectProtectedBy(const ExtensionSet& expected_extensions,
                          const GURL& url) {
     const ExtensionSet* extensions = policy_->ExtensionsProtectingOrigin(url);
     EXPECT_EQ(expected_extensions.size(), extensions->size());
     for (ExtensionSet::const_iterator it = expected_extensions.begin();
          it != expected_extensions.end(); ++it) {
       EXPECT_TRUE(extensions->Contains((*it)->id()))
           << "Origin " << url << "not protected by extension ID "
           << (*it)->id();
     }
   }
 
   scoped_refptr<ExtensionSpecialStoragePolicy> policy_;
 };
 
 TEST_F(ExtensionSpecialStoragePolicyTest, EmptyPolicy) {
   const GURL kHttpUrl("http://foo");
   const GURL kExtensionUrl("chrome-extension://bar");
+  scoped_refptr<Extension> app(CreateRegularApp());
 
   EXPECT_FALSE(policy_->IsStorageUnlimited(kHttpUrl));
   EXPECT_FALSE(policy_->IsStorageUnlimited(kHttpUrl));  // test cached result
   EXPECT_FALSE(policy_->IsStorageUnlimited(kExtensionUrl));
+  EXPECT_FALSE(policy_->IsStorageUnlimited(app->url()));
   ExtensionSet empty_set;
   ExpectProtectedBy(empty_set, kHttpUrl);
 
   // This one is just based on the scheme.
   EXPECT_TRUE(policy_->IsStorageProtected(kExtensionUrl));
+  EXPECT_TRUE(policy_->IsStorageProtected(app->url()));
 }
 
-
 TEST_F(ExtensionSpecialStoragePolicyTest, AppWithProtectedStorage) {
   scoped_refptr<Extension> extension(CreateProtectedApp());
   policy_->GrantRightsForExtension(extension);
   ExtensionSet protecting_extensions;
   protecting_extensions.Insert(extension);
   ExtensionSet empty_set;
 
   EXPECT_FALSE(policy_->IsStorageUnlimited(extension->url()));
   EXPECT_FALSE(policy_->IsStorageUnlimited(GURL("http://explicit/")));
   ExpectProtectedBy(protecting_extensions, GURL("http://explicit/"));
@@ skipping 31 matching lines @@
   policy_->RevokeRightsForExtension(extension);
   ExpectProtectedBy(empty_set, GURL("http://explicit/"));
   ExpectProtectedBy(empty_set, GURL("https://foo.wildcards/"));
   ExpectProtectedBy(empty_set, GURL("https://foo.wildcards/"));
   ExpectProtectedBy(empty_set, GURL("http://bar.wildcards/"));
   EXPECT_FALSE(policy_->IsStorageUnlimited(GURL("http://explicit/")));
   EXPECT_FALSE(policy_->IsStorageUnlimited(GURL("https://foo.wildcards/")));
   EXPECT_FALSE(policy_->IsStorageUnlimited(GURL("https://bar.wildcards/")));
 }
 
+TEST_F(ExtensionSpecialStoragePolicyTest, IsInstalled) {
+  const GURL kHttpUrl("http://foo");
+  const GURL kExtensionUrl("chrome-extension://bar");
+  scoped_refptr<Extension> regular_app(CreateRegularApp());
+  scoped_refptr<Extension> protected_app(CreateProtectedApp());
+  scoped_refptr<Extension> unlimited_app(CreateUnlimitedApp());
+  policy_->GrantRightsForExtension(regular_app);
+  policy_->GrantRightsForExtension(protected_app);
+  policy_->GrantRightsForExtension(unlimited_app);
+
+  EXPECT_FALSE(policy_->IsInstalledApp(kHttpUrl));
+  EXPECT_FALSE(policy_->IsInstalledApp(kExtensionUrl));
+  EXPECT_TRUE(policy_->IsInstalledApp(regular_app->url()));
+  EXPECT_TRUE(policy_->IsInstalledApp(protected_app->url()));
+  EXPECT_TRUE(policy_->IsInstalledApp(unlimited_app->url()));
+}
+
 TEST_F(ExtensionSpecialStoragePolicyTest, OverlappingApps) {
   scoped_refptr<Extension> protected_app(CreateProtectedApp());
   scoped_refptr<Extension> unlimited_app(CreateUnlimitedApp());
   policy_->GrantRightsForExtension(protected_app);
   policy_->GrantRightsForExtension(unlimited_app);
   ExtensionSet protecting_extensions;
   ExtensionSet empty_set;
   protecting_extensions.Insert(protected_app);
   protecting_extensions.Insert(unlimited_app);
 
@@ skipping 51 matching lines @@
                                     CONTENT_SETTING_SESSION_ONLY);
 
   EXPECT_TRUE(policy_->HasSessionOnlyOrigins());
 
   // Clearing an origin-specific rule.
   cookie_settings->ResetCookieSetting(pattern,
                                       ContentSettingsPattern::Wildcard());
 
   EXPECT_FALSE(policy_->HasSessionOnlyOrigins());
 }