Revert "Create source sets for tests in chrome/browser/conflicts"

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}

chrome/browser/BUILD.gn

@@ -3601,8 +3601,8 @@ jumbo_split_static_library("browser") {
     if (is_chrome_branded) {
       deps += [
         ":conflicts_module_list_proto",
-        "//chrome_elf:sha1",
-        "//chrome_elf:third_party_shared_defines",
+        "//chrome/chrome_elf:sha1",
+        "//chrome/chrome_elf:third_party_shared_defines",
         "//google_update",
       ]
       libs += [ "msi.lib" ]
@@ -5005,6 +5005,12 @@ if (is_win) {
       "//chrome/common:constants",
     ]
   }
+
+  proto_library("conflicts_module_list_proto") {
+    sources = [
+      "conflicts/proto/module_list.proto",
+    ]
+  }
 }
 
 # This source set is built into both //chrome:chrome_initial (chrome.exe) and

chrome/browser/conflicts/BUILD.gn

@@ -2,20 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/chrome_build.gni")
-import("//third_party/protobuf/proto_library.gni")
-
-assert(is_win)
-
-# Note: Most of the files in this directory are directly added as source files
-#       to the //chrome/browser target (chrome/browser/BUILD.gn).
-
-proto_library("module_list_proto") {
-  sources = [
-    "proto/module_list.proto",
-  ]
-}
-
 source_set("module_info") {
   sources = [
     "module_info_util_win.cc",
@@ -34,74 +20,3 @@ source_set("module_info") {
     "//chrome/common/safe_browsing:binary_feature_extractor",
   ]
 }
-
-loadable_module("conflicts_dll") {
-  testonly = true
-  sources = [
-    "test/conflicts_dll.cc",
-  ]
-}
-
-source_set("unit_tests") {
-  testonly = true
-  sources = [
-    "enumerate_input_method_editors_win_unittest.cc",
-    "enumerate_shell_extensions_win_unittest.cc",
-    "inspection_results_cache_win_unittest.cc",
-    "module_database_win_unittest.cc",
-    "module_event_sink_impl_win_unittest.cc",
-    "module_info_util_win_unittest.cc",
-    "module_info_win_unittest.cc",
-    "module_inspector_win_unittest.cc",
-  ]
-
-  deps = [
-    ":conflicts_dll",
-    ":module_info",
-    "//chrome/browser",
-    "//chrome/services/util_win:lib",
-    "//chrome/test:test_support",
-    "//content/test:test_support",
-    "//services/service_manager/public/cpp/test:test_support",
-    "//testing/gtest",
-  ]
-
-  if (is_chrome_branded) {
-    sources += [
-      "incompatible_applications_updater_win_unittest.cc",
-      "installed_applications_win_unittest.cc",
-      "module_blacklist_cache_updater_win_unittest.cc",
-      "module_blacklist_cache_util_win_unittest.cc",
-      "module_list_filter_win_unittest.cc",
-      "module_load_attempt_log_listener_win_unittest.cc",
-      "registry_key_watcher_win_unittest.cc",
-      "third_party_conflicts_manager_win_unittest.cc",
-    ]
-
-    deps += [
-      ":module_list_proto",
-      "//chrome_elf:third_party_shared_defines",
-    ]
-  }
-}
-
-if (is_chrome_branded) {
-  source_set("browser_tests") {
-    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-
-    testonly = true
-    sources = [
-      "incompatible_applications_browsertest.cc",
-      "third_party_blocking_browsertest.cc",
-    ]
-
-    deps = [
-      ":conflicts_dll",
-      ":module_list_proto",
-      "//chrome/browser",
-      "//chrome/test:test_support_ui",
-      "//chrome_elf:third_party_shared_defines",
-      "//testing/gtest",
-    ]
-  }
-}

chrome/test/BUILD.gn

@@ -2230,7 +2230,11 @@ test("browser_tests") {
       ]
 
       if (is_chrome_branded) {
-        deps += [ "//chrome/browser/conflicts:browser_tests" ]
+        sources += [
+          "../browser/conflicts/incompatible_applications_browsertest.cc",
+          "../browser/conflicts/third_party_blocking_browsertest.cc",
+        ]
+        deps += [ ":conflicts_dll" ]
       }
     } else {  # Not Windows.
       sources -= [ "../app/chrome_version.rc.version" ]
@@ -2655,6 +2659,14 @@ test("unit_tests") {
     "../browser/component_updater/subresource_filter_component_installer_unittest.cc",
     "../browser/component_updater/supervised_user_whitelist_installer_unittest.cc",
     "../browser/component_updater/sw_reporter_installer_win_unittest.cc",
+    "../browser/conflicts/enumerate_input_method_editors_win_unittest.cc",
+    "../browser/conflicts/enumerate_shell_extensions_win_unittest.cc",
+    "../browser/conflicts/inspection_results_cache_win_unittest.cc",
+    "../browser/conflicts/module_database_win_unittest.cc",
+    "../browser/conflicts/module_event_sink_impl_win_unittest.cc",
+    "../browser/conflicts/module_info_util_win_unittest.cc",
+    "../browser/conflicts/module_info_win_unittest.cc",
+    "../browser/conflicts/module_inspector_win_unittest.cc",
     "../browser/content_settings/content_settings_default_provider_unittest.cc",
     "../browser/content_settings/content_settings_mock_observer.cc",
     "../browser/content_settings/content_settings_mock_observer.h",
@@ -3234,10 +3246,7 @@ test("unit_tests") {
   if (is_win) {
     assert(toolkit_views)
     sources += [ "../browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc" ]
-    deps += [
-      "//chrome/browser/conflicts:unit_tests",
-      "//chrome/test:credential_provider_test_utils",
-    ]
+    deps += [ "//chrome/test:credential_provider_test_utils" ]
   }
 
   if (enable_dice_support) {
@@ -4562,6 +4571,7 @@ test("unit_tests") {
     data_deps += [
       "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_1",
       "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_2",
+      ":conflicts_dll",
     ]
 
     libs = [
@@ -4580,7 +4590,17 @@ test("unit_tests") {
     ]
 
     if (is_chrome_branded) {
-      sources += [ "../browser/google/google_update_win_unittest.cc" ]
+      sources += [
+        "../browser/conflicts/incompatible_applications_updater_win_unittest.cc",
+        "../browser/conflicts/installed_applications_win_unittest.cc",
+        "../browser/conflicts/module_blacklist_cache_updater_win_unittest.cc",
+        "../browser/conflicts/module_blacklist_cache_util_win_unittest.cc",
+        "../browser/conflicts/module_list_filter_win_unittest.cc",
+        "../browser/conflicts/module_load_attempt_log_listener_win_unittest.cc",
+        "../browser/conflicts/registry_key_watcher_win_unittest.cc",
+        "../browser/conflicts/third_party_conflicts_manager_win_unittest.cc",
+        "../browser/google/google_update_win_unittest.cc",
+      ]
     }
   }
   if (is_android) {
@@ -4846,6 +4866,15 @@ static_library("test_support_unit") {
   }
 }
 
+if (is_win) {
+  loadable_module("conflicts_dll") {
+    testonly = true
+    sources = [
+      "conflicts/conflicts_dll.cc",
+    ]
+  }
+}
+
 if (!is_android) {
   static_library("test_support_ui") {
     defines = []

chrome/test/conflicts/OWNERS

+chrisha@chromium.org
+pmonette@chromium.org
+
+# COMPONENT: Internals>Core