Merge 104582 - Add support for an optional "requirements" section in extension/app manifests.

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 189 matching lines @@
     {"init_invalid_files_css_item_invalid.json", errors::kInvalidCss},
     {"init_invalid_permissions_invalid.json", errors::kInvalidPermissions},
     {"init_invalid_permissions_item_invalid.json", errors::kInvalidPermission},
     {"init_invalid_page_actions_multi.json",
         errors::kInvalidPageActionsListSize},
     {"init_invalid_options_url_invalid.json", errors::kInvalidOptionsPage},
     {"init_invalid_locale_invalid.json", errors::kInvalidDefaultLocale},
     {"init_invalid_locale_empty.json", errors::kInvalidDefaultLocale},
     {"init_invalid_min_chrome_invalid.json",
         errors::kInvalidMinimumChromeVersion},
-    {"init_invalid_chrome_version_too_low.json", errors::kChromeVersionTooLow}
+    {"init_invalid_chrome_version_too_low.json", errors::kChromeVersionTooLow},
+    {"init_invalid_requirements_1.json", errors::kInvalidRequirements},
+    {"init_invalid_requirements_2.json", errors::kInvalidRequirement}
   };
 
   RunTestcases(testcases, arraysize(testcases));
 }
 
 TEST_F(ExtensionManifestTest, InitFromValueValid) {
   scoped_refptr<Extension> extension(LoadAndExpectSuccess(
       "init_valid_minimal.json"));
 
   FilePath path;
@@ skipping 17 matching lines @@
   EXPECT_EQ("chrome-extension", extension->options_url().scheme());
   EXPECT_EQ("/options.html", extension->options_url().path());
 
   // Test that an empty list of page actions does not stop a browser action
   // from being loaded.
   extension = LoadAndExpectSuccess("init_valid_empty_page_actions.json");
 
   // Test with a minimum_chrome_version.
   extension = LoadAndExpectSuccess("init_valid_minimum_chrome.json");
 
+  // Test a hosted app with a requirements section.
+  extension = LoadAndExpectSuccess("init_valid_app_requirements.json");
+
   // Verify empty permission settings are considered valid.
   LoadAndExpectSuccess("init_valid_permissions_empty.json");
 
   // We allow unknown API permissions, so this will be valid until we better
   // distinguish between API and host permissions.
   LoadAndExpectSuccess("init_valid_permissions_unknown.json");
 }
 
 TEST_F(ExtensionManifestTest, InitFromValueValidNameInRTL) {
 #if defined(TOOLKIT_GTK)
@@ skipping 581 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());
 }