| Index: chrome/common/extensions/extension_manifests_unittest.cc
|
| diff --git a/chrome/common/extensions/extension_manifests_unittest.cc b/chrome/common/extensions/extension_manifests_unittest.cc
|
| index 8136deaf04142acfaa504971784430cb84794093..9dd988cd30e8a700f78b8d027629b1d423dc8e9e 100644
|
| --- a/chrome/common/extensions/extension_manifests_unittest.cc
|
| +++ b/chrome/common/extensions/extension_manifests_unittest.cc
|
| @@ -380,7 +380,6 @@ TEST_F(ExtensionManifestTest, AppWebUrls) {
|
|
|
| TEST_F(ExtensionManifestTest, AppLaunchContainer) {
|
| scoped_refptr<Extension> extension;
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnablePlatformApps);
|
|
|
| extension = LoadAndExpectSuccess("launch_tab.json");
|
| EXPECT_EQ(extension_misc::LAUNCH_TAB, extension->launch_container());
|
| @@ -401,8 +400,6 @@ TEST_F(ExtensionManifestTest, AppLaunchContainer) {
|
| errors::kInvalidLaunchContainer);
|
| LoadAndExpectError("launch_container_invalid_type.json",
|
| errors::kInvalidLaunchContainer);
|
| - LoadAndExpectError("launch_container_invalid_type_for_platform.json",
|
| - errors::kInvalidLaunchContainerForPlatform);
|
| LoadAndExpectError("launch_container_invalid_value.json",
|
| errors::kInvalidLaunchContainer);
|
| LoadAndExpectError("launch_container_without_launch_url.json",
|
| @@ -417,6 +414,13 @@ TEST_F(ExtensionManifestTest, AppLaunchContainer) {
|
| errors::kInvalidLaunchHeight);
|
| }
|
|
|
| +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);
|
|
|