GitLab

This reverts commit b94143e8.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 825165 as the
culprit for failures in the build cycles as shown on:
https://analysis.chromium.org/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtL2I5NDE0M2U4Yzk4ZjcyYmY1MjNmZmRkOTZmMDI5M2Y3MGMxOWZmNmMM

Sample Failed Build: https://ci.chromium.org/b/8864308609828715584

Sample Failed Step: browser_tests

Original change's description:
> dpwas: Move delete shared mac shim to behind shortcuts
> 
> While working on Run On OS Login for Mac, I noticed that the shared
> app shims were being deleted when toggling Run On OS Login. This happens
> because the app shims unconditionally delete the app shims.
> 
> This change moves the code to delete the shared app shims behind
> the shortcut check. On Mac you can have both per profile shims,
> and shared shims, so the callbacks are chained together only on
> that platform.
> 
> Bug: 897302
> Change-Id: I318137ac0f34e4f2429a5119d47e3fe5c3c96892
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2519877
> Commit-Queue: Mike Jackson <mjackson@microsoft.com>
> Reviewed-by: Daniel Murphy <dmurph@chromium.org>
> Reviewed-by: ccameron <ccameron@chromium.org>
> Reviewed-by: Phillis Tang <phillis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#825165}


Change-Id: Idfb5e8fdf86e6fdf1aa1557b78d1e3ab2c8100e7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 897302
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2524282
Cr-Commit-Position: refs/heads/master@{#825183}