Merge 225400 "Add "kiosk_only" manifest attribute for platform a..."

chrome/common/extensions/manifest_tests/extension_manifests_kiosk_unittest.cc

Index: chrome/common/extensions/manifest_tests/extension_manifests_kiosk_unittest.cc
===================================================================
--- chrome/common/extensions/manifest_tests/extension_manifests_kiosk_unittest.cc	(revision 227631)
+++ chrome/common/extensions/manifest_tests/extension_manifests_kiosk_unittest.cc	(working copy)
@@ -3,55 +3,97 @@
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/manifest_handlers/kiosk_enabled_info.h"
+#include "chrome/common/extensions/manifest_handlers/kiosk_mode_info.h"
 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
-class ExtensionManifestKioskEnabledTest : public ExtensionManifestTest {
+class ExtensionManifestKioskModeTest : public ExtensionManifestTest {
 };
 
-TEST_F(ExtensionManifestKioskEnabledTest, InvalidKioskEnabled) {
+TEST_F(ExtensionManifestKioskModeTest, InvalidKioskEnabled) {
   LoadAndExpectError("kiosk_enabled_invalid.json",
                      manifest_errors::kInvalidKioskEnabled);
 }
 
-TEST_F(ExtensionManifestKioskEnabledTest, KioskEnabledHostedApp) {
+TEST_F(ExtensionManifestKioskModeTest, KioskEnabledHostedApp) {
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("kiosk_enabled_hosted_app.json"));
-  EXPECT_FALSE(KioskEnabledInfo::IsKioskEnabled(extension.get()));
+  EXPECT_FALSE(KioskModeInfo::IsKioskEnabled(extension.get()));
 }
 
-TEST_F(ExtensionManifestKioskEnabledTest, KioskEnabledPackagedApp) {
+TEST_F(ExtensionManifestKioskModeTest, KioskEnabledPackagedApp) {
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("kiosk_enabled_packaged_app.json"));
-  EXPECT_FALSE(KioskEnabledInfo::IsKioskEnabled(extension.get()));
+  EXPECT_FALSE(KioskModeInfo::IsKioskEnabled(extension.get()));
 }
 
-TEST_F(ExtensionManifestKioskEnabledTest, KioskEnabledExtension) {
+TEST_F(ExtensionManifestKioskModeTest, KioskEnabledExtension) {
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("kiosk_enabled_extension.json"));
-  EXPECT_FALSE(KioskEnabledInfo::IsKioskEnabled(extension.get()));
+  EXPECT_FALSE(KioskModeInfo::IsKioskEnabled(extension.get()));
 }
 
-TEST_F(ExtensionManifestKioskEnabledTest, KioskEnabledPlatformApp) {
+TEST_F(ExtensionManifestKioskModeTest, KioskEnabledPlatformApp) {
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("kiosk_enabled_platform_app.json"));
-  EXPECT_TRUE(KioskEnabledInfo::IsKioskEnabled(extension.get()));
+  EXPECT_TRUE(KioskModeInfo::IsKioskEnabled(extension.get()));
 }
 
-TEST_F(ExtensionManifestKioskEnabledTest, KioskDisabledPlatformApp) {
+TEST_F(ExtensionManifestKioskModeTest, KioskDisabledPlatformApp) {
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("kiosk_disabled_platform_app.json"));
-  EXPECT_FALSE(KioskEnabledInfo::IsKioskEnabled(extension.get()));
+  EXPECT_FALSE(KioskModeInfo::IsKioskEnabled(extension.get()));
 }
 
-TEST_F(ExtensionManifestKioskEnabledTest, KioskDefaultPlatformApp) {
+TEST_F(ExtensionManifestKioskModeTest, KioskDefaultPlatformApp) {
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("kiosk_default_platform_app.json"));
-  EXPECT_FALSE(KioskEnabledInfo::IsKioskEnabled(extension.get()));
+  EXPECT_FALSE(KioskModeInfo::IsKioskEnabled(extension.get()));
+  EXPECT_FALSE(KioskModeInfo::IsKioskOnly(extension.get()));
 }
 
+TEST_F(ExtensionManifestKioskModeTest, KioskEnabledDefaultRequired) {
+  scoped_refptr<Extension> extension(
+      LoadAndExpectSuccess("kiosk_enabled_platform_app.json"));
+  EXPECT_TRUE(KioskModeInfo::IsKioskEnabled(extension.get()));
+  EXPECT_FALSE(KioskModeInfo::IsKioskOnly(extension.get()));
+}
+
+TEST_F(ExtensionManifestKioskModeTest, KioskOnlyPlatformApp) {
+  scoped_refptr<Extension> extension(
+      LoadAndExpectSuccess("kiosk_only_platform_app.json"));
+  EXPECT_TRUE(KioskModeInfo::IsKioskOnly(extension.get()));
+}
+
+TEST_F(ExtensionManifestKioskModeTest, KioskOnlyInvalid) {
+  LoadAndExpectError("kiosk_only_invalid.json",
+                     manifest_errors::kInvalidKioskOnly);
+}
+
+TEST_F(ExtensionManifestKioskModeTest, KioskOnlyButNotEnabled) {
+  LoadAndExpectError("kiosk_only_not_enabled.json",
+                     manifest_errors::kInvalidKioskOnlyButNotEnabled);
+}
+
+TEST_F(ExtensionManifestKioskModeTest, KioskOnlyHostedApp) {
+  scoped_refptr<Extension> extension(
+      LoadAndExpectSuccess("kiosk_only_hosted_app.json"));
+  EXPECT_FALSE(KioskModeInfo::IsKioskOnly(extension.get()));
+}
+
+TEST_F(ExtensionManifestKioskModeTest, KioskOnlyPackagedApp) {
+  scoped_refptr<Extension> extension(
+      LoadAndExpectSuccess("kiosk_only_packaged_app.json"));
+  EXPECT_FALSE(KioskModeInfo::IsKioskOnly(extension.get()));
+}
+
+TEST_F(ExtensionManifestKioskModeTest, KioskOnlyExtension) {
+  scoped_refptr<Extension> extension(
+      LoadAndExpectSuccess("kiosk_only_extension.json"));
+  EXPECT_FALSE(KioskModeInfo::IsKioskOnly(extension.get()));
+}
+
 }  // namespace extensions