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}
2 files changed