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

chrome/browser/extensions/extension_apitest.cc

Index: chrome/browser/extensions/extension_apitest.cc
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 1d53fe60bb32eeba4817f3d505750412acaf1451..cce2618bd6603712a5e81f5940264051e4594709 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -156,7 +156,7 @@ bool ExtensionApiTest::RunPageTest(const std::string& page_url,
 }
 
 bool ExtensionApiTest::RunPlatformAppTest(const char* extension_name) {
-  return RunExtensionTestImpl(extension_name, "", kFlagLaunchAppShell);
+  return RunExtensionTestImpl(extension_name, "", kFlagLaunchPlatformApp);
 }
 
 // Load |extension_name| extension and/or |page_url| and wait for
@@ -167,7 +167,7 @@ bool ExtensionApiTest::RunExtensionTestImpl(const char* extension_name,
   bool enable_incognito = (flags & kFlagEnableIncognito) != 0;
   bool enable_fileaccess = (flags & kFlagEnableFileAccess) != 0;
   bool load_as_component = (flags & kFlagLoadAsComponent) != 0;
-  bool launch_shell = (flags & kFlagLaunchAppShell) != 0;
+  bool launch_platform_app = (flags & kFlagLaunchPlatformApp) != 0;
   bool use_incognito = (flags & kFlagUseIncognito) != 0;
 
   ResultCatcher catcher;
@@ -208,11 +208,11 @@ bool ExtensionApiTest::RunExtensionTestImpl(const char* extension_name,
     else
       ui_test_utils::NavigateToURL(browser(), url);
 
-  } else if (launch_shell) {
+  } else if (launch_platform_app) {
     Browser::OpenApplication(
         browser()->profile(),
         extension,
-        extension_misc::LAUNCH_SHELL,
+        extension_misc::LAUNCH_NONE,
         GURL(),
         NEW_WINDOW);
   }