From 611131c91fa6513da012b889ea3a7399bcdd869e Mon Sep 17 00:00:00 2001
From: Mikhail <45488748+atuchin-m@users.noreply.github.com>
Date: Wed, 22 Sep 2021 13:10:47 +0700
Subject: [PATCH] Remove unused dependencies (#10099)

* Remove unused dependencies
* Update chromium patches
* Fix browser_tests compilation
* Fix review issues
* Fix whitespaces
---
 chromium_src/chrome/test/sources.gni       | 15 +++++++++++++++
 patches/chrome-test-BUILD.gn.patch         | 16 ++++++++--------
 test/BUILD.gn                              | 12 ------------
 test/base/testing_brave_browser_process.cc |  3 ++-
 4 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 chromium_src/chrome/test/sources.gni

diff --git a/chromium_src/chrome/test/sources.gni b/chromium_src/chrome/test/sources.gni
new file mode 100644
index 00000000000..8d86df149a6
--- /dev/null
+++ b/chromium_src/chrome/test/sources.gni
@@ -0,0 +1,15 @@
+# Copyright (c) 2021 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brave_chromium_src_chrome_test_test_support_sources = [
+  "//brave/test/base/testing_brave_browser_process.cc",
+  "//brave/test/base/testing_brave_browser_process.h",
+]
+
+brave_chromium_src_chrome_test_test_support_deps = [
+  "//brave/components/brave_shields/browser",
+  "//brave/components/ipfs/buildflags",
+  "//brave/components/tor/buildflags",
+]
diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch
index fd8bffa5c9d..0380e33b718 100644
--- a/patches/chrome-test-BUILD.gn.patch
+++ b/patches/chrome-test-BUILD.gn.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 0fcf061bf93b4b11603ef944cf8dd4d456cf5f45..4e3251cdf1c6b9a830230a4538cc3b2838740314 100644
+index 0fcf061bf93b4b11603ef944cf8dd4d456cf5f45..1e3a6d15d98558c24c6333191f6fe6083d7f60ca 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -1307,6 +1307,7 @@ if (!is_android && !is_fuchsia) {
-       "//v8",
-     ]
+@@ -333,6 +333,7 @@ static_library("test_support") {
+     "//ui/gl",
+   ]
  
-+    deps += [ "//brave/test:brave_browser_tests_deps", ]
-     # Runtime dependencies
-     data_deps = [
-       "//chrome:browser_tests_pak",
++  import("//brave/chromium_src/chrome/test/sources.gni") deps += brave_chromium_src_chrome_test_test_support_deps sources += brave_chromium_src_chrome_test_test_support_sources
+   data_deps = []
+ 
+   if (is_chromeos_lacros && also_build_ash_chrome) {
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 9fb84eddc72..cfdd9ea9c9a 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -550,17 +550,6 @@ if (!is_android && !is_ios) {
   }
 }
 
-group("brave_browser_tests_deps") {
-  testonly = true
-
-  # force these to build for tests
-  deps = [
-    "//brave",
-    "//brave:browser_dependencies",
-    "//brave:child_dependencies",
-  ]
-}
-
 static_library("browser_test_support") {
   testonly = true
   public_deps = [ "//chrome/test:test_support" ]
@@ -885,7 +874,6 @@ if (!is_android) {
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
     deps += [
-      ":brave_browser_tests_deps",
       "//brave/app:brave_generated_resources_grit",
       "//brave/app:command_ids",
       "//brave/app/theme:brave_theme_resources_grit",
diff --git a/test/base/testing_brave_browser_process.cc b/test/base/testing_brave_browser_process.cc
index 868cb9f3d78..d95ab1ad1bf 100644
--- a/test/base/testing_brave_browser_process.cc
+++ b/test/base/testing_brave_browser_process.cc
@@ -3,12 +3,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "brave/test/base/testing_brave_browser_process.h"
+
 #include <utility>
 
 #include "brave/components/brave_shields/browser/ad_block_service.h"
 #include "brave/components/ipfs/buildflags/buildflags.h"
 #include "brave/components/tor/buildflags/buildflags.h"
-#include "brave/test/base/testing_brave_browser_process.h"
 
 namespace tor {
 class BraveTorClientUpdater;