Change the platform app manifest structure.

chrome/common/extensions/manifest_tests/extension_manifests_platformapp_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/manifest_tests/extension_manifest_test.h"
 
 #include "base/command_line.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace errors = extension_manifest_errors;
 
 TEST_F(ExtensionManifestTest, PlatformApps) {
   // A minimal platform app.
   LoadAndExpectError("init_valid_platform_app.json",
                      errors::kPlatformAppFlagRequired);
 
   CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnablePlatformApps);
 
   scoped_refptr<extensions::Extension> extension =
       LoadAndExpectSuccess("init_valid_platform_app.json");
   EXPECT_TRUE(extension->is_storage_isolated());
 
-  extension = LoadAndExpectSuccess("init_invalid_platform_app_1.json");
-  ASSERT_TRUE(extension);
-  ASSERT_EQ(1u, extension->install_warnings().size());
-  EXPECT_EQ("'app.launch' is not allowed for specified package type "
-                "(theme, app, etc.).",
-            extension->install_warnings()[0]);
+  LoadAndExpectWarning(
+      "init_invalid_platform_app_1.json",
+      "'app.launch' is not allowed for specified package type "
+          "(theme, app, etc.).");
 
-  LoadAndExpectError(
-      "init_invalid_platform_app_2.json",
-      extension_manifest_errors::kBackgroundRequiredForPlatformApps);
+  Testcase error_testcases[] = {
+    Testcase("init_invalid_platform_app_2.json",
+        errors::kBackgroundRequiredForPlatformApps),
+    Testcase("init_invalid_platform_app_3.json",
+        errors::kPlatformAppNeedsManifestVersion2),
+  };
+  RunTestcases(error_testcases, arraysize(error_testcases), EXPECT_TYPE_ERROR);
 
-  LoadAndExpectError(
-      "init_invalid_platform_app_3.json",
-      extension_manifest_errors::kPlatformAppNeedsManifestVersion2);
+  Testcase warning_testcases[] = {
+    Testcase(
+        "init_invalid_platform_app_1.json",
+        "'app.launch' is not allowed for specified package type "
+            "(theme, app, etc.)."),
+    Testcase(
+        "init_invalid_platform_app_4.json",
+        "'background' is not allowed for specified package type "
+            "(theme, app, etc.)."),
+    Testcase(
+        "init_invalid_platform_app_5.json",
+        "'background' is not allowed for specified package type "
+            "(theme, app, etc.).")
+  };
+  RunTestcases(
+      warning_testcases, arraysize(warning_testcases), EXPECT_TYPE_WARNING);
 }
 
 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 47 matching lines @@
 
   // Finally, we should succeed with both experimental and platform-app flags
   // set.
   CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnablePlatformApps);
   for (size_t i = 0; i < arraysize(kPlatformAppExperimentalApis); ++i) {
     const char* api_name = kPlatformAppExperimentalApis[i];
     FilePath file_path = temp_dir.path().AppendASCII(api_name);
     LoadAndExpectSuccess(file_path.MaybeAsASCII().c_str());
   }
 }