GitLab

Also rewrite some if-else statements without if (!cond).

Change-Id: If70a32a7baa5d2e70480831646ebf46eea8b8993
Reviewed-on: https://chromium-review.googlesource.com/804833Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521808}