GitLab

This reverts commit 391dff3d.

Reason for revert: Broke build
https://ci.chromium.org/p/chrome/builders/ci/win-google-rel/3737

Original change's description:
> Create source sets for tests in chrome/browser/conflicts
> 
> This solves a filename collision that happens when moving all the files
> in chrome/browser/conflicts to chrome/browser/win/conflicts because
> module_info_win_unittest.cc becomes module_info_unittest.cc, and this
> file already exists at
> chrome/browser/install_verification/win/module_info_unittest.cc
> 
> Change-Id: Id269f582259ac8e53a8a5aa64a61f4232ad732ab
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1593894
> Commit-Queue: Patrick Monette <pmonette@chromium.org>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#659186}

TBR=sky@chromium.org,pmonette@chromium.org

Change-Id: Iac5e9ba70ca8f15625b366374aeeaf24188d5d19
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1609719Reviewed-by: Alexei Filippov <alph@chromium.org>
Commit-Queue: Alexei Filippov <alph@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659222}