GitLab

This reverts commit dedbddfa.

Reason for revert: Breaks windows perf bot compile crbug/1150494

Original change's description:
> Migrate non-inclusive terminology in chrome/browser/win/conflicts.
>
> Bug: 1097283
> Change-Id: Ic54679c9d4b86fbe074b77067bd1bfa8b5d388f4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2546842
> Commit-Queue: Peter Kasting <pkasting@chromium.org>
> Commit-Queue: Chris Hamilton <chrisha@chromium.org>
> Auto-Submit: Peter Kasting <pkasting@chromium.org>
> Reviewed-by: Chris Hamilton <chrisha@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#828770}

TBR=pkasting@chromium.org,chrisha@chromium.org

Change-Id: Id51371b5e0add5122cd34323c7fc3461d9ad118a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1097283,1150494
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2547049Reviewed-by: Stephen Nusko <nuskos@chromium.org>
Commit-Queue: Stephen Nusko <nuskos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828804}