GitLab

Merges the contents of an always-true block with the contents one scope up.
There were several if (is_win) etc blocks at that scope; merge these too.

No intended behavior change.

Bug: 832676
Change-Id: I89ecdec3babec570c631714001edb71cfb1cca66
Reviewed-on: https://chromium-review.googlesource.com/1213522Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589519}