Make platform apps use and require a different container ("shell" instead of "panel")

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 224 matching lines @@
 
   // 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, PlatformApps) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnablePlatformApps);
+
   // A minimal platform app.
   LoadAndExpectSuccess("init_valid_platform_app.json");
 }
 
 TEST_F(ExtensionManifestTest, InitFromValueValidNameInRTL) {
 #if defined(TOOLKIT_GTK)
   GtkTextDirection gtk_dir = gtk_widget_get_default_direction();
   gtk_widget_set_default_direction(GTK_TEXT_DIR_RTL);
 #else
   std::string locale = l10n_util::GetApplicationLocale("");
@@ skipping 116 matching lines @@
 
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("web_urls_default.json"));
   ASSERT_EQ(1u, extension->web_extent().patterns().size());
   EXPECT_EQ("*://www.google.com/*",
             extension->web_extent().patterns().begin()->GetAsString());
 }
 
 TEST_F(ExtensionManifestTest, AppLaunchContainer) {
   scoped_refptr<Extension> extension;
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnablePlatformApps);
+  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnablePlatformApps);
 
   extension = LoadAndExpectSuccess("launch_tab.json");
   EXPECT_EQ(extension_misc::LAUNCH_TAB, extension->launch_container());
 
   extension = LoadAndExpectSuccess("launch_panel.json");
   EXPECT_EQ(extension_misc::LAUNCH_PANEL, extension->launch_container());
 
   extension = LoadAndExpectSuccess("launch_default.json");
   EXPECT_EQ(extension_misc::LAUNCH_TAB, extension->launch_container());
 
@@ skipping 597 matching lines @@
 
   // This guy is identical to the previous but doesn't ask for any
   // platform-app-only permissions. We should be able to load him and ask
   // questions about his permissions.
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("not_platform_app.json"));
   scoped_refptr<const ExtensionPermissionSet> permissions;
   permissions = extension->GetActivePermissions();
   EXPECT_FALSE(permissions->HasPlatformAppPermissions());
 }