Introduces --app flag to athena to load an app.

apps/shell/test/shell_test.cc

 // Copyright 2014 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 "apps/shell/test/shell_test.h"
 
 #include "apps/shell/browser/shell_content_browser_client.h"
 #include "apps/shell/browser/shell_desktop_controller.h"
 #include "apps/shell/browser/shell_extension_system.h"
 #include "base/command_line.h"
@@ skipping 29 matching lines @@
 
   RunTestOnMainThread();
 
   TearDownOnMainThread();
 
   // Clean up the app window.
   ShellDesktopController::instance()->CloseAppWindow();
 }
 
 bool AppShellTest::LoadAndLaunchApp(const base::FilePath& app_dir) {
-  return extension_system_->LoadAndLaunchApp(app_dir);
+  bool loaded = extension_system_->LoadApp(app_dir);
+  if (loaded)
+    extension_system_->LaunchApp();
+  return loaded;
 }
 
 }  // namespace apps