Revert of [Mac] Add interactive App Shim test.

Revert of [Mac] Add interactive App Shim test. (https://codereview.chromium.org/316493002/)

Reason for revert:
Appears to have broken AppShimInteractiveTest.Launch as seen in http://build.chromium.org/p/chromium.memory/builders/Mac%20ASan%2064%20Tests%20%283%29/builds/1338. Reverting. Please test on Mac with address sanitation enabled locally (or use the mac_asan try-bot) before re-landing. Sorry for the inconvenience. 

Original issue's description:
> [Mac] Add interactive App Shim test.
> 
> This test creates shims in the user data dir and actually starts them up and
> expects them to connect to the IPC socket.
> 
> BUG=168080
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=276368

TBR=tapted@chromium.org,rsesek@chromium.org,jackhou@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=168080

[please use gerrit instead, 2014-06-11 15:55:54]

Created Revert of [Mac] Add interactive App Shim test.

[commit-bot: I haz the power, 2014-06-11 15:57:28]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/rouslan@chromium.org/329253002/1

[commit-bot: I haz the power, 2014-06-11 15:59:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-11 15:59:50]

Failed to apply patch for apps/app_shim/chrome_main_app_mode_mac.mm:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file apps/app_shim/chrome_main_app_mode_mac.mm
  Hunk #1 FAILED at 611.
  1 out of 1 hunk FAILED -- saving rejects to file
apps/app_shim/chrome_main_app_mode_mac.mm.rej

Patch:       apps/app_shim/chrome_main_app_mode_mac.mm
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
e887e59cb561f503759d2f222ba37a3dbcbec583..1092142733bf4aad26df875b30ec7e34c419160d
100644
--- a/apps/app_shim/chrome_main_app_mode_mac.mm
+++ b/apps/app_shim/chrome_main_app_mode_mac.mm
@@ -611,11 +611,7 @@
   main_message_loop.set_thread_name("MainThread");
   base::PlatformThread::SetName("CrAppShimMain");
 
-  // 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)) {
+  if (pid == -1) {
     // Launch Chrome if it isn't already running.
     ProcessSerialNumber psn;
     CommandLine command_line(CommandLine::NO_PROGRAM);

[please use gerrit instead, 2014-06-11 16:29:16]

Looks like it was already reverted before me.

On 6/11/14, commit-bot@chromium.org <commit-bot@chromium.org> wrote:
> Failed to apply patch for apps/app_shim/chrome_main_app_mode_mac.mm:
> While running patch -p1 --forward --force --no-backup-if-mismatch;
>    patching file apps/app_shim/chrome_main_app_mode_mac.mm
>    Hunk #1 FAILED at 611.
>    1 out of 1 hunk FAILED -- saving rejects to file
> apps/app_shim/chrome_main_app_mode_mac.mm.rej
>
> Patch:       apps/app_shim/chrome_main_app_mode_mac.mm
> 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
>
e887e59cb561f503759d2f222ba37a3dbcbec583..1092142733bf4aad26df875b30ec7e34c419160d
> 100644
> --- a/apps/app_shim/chrome_main_app_mode_mac.mm
> +++ b/apps/app_shim/chrome_main_app_mode_mac.mm
> @@ -611,11 +611,7 @@
>     main_message_loop.set_thread_name("MainThread");
>     base::PlatformThread::SetName("CrAppShimMain");
>
> -  // 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)) {
> +  if (pid == -1) {
>       // Launch Chrome if it isn't already running.
>       ProcessSerialNumber psn;
>       CommandLine command_line(CommandLine::NO_PROGRAM);
>
>
> https://codereview.chromium.org/329253002/
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.