Loosen error reporting for hosted app permissions.

chrome/common/extensions/extension_manifests_unittest.cc

 // Copyright (c) 2011 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/common/extensions/extension.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 622 matching lines @@
   for (ExtensionAPIPermissionSet::iterator i = api_perms.begin();
        i != api_perms.end(); ++i) {
     if (*i == ExtensionAPIPermission::kExperimental)
       continue;
 
     ExtensionAPIPermission* permission = info->GetByID(*i);
     const char* name = permission->name();
     StringValue* p = new StringValue(name);
     permissions->Clear();
     permissions->Append(p);
-    Extension::Location location = Extension::INTERNAL;
 
-    // Many permissions are not available to hosted apps.
-    if (!permission->is_hosted_app() || permission->is_component_only()) {
+    // Some permissions are only available to component hosted apps.
+    if (permission->is_component_only()) {
       LoadAndExpectError(Manifest(manifest.get(), name),
-                         errors::kPermissionNotAllowed);
+                         errors::kPermissionNotAllowed,
+                         Extension::INTERNAL);
+      scoped_refptr<Extension> extension(
+          LoadAndExpectSuccess(Manifest(manifest.get(), name),
+                               Extension::COMPONENT));
+      EXPECT_TRUE(extension->GetActivePermissions()->HasAPIPermission(
+          permission->id()));
 
-      // ... unless the hosted app is a component app.
-      location = Extension::COMPONENT;
+    } else if (!permission->is_hosted_app()) {
+      // Most normal extension permissions also aren't available to hosted apps.
+      // For these, the error is only reported in strict mode for legacy
+      // reasons: crbug.com/101993.
+      LoadAndExpectError(Manifest(manifest.get(), name),
+                         errors::kPermissionNotAllowed,
+                         Extension::INTERNAL,
+                         Extension::STRICT_ERROR_CHECKS);
+      scoped_refptr<Extension> extension(
+          LoadAndExpectSuccess(Manifest(manifest.get(), name),
+                               Extension::INTERNAL));
+      EXPECT_FALSE(extension->GetActivePermissions()->HasAPIPermission(
+          permission->id()));
+
+      // These permissions are also allowed for component hosted apps.
+      extension = LoadAndExpectSuccess(Manifest(manifest.get(), name),
+                                       Extension::COMPONENT);
+      EXPECT_TRUE(extension->GetActivePermissions()->HasAPIPermission(
+          permission->id()));
+
+    } else {
+      scoped_refptr<Extension> extension(
+          LoadAndExpectSuccess(Manifest(manifest.get(), name)));
+      EXPECT_TRUE(extension->GetActivePermissions()->HasAPIPermission(
+          permission->id()));
     }
-
-    LoadAndExpectSuccess(Manifest(manifest.get(), name), location);
   }
 }
 
 TEST_F(ExtensionManifestTest, ComponentOnlyPermission) {
   std::string error;
   scoped_ptr<DictionaryValue> manifest(
       LoadManifestFile("init_valid_minimal.json", &error));
   ASSERT_TRUE(manifest.get());
   ListValue* permissions = new ListValue();
   manifest->Set("permissions", permissions);
@@ skipping 262 matching lines @@
   scoped_refptr<Extension> extension_2(
       LoadAndExpectSuccess("offline_disabled_packaged_app.json"));
   EXPECT_FALSE(extension_2->offline_enabled());
   scoped_refptr<Extension> extension_3(
       LoadAndExpectSuccess("offline_default_packaged_app.json"));
   EXPECT_FALSE(extension_3->offline_enabled());
   scoped_refptr<Extension> extension_4(
       LoadAndExpectSuccess("offline_enabled_hosted_app.json"));
   EXPECT_TRUE(extension_4->offline_enabled());
 }