Revert of Include headless tests in all swarm version for Windows, since it's been enabled (patchset #2 id:20001 of https://codereview.chromium.org/2841443002/ )

Reason for revert:
This CL broke some Mac tests
https://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests%20%28dbg%29/builds/40547
https://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests%20%28dbg%29/builds/40547

FindIt report: https://findit-for-me.appspot.com/waterfall/build-failure?url=https://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests%20%28dbg%29/builds/40547

Original issue's description:
> Include headless tests in all swarm version for Windows, since it's been enabled
> Also, increase tests version for Mac (previously enabled in https://codereview.chromium.org/2783053002)
>
> BUG=686608
>
> Review-Url: https://codereview.chromium.org/2841443002
> Cr-Commit-Position: refs/heads/master@{#472023}
> Committed: https://chromium.googlesource.com/chromium/src/+/386add8ced87b5b0c91d4f91b0f3e41be71c3d2c

TBR=dpranke@chromium.org,skyostil@chromium.org,dvallet@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=686608

Review-Url: https://codereview.chromium.org/2887663002
Cr-Commit-Position: refs/heads/master@{#472041}
2 files changed