Add the ability to load multiple apps into app_shell.

  * To load the apps you can specify a comma-separated list in the command-line.
    For example: 'app_shell --app-shell-app-path=path/to/app1/,path/to/app2'

  * For now there's no API to control the focus of the apps, so the only way
    to switch apps is to either close the app_window (which will switch focus to
    the next app in the hierarchy) or using the aura::Window API directly and
    calling Focus() on the windows.

BUG=422618

Review URL: https://codereview.chromium.org/642383003

Cr-Commit-Position: refs/heads/master@{#301135}

1 files changed, 3 insertions, 3 deletions

diff --git a/extensions/shell/test/shell_apitest.cc b/extensions/shell/test/shell_apitest.cc
index b60bf5b..f1ea7a2 100644
--- a/extensions/shell/test/shell_apitest.cc
+++ b/extensions/shell/test/shell_apitest.cc
@@ -24,11 +24,11 @@ bool ShellApiTest::RunAppTest(const std::string& app_dir) {
   test_data_dir = test_data_dir.AppendASCII(app_dir);
   ResultCatcher catcher;
 
-  bool loaded = extension_system_->LoadApp(test_data_dir);
-  if (!loaded)
+  const Extension* extension = extension_system_->LoadApp(test_data_dir);
+  if (!extension)
     return false;
 
-  extension_system_->LaunchApp();
+  extension_system_->LaunchApp(extension->id());
 
   if (!catcher.GetNextResult()) {
     message_ = catcher.message();