Switch platform apps from a declarative launch container to handling an onLaunched event.

chrome/common/extensions/extension_manifests_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 "chrome/common/extensions/extension.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 279 matching lines @@
 }
 
 TEST_F(ExtensionManifestTest, PlatformApps) {
   // A minimal platform app.
   LoadAndExpectError("init_valid_platform_app.json",
                      errors::kPlatformAppFlagRequired);
 
   CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnablePlatformApps);
 
   LoadAndExpectSuccess("init_valid_platform_app.json");
+
+  LoadAndExpectError(
+      "init_invalid_platform_app_1.json",
+      extension_manifest_errors::kLaunchNotAllowedForPlatformApps);
+  LoadAndExpectError(
+      "init_invalid_platform_app_2.json",
+      extension_manifest_errors::kBackgroundRequiredForPlatformApps);
 }
 
 TEST_F(ExtensionManifestTest, CertainApisRequirePlatformApps) {
   // Put APIs here that should be restricted to platform apps, but that haven't
   // yet graduated from experimental.
   const char* kPlatformAppExperimentalApis[] = {
     "dns",
     "serial",
     "socket",
   };
@@ skipping 210 matching lines @@
                          errors::kInvalidLaunchValue,
                          keys::kLaunchWidth));
   LoadAndExpectError("launch_height_invalid.json",
                      ExtensionErrorUtils::FormatErrorMessage(
                          errors::kInvalidLaunchValueContainer,
                          keys::kLaunchHeight));
   LoadAndExpectError("launch_height_negative.json",
                      ExtensionErrorUtils::FormatErrorMessage(
                          errors::kInvalidLaunchValue,
                          keys::kLaunchHeight));
-
-  LoadAndExpectError("launch_min_width_invalid.json",
-                     ExtensionErrorUtils::FormatErrorMessage(
-                         errors::kInvalidLaunchValueContainer,
-                         keys::kLaunchMinWidth));
-  LoadAndExpectError("launch_min_width_negative.json",
-                     ExtensionErrorUtils::FormatErrorMessage(
-                         errors::kInvalidLaunchValue,
-                         keys::kLaunchMinWidth));
-  LoadAndExpectError("launch_min_height_invalid.json",
-                     ExtensionErrorUtils::FormatErrorMessage(
-                         errors::kInvalidLaunchValueContainer,
-                         keys::kLaunchMinHeight));
-  LoadAndExpectError("launch_min_height_negative.json",
-                     ExtensionErrorUtils::FormatErrorMessage(
-                         errors::kInvalidLaunchValue,
-                         keys::kLaunchMinHeight));
-
-  LoadAndExpectError("launch_container_missing_size_for_platform.json",
-                     ExtensionErrorUtils::FormatErrorMessage(
-                         errors::kInvalidLaunchValue,
-                         keys::kLaunchWidth));
-  LoadAndExpectError("launch_container_invalid_size_constraints.json",
-                     ExtensionErrorUtils::FormatErrorMessage(
-                         errors::kInvalidLaunchValue,
-                         keys::kLaunchMaxWidth));
-}
-
-TEST_F(ExtensionManifestTest, PlatformAppLaunchContainer) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnablePlatformApps);
-
-  LoadAndExpectError("launch_container_invalid_type_for_platform.json",
-                     errors::kInvalidLaunchContainerForPlatform);
 }
 
 TEST_F(ExtensionManifestTest, AppLaunchURL) {
   LoadAndExpectError("launch_path_and_url.json",
                      errors::kLaunchPathAndURLAreExclusive);
   LoadAndExpectError("launch_path_and_extent.json",
                      errors::kLaunchPathAndExtentAreExclusive);
   LoadAndExpectError("launch_path_invalid_type.json",
                      ExtensionErrorUtils::FormatErrorMessage(
                          errors::kInvalidLaunchValue,
@@ skipping 697 matching lines @@
   // Extension with manifest version 2 *can* use storage API.
   {
     DictionaryValue manifest_with_version;
     manifest_with_version.SetInteger(keys::kManifestVersion, 2);
     manifest_with_version.MergeDictionary(&base_manifest);
 
     Manifest manifest(&manifest_with_version, "test");
     LoadAndExpectSuccess(manifest);
   }
 }