Index: apps/app_shim/chrome_main_app_mode_mac.mm |
diff --git a/apps/app_shim/chrome_main_app_mode_mac.mm b/apps/app_shim/chrome_main_app_mode_mac.mm |
index 1092142733bf4aad26df875b30ec7e34c419160d..e887e59cb561f503759d2f222ba37a3dbcbec583 100644 |
--- a/apps/app_shim/chrome_main_app_mode_mac.mm |
+++ b/apps/app_shim/chrome_main_app_mode_mac.mm |
@@ -611,7 +611,11 @@ int ChromeAppModeStart(const app_mode::ChromeAppModeInfo* info) { |
main_message_loop.set_thread_name("MainThread"); |
base::PlatformThread::SetName("CrAppShimMain"); |
- if (pid == -1) { |
+ // In tests, launching Chrome does nothing, and we won't get a ping response, |
+ // so just assume the socket exists. |
+ if (pid == -1 && |
+ !CommandLine::ForCurrentProcess()->HasSwitch( |
+ app_mode::kLaunchedForTest)) { |
// Launch Chrome if it isn't already running. |
ProcessSerialNumber psn; |
CommandLine command_line(CommandLine::NO_PROGRAM); |