Added HostedAppLaunch for testing hosted app shims on Mac.

chrome/browser/apps/app_browsertest_util.cc

 // Copyright 2013 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/browser/apps/app_browsertest_util.h"
 
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/apps/scoped_keep_alive.h"
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
@@ skipping 80 matching lines @@
 
 const Extension* PlatformAppBrowserTest::InstallPlatformApp(
     const char* name) {
   const Extension* extension = InstallExtension(
       test_data_dir_.AppendASCII("platform_apps").AppendASCII(name), 1);
   EXPECT_TRUE(extension);
 
   return extension;
 }
 
+const Extension* PlatformAppBrowserTest::InstallHostedApp() {
+  const Extension* extension =
+      InstallExtension(test_data_dir_.AppendASCII("hosted_app"), 1);
+  EXPECT_TRUE(extension);
+
+  return extension;
+}
+
 const Extension* PlatformAppBrowserTest::InstallAndLaunchPlatformApp(
     const char* name) {
   content::WindowedNotificationObserver app_loaded_observer(
       content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
       content::NotificationService::AllSources());
 
   const Extension* extension = InstallPlatformApp(name);
 
   LaunchPlatformApp(extension);
 
   app_loaded_observer.Wait();
 
   return extension;
 }
 
 void PlatformAppBrowserTest::LaunchPlatformApp(const Extension* extension) {
   OpenApplication(AppLaunchParams(browser()->profile(), extension,
                                   LAUNCH_CONTAINER_NONE, NEW_WINDOW,
                                   extensions::SOURCE_TEST));
 }
 
+void PlatformAppBrowserTest::LaunchHostedApp(const Extension* extension) {
+  AppLaunchParams launch_params(browser()->profile(), extension,
+                                NEW_FOREGROUND_TAB,
+                                extensions::SOURCE_COMMAND_LINE);
+  OpenApplication(launch_params);
+}
+
 WebContents* PlatformAppBrowserTest::GetFirstAppWindowWebContents() {
   AppWindow* window = GetFirstAppWindow();
   if (window)
     return window->web_contents();
 
   return NULL;
 }
 
 AppWindow* PlatformAppBrowserTest::GetFirstAppWindow() {
   return GetFirstAppWindowForBrowser(browser());
@@ skipping 123 matching lines @@
   return app_window;
 }
 
 void ExperimentalPlatformAppBrowserTest::SetUpCommandLine(
     CommandLine* command_line) {
   PlatformAppBrowserTest::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
 }
 
 }  // namespace extensions