diff --git a/chromium_src/apps/app_restore_service_browsertest.cc b/chromium_src/apps/app_restore_service_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/apps/app_restore_service_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/apps/load_and_launch_browsertest.cc b/chromium_src/apps/load_and_launch_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/apps/load_and_launch_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/apps/saved_files_service_unittest.cc b/chromium_src/apps/saved_files_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/apps/saved_files_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/about_flags_unittest.cc b/chromium_src/chrome/browser/about_flags_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/about_flags_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/accessibility/caption_controller_browsertest.cc b/chromium_src/chrome/browser/accessibility/caption_controller_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/accessibility/caption_controller_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/app_controller_mac_browsertest.mm b/chromium_src/chrome/browser/app_controller_mac_browsertest.mm
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/app_controller_mac_browsertest.mm
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/apps/app_service/app_icon/app_icon_factory_unittest.cc b/chromium_src/chrome/browser/apps/app_service/app_icon/app_icon_factory_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/apps/app_service/app_icon/app_icon_factory_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/apps/app_service/app_service_proxy_unittest.cc b/chromium_src/chrome/browser/apps/app_service/app_service_proxy_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/apps/app_service/app_service_proxy_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/apps/app_shim/app_shim_manager_mac_unittest.cc b/chromium_src/chrome/browser/apps/app_shim/app_shim_manager_mac_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/apps/app_shim/app_shim_manager_mac_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/apps/guest_view/app_view_browsertest.cc b/chromium_src/chrome/browser/apps/guest_view/app_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/apps/guest_view/app_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chromium_src/chrome/browser/apps/guest_view/web_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/apps/platform_apps/app_browsertest.cc b/chromium_src/chrome/browser/apps/platform_apps/app_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/apps/platform_apps/app_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/apps/platform_apps/event_page_browsertest.cc b/chromium_src/chrome/browser/apps/platform_apps/event_page_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/apps/platform_apps/event_page_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/apps/platform_apps/platform_app_navigation_redirector_browsertest.cc b/chromium_src/chrome/browser/apps/platform_apps/platform_app_navigation_redirector_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/apps/platform_apps/platform_app_navigation_redirector_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/attribution_reporting/conversions_usage_restriction_trial_browsertest.cc b/chromium_src/chrome/browser/attribution_reporting/conversions_usage_restriction_trial_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/attribution_reporting/conversions_usage_restriction_trial_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc b/chromium_src/chrome/browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc b/chromium_src/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/autocomplete/search_provider_unittest.cc b/chromium_src/chrome/browser/autocomplete/search_provider_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/autocomplete/search_provider_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/autofill/autofill_browsertest.cc b/chromium_src/chrome/browser/autofill/autofill_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/autofill/autofill_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/autofill/autofill_server_browsertest.cc b/chromium_src/chrome/browser/autofill/autofill_server_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/autofill/autofill_server_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/autofill/form_structure_browsertest.cc b/chromium_src/chrome/browser/autofill/form_structure_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/autofill/form_structure_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/background/background_application_list_model_unittest.cc b/chromium_src/chrome/browser/background/background_application_list_model_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/background/background_application_list_model_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/background_fetch/background_fetch_browsertest.cc b/chromium_src/chrome/browser/background_fetch/background_fetch_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/background_fetch/background_fetch_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/background_sync/periodic_background_sync_permission_context_unittest.cc b/chromium_src/chrome/browser/background_sync/periodic_background_sync_permission_context_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/background_sync/periodic_background_sync_permission_context_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc b/chromium_src/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/breadcrumbs/breadcrumb_manager_tab_helper_unittest.cc b/chromium_src/chrome/browser/breadcrumbs/breadcrumb_manager_tab_helper_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/breadcrumbs/breadcrumb_manager_tab_helper_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/browser_commands_unittest.cc b/chromium_src/chrome/browser/browser_commands_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/browser_commands_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/browser_encoding_browsertest.cc b/chromium_src/chrome/browser/browser_encoding_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/browser_encoding_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/browser_switcher/browser_switcher_browsertest.cc b/chromium_src/chrome/browser/browser_switcher/browser_switcher_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/browser_switcher/browser_switcher_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/browser_switcher/browser_switcher_service_browsertest.cc b/chromium_src/chrome/browser/browser_switcher/browser_switcher_service_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/browser_switcher/browser_switcher_service_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/browsing_data/access_context_audit_browsertest.cc b/chromium_src/chrome/browser/browsing_data/access_context_audit_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/browsing_data/access_context_audit_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chromium_src/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_browsertest.cc b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/browsing_data/counters/browsing_data_counter_utils_browsertest.cc b/chromium_src/chrome/browser/browsing_data/counters/browsing_data_counter_utils_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/browsing_data/counters/browsing_data_counter_utils_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/browsing_data/counters/site_settings_counter_unittest.cc b/chromium_src/chrome/browser/browsing_data/counters/site_settings_counter_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/browsing_data/counters/site_settings_counter_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/browsing_data/counters/sync_aware_counter_browsertest.cc b/chromium_src/chrome/browser/browsing_data/counters/sync_aware_counter_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/browsing_data/counters/sync_aware_counter_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/browsing_data/incognito_browsing_data_browsertest.cc b/chromium_src/chrome/browser/browsing_data/incognito_browsing_data_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/browsing_data/incognito_browsing_data_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/browsing_data/third_party_data_remover_browsertest.cc b/chromium_src/chrome/browser/browsing_data/third_party_data_remover_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/browsing_data/third_party_data_remover_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chromium_src/chrome/browser/captive_portal/captive_portal_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/chrome_back_forward_cache_browsertest.cc b/chromium_src/chrome/browser/chrome_back_forward_cache_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/chrome_back_forward_cache_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/chrome_content_browser_client_browsertest.cc b/chromium_src/chrome/browser/chrome_content_browser_client_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/chrome_content_browser_client_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/chrome_content_browser_client_unittest.cc b/chromium_src/chrome/browser/chrome_content_browser_client_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/chrome_content_browser_client_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/chrome_find_request_manager_browsertest.cc b/chromium_src/chrome/browser/chrome_find_request_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/chrome_find_request_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/chrome_main_browsertest.cc b/chromium_src/chrome/browser/chrome_main_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/chrome_main_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/chrome_navigation_browsertest.cc b/chromium_src/chrome/browser/chrome_navigation_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/chrome_navigation_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/chrome_security_exploit_browsertest.cc b/chromium_src/chrome/browser/chrome_security_exploit_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/chrome_security_exploit_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/chrome_web_platform_security_metrics_browsertest.cc b/chromium_src/chrome/browser/chrome_web_platform_security_metrics_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/chrome_web_platform_security_metrics_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/client_hints/client_hints_browsertest.cc b/chromium_src/chrome/browser/client_hints/client_hints_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/client_hints/client_hints_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/component_updater/chrome_component_updater_configurator_unittest.cc b/chromium_src/chrome/browser/component_updater/chrome_component_updater_configurator_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/component_updater/chrome_component_updater_configurator_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/component_updater/first_party_sets_component_installer_unittest.cc b/chromium_src/chrome/browser/component_updater/first_party_sets_component_installer_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/component_updater/first_party_sets_component_installer_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/component_updater/floc_component_installer_unittest.cc b/chromium_src/chrome/browser/component_updater/floc_component_installer_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/component_updater/floc_component_installer_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc b/chromium_src/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/content_settings/content_settings_browsertest.cc b/chromium_src/chrome/browser/content_settings/content_settings_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/content_settings/content_settings_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/content_settings/cookie_settings_factory_unittest.cc b/chromium_src/chrome/browser/content_settings/cookie_settings_factory_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/content_settings/cookie_settings_factory_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chromium_src/chrome/browser/content_settings/host_content_settings_map_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/content_settings/host_content_settings_map_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc b/chromium_src/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/data_saver/data_saver_browsertest.cc b/chromium_src/chrome/browser/data_saver/data_saver_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/data_saver/data_saver_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/data_saver/lite_video_browsertest.cc b/chromium_src/chrome/browser/data_saver/lite_video_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/data_saver/lite_video_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/data_saver/subresource_redirect_browsertest.cc b/chromium_src/chrome/browser/data_saver/subresource_redirect_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/data_saver/subresource_redirect_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/data_saver/subresource_redirect_login_robots_browsertest.cc b/chromium_src/chrome/browser/data_saver/subresource_redirect_login_robots_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/data_saver/subresource_redirect_login_robots_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/devtools/devtools_browsertest.cc b/chromium_src/chrome/browser/devtools/devtools_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/devtools/devtools_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chromium_src/chrome/browser/devtools/devtools_sanity_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/devtools/devtools_ui_bindings_unittest.cc b/chromium_src/chrome/browser/devtools/devtools_ui_bindings_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/devtools/devtools_ui_bindings_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/devtools/global_confirm_info_bar_browsertest.cc b/chromium_src/chrome/browser/devtools/global_confirm_info_bar_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/devtools/global_confirm_info_bar_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/devtools/protocol/cast_handler_unittest.cc b/chromium_src/chrome/browser/devtools/protocol/cast_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/devtools/protocol/cast_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc b/chromium_src/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/dom_distiller/distillable_page_utils_browsertest.cc b/chromium_src/chrome/browser/dom_distiller/distillable_page_utils_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/dom_distiller/distillable_page_utils_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc b/chromium_src/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/dom_distiller/tab_utils_browsertest.cc b/chromium_src/chrome/browser/dom_distiller/tab_utils_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/dom_distiller/tab_utils_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/domain_reliability/browsertest.cc b/chromium_src/chrome/browser/domain_reliability/browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/domain_reliability/browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chromium_src/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/download/download_browsertest.cc b/chromium_src/chrome/browser/download/download_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/download/download_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/download/download_browsertest.h b/chromium_src/chrome/browser/download/download_browsertest.h
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/download/download_browsertest.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/download/download_frame_policy_browsertest.cc b/chromium_src/chrome/browser/download/download_frame_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/download/download_frame_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/download/download_target_determiner_unittest.cc b/chromium_src/chrome/browser/download/download_target_determiner_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/download/download_target_determiner_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/download/save_page_browsertest.cc b/chromium_src/chrome/browser/download/save_page_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/download/save_page_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/enterprise/connectors/analysis/content_analysis_dialog_browsertest.cc b/chromium_src/chrome/browser/enterprise/connectors/analysis/content_analysis_dialog_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/enterprise/connectors/analysis/content_analysis_dialog_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/enterprise/connectors/content_analysis_dialog_browsertest.cc b/chromium_src/chrome/browser/enterprise/connectors/content_analysis_dialog_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/enterprise/connectors/content_analysis_dialog_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/enterprise/connectors/file_system/rename_handler_unittest.cc b/chromium_src/chrome/browser/enterprise/connectors/file_system/rename_handler_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/enterprise/connectors/file_system/rename_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc b/chromium_src/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/enterprise/reporting/browser_report_generator_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/enterprise/reporting/extension_request/extension_request_notification_unittest.cc b/chromium_src/chrome/browser/enterprise/reporting/extension_request/extension_request_notification_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/enterprise/reporting/extension_request/extension_request_notification_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/enterprise/reporting/extension_request/extension_request_observer_unittest.cc b/chromium_src/chrome/browser/enterprise/reporting/extension_request/extension_request_observer_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/enterprise/reporting/extension_request/extension_request_observer_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/error_reporting/webui_js_error_reporting_browsertest.cc b/chromium_src/chrome/browser/error_reporting/webui_js_error_reporting_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/error_reporting/webui_js_error_reporting_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/active_tab_apitest.cc b/chromium_src/chrome/browser/extensions/active_tab_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/active_tab_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/active_tab_unittest.cc b/chromium_src/chrome/browser/extensions/active_tab_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/active_tab_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc b/chromium_src/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chromium_src/chrome/browser/extensions/activity_log/activity_log_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/activity_log/activity_log_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/activity_log/counting_policy_unittest.cc b/chromium_src/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc b/chromium_src/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/all_urls_apitest.cc b/chromium_src/chrome/browser/extensions/all_urls_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/all_urls_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc b/chromium_src/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/automation/automation_apitest.cc b/chromium_src/chrome/browser/extensions/api/automation/automation_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/automation/automation_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc b/chromium_src/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc b/chromium_src/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chromium_src/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/context_menus/context_menu_apitest.cc b/chromium_src/chrome/browser/extensions/api/context_menus/context_menu_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/context_menus/context_menu_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/cookies/cookies_apitest.cc b/chromium_src/chrome/browser/extensions/api/cookies/cookies_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/cookies/cookies_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api_unittest.cc b/chromium_src/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/debugger/debugger_apitest.cc b/chromium_src/chrome/browser/extensions/api/debugger/debugger_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/debugger/debugger_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/declarative/declarative_apitest.cc b/chromium_src/chrome/browser/extensions/api/declarative/declarative_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/declarative/declarative_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc b/chromium_src/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc b/chromium_src/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc b/chromium_src/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc b/chromium_src/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/declarative_net_request/action_tracker_unittest.cc b/chromium_src/chrome/browser/extensions/api/declarative_net_request/action_tracker_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/declarative_net_request/action_tracker_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_apitest.cc b/chromium_src/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc b/chromium_src/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_unittest.cc b/chromium_src/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/declarative_net_request/ruleset_manager_unittest.cc b/chromium_src/chrome/browser/extensions/api/declarative_net_request/ruleset_manager_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/declarative_net_request/ruleset_manager_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc b/chromium_src/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/developer_private/developer_private_apitest.cc b/chromium_src/chrome/browser/extensions/api/developer_private/developer_private_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/developer_private/developer_private_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc b/chromium_src/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/device_permissions_manager_unittest.cc b/chromium_src/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chromium_src/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_unittest.cc b/chromium_src/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chromium_src/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/extension_action/extension_action_api_unittest.cc b/chromium_src/chrome/browser/extensions/api/extension_action/extension_action_api_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/extension_action/extension_action_api_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/extension_action/extension_action_apitest.cc b/chromium_src/chrome/browser/extensions/api/extension_action/extension_action_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/extension_action/extension_action_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/extension_action/page_action_apitest.cc b/chromium_src/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/gcm/gcm_apitest.cc b/chromium_src/chrome/browser/extensions/api/gcm/gcm_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/gcm/gcm_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/history/history_apitest.cc b/chromium_src/chrome/browser/extensions/api/history/history_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/history/history_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/i18n/i18n_apitest.cc b/chromium_src/chrome/browser/extensions/api/i18n/i18n_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/i18n/i18n_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/identity/identity_apitest.cc b/chromium_src/chrome/browser/extensions/api/identity/identity_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/identity/identity_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc b/chromium_src/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc b/chromium_src/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/management/management_api_unittest.cc b/chromium_src/chrome/browser/extensions/api/management/management_api_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/management/management_api_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/management/management_apitest.cc b/chromium_src/chrome/browser/extensions/api/management/management_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/management/management_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc b/chromium_src/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc b/chromium_src/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc b/chromium_src/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/permissions/permissions_api_unittest.cc b/chromium_src/chrome/browser/extensions/api/permissions/permissions_api_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/permissions/permissions_api_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/preference/preference_apitest.cc b/chromium_src/chrome/browser/extensions/api/preference/preference_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/preference/preference_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc b/chromium_src/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/runtime/runtime_apitest.cc b/chromium_src/chrome/browser/extensions/api/runtime/runtime_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/runtime/runtime_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api_unittest.cc b/chromium_src/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/scripting/scripting_apitest.cc b/chromium_src/chrome/browser/extensions/api/scripting/scripting_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/scripting/scripting_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/search/search_api_apitest.cc b/chromium_src/chrome/browser/extensions/api/search/search_api_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/search/search_api_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/search/search_api_unittest.cc b/chromium_src/chrome/browser/extensions/api/search/search_api_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/search/search_api_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/socket/socket_apitest.cc b/chromium_src/chrome/browser/extensions/api/socket/socket_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/socket/socket_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc b/chromium_src/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/storage/storage_session_unittest.cc b/chromium_src/chrome/browser/extensions/api/storage/storage_session_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/storage/storage_session_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/tab_groups/tab_groups_api_unittest.cc b/chromium_src/chrome/browser/extensions/api/tab_groups/tab_groups_api_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/tab_groups/tab_groups_api_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/tabs/tabs_api_unittest.cc b/chromium_src/chrome/browser/extensions/api/tabs/tabs_api_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/tabs/tabs_api_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/tabs/tabs_test.cc b/chromium_src/chrome/browser/extensions/api/tabs/tabs_test.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/tabs/tabs_test.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chromium_src/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chromium_src/chrome/browser/extensions/api/web_request/web_request_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/web_request/web_request_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc b/chromium_src/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/webrtc_from_web_accessible_resource_browsertest.cc b/chromium_src/chrome/browser/extensions/api/webrtc_from_web_accessible_resource_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/webrtc_from_web_accessible_resource_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc b/chromium_src/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_browsertest.cc b/chromium_src/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/webstore_private/extension_install_status_unittest.cc b/chromium_src/chrome/browser/extensions/api/webstore_private/extension_install_status_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/webstore_private/extension_install_status_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chromium_src/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/api/webstore_private/webstore_private_unittest.cc b/chromium_src/chrome/browser/extensions/api/webstore_private/webstore_private_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/api/webstore_private/webstore_private_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/app_background_page_apitest.cc b/chromium_src/chrome/browser/extensions/app_background_page_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/app_background_page_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/app_process_apitest.cc b/chromium_src/chrome/browser/extensions/app_process_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/app_process_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/autoplay_browsertest.cc b/chromium_src/chrome/browser/extensions/autoplay_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/autoplay_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/blocklist_states_interaction_unittest.cc b/chromium_src/chrome/browser/extensions/blocklist_states_interaction_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/blocklist_states_interaction_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chromium_src/chrome/browser/extensions/chrome_app_api_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/chrome_app_api_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/chrome_app_icon_unittest.cc b/chromium_src/chrome/browser/extensions/chrome_app_icon_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/chrome_app_icon_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/chrome_content_verifier_unittest.cc b/chromium_src/chrome/browser/extensions/chrome_content_verifier_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/chrome_content_verifier_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/chrome_test_extension_loader_browsertest.cc b/chromium_src/chrome/browser/extensions/chrome_test_extension_loader_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/chrome_test_extension_loader_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/chrome_theme_url_browsertest.cc b/chromium_src/chrome/browser/extensions/chrome_theme_url_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/chrome_theme_url_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/component_loader_unittest.cc b/chromium_src/chrome/browser/extensions/component_loader_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/component_loader_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/content_capabilities_browsertest.cc b/chromium_src/chrome/browser/extensions/content_capabilities_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/content_capabilities_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/content_script_apitest.cc b/chromium_src/chrome/browser/extensions/content_script_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/content_script_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/content_verifier_browsertest.cc b/chromium_src/chrome/browser/extensions/content_verifier_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/content_verifier_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc b/chromium_src/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/crx_installer_browsertest.cc b/chromium_src/chrome/browser/extensions/crx_installer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/crx_installer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/default_apps_browsertest.cc b/chromium_src/chrome/browser/extensions/default_apps_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/default_apps_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/error_console/error_console_browsertest.cc b/chromium_src/chrome/browser/extensions/error_console/error_console_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/error_console/error_console_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/execute_script_apitest.cc b/chromium_src/chrome/browser/extensions/execute_script_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/execute_script_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_action_icon_factory_unittest.cc b/chromium_src/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_action_runner_browsertest.cc b/chromium_src/chrome/browser/extensions/extension_action_runner_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_action_runner_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_action_runner_unittest.cc b/chromium_src/chrome/browser/extensions/extension_action_runner_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_action_runner_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_allowlist_unittest.cc b/chromium_src/chrome/browser/extensions/extension_allowlist_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_allowlist_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_bindings_apitest.cc b/chromium_src/chrome/browser/extensions/extension_bindings_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_bindings_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chromium_src/chrome/browser/extensions/extension_context_menu_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_context_menu_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_context_menu_model_unittest.cc b/chromium_src/chrome/browser/extensions/extension_context_menu_model_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_context_menu_model_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_csp_bypass_browsertest.cc b/chromium_src/chrome/browser/extensions/extension_csp_bypass_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_csp_bypass_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chromium_src/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_dom_apitest.cc b/chromium_src/chrome/browser/extensions/extension_dom_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_dom_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_dom_clipboard_apitest.cc b/chromium_src/chrome/browser/extensions/extension_dom_clipboard_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_dom_clipboard_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_function_registration_test.cc b/chromium_src/chrome/browser/extensions/extension_function_registration_test.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_function_registration_test.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_functional_browsertest.cc b/chromium_src/chrome/browser/extensions/extension_functional_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_functional_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_garbage_collector_unittest.cc b/chromium_src/chrome/browser/extensions/extension_garbage_collector_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_garbage_collector_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chromium_src/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_incognito_apitest.cc b/chromium_src/chrome/browser/extensions/extension_incognito_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_incognito_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_install_prompt_unittest.cc b/chromium_src/chrome/browser/extensions/extension_install_prompt_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_install_prompt_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chromium_src/chrome/browser/extensions/extension_install_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_install_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_loading_browsertest.cc b/chromium_src/chrome/browser/extensions/extension_loading_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_loading_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chromium_src/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_messages_apitest.cc b/chromium_src/chrome/browser/extensions/extension_messages_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_messages_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_migrator_unittest.cc b/chromium_src/chrome/browser/extensions/extension_migrator_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_migrator_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_override_apitest.cc b/chromium_src/chrome/browser/extensions/extension_override_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_override_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_protocols_unittest.cc b/chromium_src/chrome/browser/extensions/extension_protocols_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_protocols_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chromium_src/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_samesite_cookies_browsertest.cc b/chromium_src/chrome/browser/extensions/extension_samesite_cookies_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_samesite_cookies_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_service_sync_unittest.cc b/chromium_src/chrome/browser/extensions/extension_service_sync_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_service_sync_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_service_unittest.cc b/chromium_src/chrome/browser/extensions/extension_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_startup_browsertest.cc b/chromium_src/chrome/browser/extensions/extension_startup_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_startup_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_tab_util_browsertest.cc b/chromium_src/chrome/browser/extensions/extension_tab_util_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_tab_util_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_tabs_apitest.cc b/chromium_src/chrome/browser/extensions/extension_tabs_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_tabs_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_unload_browsertest.cc b/chromium_src/chrome/browser/extensions/extension_unload_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_unload_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_url_rewrite_browsertest.cc b/chromium_src/chrome/browser/extensions/extension_url_rewrite_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_url_rewrite_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_web_ui_unittest.cc b/chromium_src/chrome/browser/extensions/extension_web_ui_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_web_ui_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/extension_webui_apitest.cc b/chromium_src/chrome/browser/extensions/extension_webui_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/extension_webui_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/external_policy_loader_unittest.cc b/chromium_src/chrome/browser/extensions/external_policy_loader_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/external_policy_loader_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/external_provider_impl_unittest.cc b/chromium_src/chrome/browser/extensions/external_provider_impl_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/external_provider_impl_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/fetch_apitest.cc b/chromium_src/chrome/browser/extensions/fetch_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/fetch_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/file_iframe_apitest.cc b/chromium_src/chrome/browser/extensions/file_iframe_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/file_iframe_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/gpu_browsertest.cc b/chromium_src/chrome/browser/extensions/gpu_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/gpu_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/install_verifier_unittest.cc b/chromium_src/chrome/browser/extensions/install_verifier_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/install_verifier_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/isolated_app_browsertest.cc b/chromium_src/chrome/browser/extensions/isolated_app_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/isolated_app_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/isolated_world_csp_browsertest.cc b/chromium_src/chrome/browser/extensions/isolated_world_csp_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/isolated_world_csp_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/lazy_background_page_apitest.cc b/chromium_src/chrome/browser/extensions/lazy_background_page_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/lazy_background_page_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/manifest_v3_browsertest.cc b/chromium_src/chrome/browser/extensions/manifest_v3_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/manifest_v3_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/native_bindings_apitest.cc b/chromium_src/chrome/browser/extensions/native_bindings_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/native_bindings_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/omaha_attributes_handler_unittest.cc b/chromium_src/chrome/browser/extensions/omaha_attributes_handler_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/omaha_attributes_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/options_page_apitest.cc b/chromium_src/chrome/browser/extensions/options_page_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/options_page_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/page_action_browsertest.cc b/chromium_src/chrome/browser/extensions/page_action_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/page_action_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/permission_message_combinations_unittest.cc b/chromium_src/chrome/browser/extensions/permission_message_combinations_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/permission_message_combinations_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/permission_messages_unittest.cc b/chromium_src/chrome/browser/extensions/permission_messages_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/permission_messages_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/preinstalled_apps_browsertest.cc b/chromium_src/chrome/browser/extensions/preinstalled_apps_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/preinstalled_apps_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/process_management_browsertest.cc b/chromium_src/chrome/browser/extensions/process_management_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/process_management_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/process_manager_browsertest.cc b/chromium_src/chrome/browser/extensions/process_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/process_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/protocol_handler_apitest.cc b/chromium_src/chrome/browser/extensions/protocol_handler_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/protocol_handler_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/safe_browsing_verdict_handler_unittest.cc b/chromium_src/chrome/browser/extensions/safe_browsing_verdict_handler_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/safe_browsing_verdict_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc b/chromium_src/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/service_worker_apitest.cc b/chromium_src/chrome/browser/extensions/service_worker_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/service_worker_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/service_worker_messaging_apitest.cc b/chromium_src/chrome/browser/extensions/service_worker_messaging_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/service_worker_messaging_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/shared_module_service_unittest.cc b/chromium_src/chrome/browser/extensions/shared_module_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/shared_module_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/startup_helper_browsertest.cc b/chromium_src/chrome/browser/extensions/startup_helper_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/startup_helper_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/stubs_apitest.cc b/chromium_src/chrome/browser/extensions/stubs_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/stubs_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/subscribe_page_action_browsertest.cc b/chromium_src/chrome/browser/extensions/subscribe_page_action_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/subscribe_page_action_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/tab_helper_unittest.cc b/chromium_src/chrome/browser/extensions/tab_helper_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/tab_helper_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/update_install_gate_unittest.cc b/chromium_src/chrome/browser/extensions/update_install_gate_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/update_install_gate_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chromium_src/chrome/browser/extensions/updater/extension_updater_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/updater/extension_updater_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/updater/update_service_browsertest.cc b/chromium_src/chrome/browser/extensions/updater/update_service_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/updater/update_service_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/user_script_listener_browsertest.cc b/chromium_src/chrome/browser/extensions/user_script_listener_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/user_script_listener_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/user_script_listener_unittest.cc b/chromium_src/chrome/browser/extensions/user_script_listener_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/user_script_listener_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/extensions/wake_event_page_apitest.cc b/chromium_src/chrome/browser/extensions/wake_event_page_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/wake_event_page_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/webstore_installer_browsertest.cc b/chromium_src/chrome/browser/extensions/webstore_installer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/webstore_installer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/webstore_installer_unittest.cc b/chromium_src/chrome/browser/extensions/webstore_installer_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/webstore_installer_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/webstore_reinstaller_browsertest.cc b/chromium_src/chrome/browser/extensions/webstore_reinstaller_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/webstore_reinstaller_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/window_open_apitest.cc b/chromium_src/chrome/browser/extensions/window_open_apitest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/extensions/window_open_apitest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/extensions/zipfile_installer_unittest.cc b/chromium_src/chrome/browser/extensions/zipfile_installer_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/extensions/zipfile_installer_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/external_protocol/external_protocol_handler_browsertest.cc b/chromium_src/chrome/browser/external_protocol/external_protocol_handler_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/external_protocol/external_protocol_handler_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/favicon/content_favicon_driver_browsertest.cc b/chromium_src/chrome/browser/favicon/content_favicon_driver_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/favicon/content_favicon_driver_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/federated_learning/floc_eligibility_browsertest.cc b/chromium_src/chrome/browser/federated_learning/floc_eligibility_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/federated_learning/floc_eligibility_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/federated_learning/floc_event_logger_unittest.cc b/chromium_src/chrome/browser/federated_learning/floc_event_logger_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/federated_learning/floc_event_logger_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/federated_learning/floc_id_provider_browsertest.cc b/chromium_src/chrome/browser/federated_learning/floc_id_provider_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/federated_learning/floc_id_provider_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/federated_learning/floc_id_provider_unittest.cc b/chromium_src/chrome/browser/federated_learning/floc_id_provider_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/federated_learning/floc_id_provider_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/file_system_access/chrome_file_system_access_permission_context_browsertest.cc b/chromium_src/chrome/browser/file_system_access/chrome_file_system_access_permission_context_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/file_system_access/chrome_file_system_access_permission_context_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/first_run/first_run_browsertest.cc b/chromium_src/chrome/browser/first_run/first_run_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/first_run/first_run_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/first_run/first_run_internal_posix_browsertest.cc b/chromium_src/chrome/browser/first_run/first_run_internal_posix_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/first_run/first_run_internal_posix_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/gcm/gcm_profile_service_unittest.cc b/chromium_src/chrome/browser/gcm/gcm_profile_service_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/gcm/gcm_profile_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/geolocation/geolocation_browsertest.cc b/chromium_src/chrome/browser/geolocation/geolocation_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/geolocation/geolocation_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/geolocation/geolocation_permission_context_delegate_unittest.cc b/chromium_src/chrome/browser/geolocation/geolocation_permission_context_delegate_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/geolocation/geolocation_permission_context_delegate_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/history/history_browsertest.cc b/chromium_src/chrome/browser/history/history_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/history/history_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/image_fetcher/image_fetcher_impl_browsertest.cc b/chromium_src/chrome/browser/image_fetcher/image_fetcher_impl_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/image_fetcher/image_fetcher_impl_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/infobars/infobars_browsertest.cc b/chromium_src/chrome/browser/infobars/infobars_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/infobars/infobars_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/installable/installable_manager_browsertest.cc b/chromium_src/chrome/browser/installable/installable_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/installable/installable_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/interest_group/interest_group_permissions_browsertest.cc b/chromium_src/chrome/browser/interest_group/interest_group_permissions_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/interest_group/interest_group_permissions_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/lazyload/lazyload_browsertest.cc b/chromium_src/chrome/browser/lazyload/lazyload_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/lazyload/lazyload_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chromium_src/chrome/browser/lifetime/browser_close_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/lifetime/browser_close_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/login_detection/password_store_sites_browsertest.cc b/chromium_src/chrome/browser/login_detection/password_store_sites_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/login_detection/password_store_sites_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/lookalikes/lookalike_url_navigation_throttle_browsertest.cc b/chromium_src/chrome/browser/lookalikes/lookalike_url_navigation_throttle_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/lookalikes/lookalike_url_navigation_throttle_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/cast_mirroring_performance_browsertest.cc b/chromium_src/chrome/browser/media/cast_mirroring_performance_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/cast_mirroring_performance_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/encrypted_media_browsertest.cc b/chromium_src/chrome/browser/media/encrypted_media_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/encrypted_media_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/encrypted_media_supported_types_browsertest.cc b/chromium_src/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/feeds/media_feeds_browsertest.cc b/chromium_src/chrome/browser/media/feeds/media_feeds_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/feeds/media_feeds_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/history/media_history_browsertest.cc b/chromium_src/chrome/browser/media/history/media_history_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/history/media_history_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/media_engagement_autoplay_browsertest.cc b/chromium_src/chrome/browser/media/media_engagement_autoplay_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/media_engagement_autoplay_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/media_engagement_browsertest.cc b/chromium_src/chrome/browser/media/media_engagement_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/media_engagement_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/router/media_router_feature_unittest.cc b/chromium_src/chrome/browser/media/router/media_router_feature_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/media/router/media_router_feature_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/media/unified_autoplay_browsertest.cc b/chromium_src/chrome/browser/media/unified_autoplay_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/unified_autoplay_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/webrtc/capture_handle_browsertest.cc b/chromium_src/chrome/browser/media/webrtc/capture_handle_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/webrtc/capture_handle_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/webrtc/conditional_focus_browsertest.cc b/chromium_src/chrome/browser/media/webrtc/conditional_focus_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/webrtc/conditional_focus_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/webrtc/current_tab_desktop_media_list_unittest.cc b/chromium_src/chrome/browser/media/webrtc/current_tab_desktop_media_list_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/webrtc/current_tab_desktop_media_list_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc b/chromium_src/chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/webrtc/media_stream_focus_delegate_unittest.cc b/chromium_src/chrome/browser/media/webrtc/media_stream_focus_delegate_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/webrtc/media_stream_focus_delegate_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/webrtc/media_stream_permission_browsertest.cc b/chromium_src/chrome/browser/media/webrtc/media_stream_permission_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/webrtc/media_stream_permission_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/webrtc/tab_desktop_media_list_unittest.cc b/chromium_src/chrome/browser/media/webrtc/tab_desktop_media_list_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/media/webrtc/tab_desktop_media_list_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/media/webrtc/webrtc_browsertest.cc b/chromium_src/chrome/browser/media/webrtc/webrtc_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/webrtc/webrtc_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/webrtc/webrtc_desktop_capture_browsertest.cc b/chromium_src/chrome/browser/media/webrtc/webrtc_desktop_capture_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/webrtc/webrtc_desktop_capture_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/webrtc/webrtc_disable_encryption_flag_browsertest.cc b/chromium_src/chrome/browser/media/webrtc/webrtc_disable_encryption_flag_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/webrtc/webrtc_disable_encryption_flag_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/webrtc/webrtc_event_log_uploader_impl_unittest.cc b/chromium_src/chrome/browser/media/webrtc/webrtc_event_log_uploader_impl_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/media/webrtc/webrtc_event_log_uploader_impl_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/media/webrtc/webrtc_getdisplaymedia_browsertest.cc b/chromium_src/chrome/browser/media/webrtc/webrtc_getdisplaymedia_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/webrtc/webrtc_getdisplaymedia_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/webrtc/webrtc_getmediadevices_browsertest.cc b/chromium_src/chrome/browser/media/webrtc/webrtc_getmediadevices_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/webrtc/webrtc_getmediadevices_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media/webrtc/webrtc_pan_tilt_zoom_browsertest.cc b/chromium_src/chrome/browser/media/webrtc/webrtc_pan_tilt_zoom_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/media/webrtc/webrtc_pan_tilt_zoom_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc b/chromium_src/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chromium_src/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc b/chromium_src/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc b/chromium_src/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/metrics/chrome_metrics_services_manager_client_unittest.cc b/chromium_src/chrome/browser/metrics/chrome_metrics_services_manager_client_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/metrics/chrome_metrics_services_manager_client_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/metrics/cloned_install_client_id_reset_browsertest.cc b/chromium_src/chrome/browser/metrics/cloned_install_client_id_reset_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/metrics/cloned_install_client_id_reset_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc b/chromium_src/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/metrics/extensions_metrics_provider_unittest.cc b/chromium_src/chrome/browser/metrics/extensions_metrics_provider_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/metrics/extensions_metrics_provider_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/metrics/metrics_service_browsertest.cc b/chromium_src/chrome/browser/metrics/metrics_service_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/metrics/metrics_service_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/metrics/metrics_service_user_demographics_browsertest.cc b/chromium_src/chrome/browser/metrics/metrics_service_user_demographics_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/metrics/metrics_service_user_demographics_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/metrics/process_memory_metrics_emitter_browsertest.cc b/chromium_src/chrome/browser/metrics/process_memory_metrics_emitter_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/metrics/process_memory_metrics_emitter_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/metrics/tab_stats/tab_stats_tracker_unittest.cc b/chromium_src/chrome/browser/metrics/tab_stats/tab_stats_tracker_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/metrics/tab_stats/tab_stats_tracker_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/metrics/ukm_browsertest.cc b/chromium_src/chrome/browser/metrics/ukm_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/metrics/ukm_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/metrics/usage_scenario/tab_usage_scenario_tracker_browsertest.cc b/chromium_src/chrome/browser/metrics/usage_scenario/tab_usage_scenario_tracker_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/metrics/usage_scenario/tab_usage_scenario_tracker_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/metrics/variations/variations_http_headers_browsertest.cc b/chromium_src/chrome/browser/metrics/variations/variations_http_headers_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/metrics/variations/variations_http_headers_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/metrics/variations/variations_safe_mode_browsertest.cc b/chromium_src/chrome/browser/metrics/variations/variations_safe_mode_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/metrics/variations/variations_safe_mode_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/navigation_predictor/navigation_predictor_browsertest.cc b/chromium_src/chrome/browser/navigation_predictor/navigation_predictor_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/navigation_predictor/navigation_predictor_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client_browsertest.cc b/chromium_src/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/navigation_predictor/search_engine_preconnector_browsertest.cc b/chromium_src/chrome/browser/navigation_predictor/search_engine_preconnector_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/navigation_predictor/search_engine_preconnector_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc b/chromium_src/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/cookie_policy_browsertest.cc b/chromium_src/chrome/browser/net/cookie_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/cookie_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/dns_probe_browsertest.cc b/chromium_src/chrome/browser/net/dns_probe_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/dns_probe_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/errorpage_browsertest.cc b/chromium_src/chrome/browser/net/errorpage_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/errorpage_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/explicitly_allowed_network_ports_browsertest.cc b/chromium_src/chrome/browser/net/explicitly_allowed_network_ports_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/explicitly_allowed_network_ports_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/ftp_browsertest.cc b/chromium_src/chrome/browser/net/ftp_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/ftp_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/load_timing_browsertest.cc b/chromium_src/chrome/browser/net/load_timing_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/load_timing_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/net_error_tab_helper_browsertest.cc b/chromium_src/chrome/browser/net/net_error_tab_helper_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/net_error_tab_helper_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/net_error_tab_helper_unittest.cc b/chromium_src/chrome/browser/net/net_error_tab_helper_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/net/net_error_tab_helper_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/net/network_context_configuration_browsertest.cc b/chromium_src/chrome/browser/net/network_context_configuration_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/network_context_configuration_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/network_request_metrics_browsertest.cc b/chromium_src/chrome/browser/net/network_request_metrics_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/network_request_metrics_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/private_network_access_browsertest.cc b/chromium_src/chrome/browser/net/private_network_access_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/private_network_access_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/proxy_browsertest.cc b/chromium_src/chrome/browser/net/proxy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/proxy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/reporting_browsertest.cc b/chromium_src/chrome/browser/net/reporting_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/reporting_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/stub_resolver_config_reader_unittest.cc b/chromium_src/chrome/browser/net/stub_resolver_config_reader_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/stub_resolver_config_reader_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/net/websocket_browsertest.cc b/chromium_src/chrome/browser/net/websocket_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/net/websocket_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/new_tab_page/chrome_colors/chrome_colors_service_unittest.cc b/chromium_src/chrome/browser/new_tab_page/chrome_colors/chrome_colors_service_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/new_tab_page/chrome_colors/chrome_colors_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/notifications/notification_permission_context_unittest.cc b/chromium_src/chrome/browser/notifications/notification_permission_context_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/notifications/notification_permission_context_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/notifications/win/notification_helper_launches_chrome_unittest.cc b/chromium_src/chrome/browser/notifications/win/notification_helper_launches_chrome_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/notifications/win/notification_helper_launches_chrome_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/optimization_guide/blink/blink_optimization_guide_browsertest.cc b/chromium_src/chrome/browser/optimization_guide/blink/blink_optimization_guide_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/optimization_guide/blink/blink_optimization_guide_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc b/chromium_src/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/optimization_guide/optimization_guide_tab_url_provider_unittest.cc b/chromium_src/chrome/browser/optimization_guide/optimization_guide_tab_url_provider_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/optimization_guide/optimization_guide_tab_url_provider_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/optimization_guide/page_text_observer_browsertest.cc b/chromium_src/chrome/browser/optimization_guide/page_text_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/optimization_guide/page_text_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/optimization_guide/prediction/prediction_manager_browsertest.cc b/chromium_src/chrome/browser/optimization_guide/prediction/prediction_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/optimization_guide/prediction/prediction_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/optimization_guide/prediction/prediction_manager_unittest.cc b/chromium_src/chrome/browser/optimization_guide/prediction/prediction_manager_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/optimization_guide/prediction/prediction_manager_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/page_load_metrics/integration_tests/smoothness_metric_browsertest.cc b/chromium_src/chrome/browser/page_load_metrics/integration_tests/smoothness_metric_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/page_load_metrics/integration_tests/smoothness_metric_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_browsertest.cc b/chromium_src/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/page_load_metrics/observers/back_forward_cache_page_load_metrics_observer_browsertest.cc b/chromium_src/chrome/browser/page_load_metrics/observers/back_forward_cache_page_load_metrics_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/page_load_metrics/observers/back_forward_cache_page_load_metrics_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer_browsertest.cc b/chromium_src/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/page_load_metrics/observers/core/ukm_page_load_metrics_observer_unittest.cc b/chromium_src/chrome/browser/page_load_metrics/observers/core/ukm_page_load_metrics_observer_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/page_load_metrics/observers/core/ukm_page_load_metrics_observer_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/page_load_metrics/observers/data_saver_site_breakdown_metrics_observer_browsertest.cc b/chromium_src/chrome/browser/page_load_metrics/observers/data_saver_site_breakdown_metrics_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/page_load_metrics/observers/data_saver_site_breakdown_metrics_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/page_load_metrics/observers/javascript_frameworks_ukm_observer_browsertest.cc b/chromium_src/chrome/browser/page_load_metrics/observers/javascript_frameworks_ukm_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/page_load_metrics/observers/javascript_frameworks_ukm_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/page_load_metrics/observers/live_tab_count_page_load_metrics_observer_browsertest.cc b/chromium_src/chrome/browser/page_load_metrics/observers/live_tab_count_page_load_metrics_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/page_load_metrics/observers/live_tab_count_page_load_metrics_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc b/chromium_src/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/page_load_metrics/observers/third_party_metrics_observer_browsertest.cc b/chromium_src/chrome/browser/page_load_metrics/observers/third_party_metrics_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/page_load_metrics/observers/third_party_metrics_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/page_load_metrics/observers/use_counter_page_load_metrics_observer_browsertest.cc b/chromium_src/chrome/browser/page_load_metrics/observers/use_counter_page_load_metrics_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/page_load_metrics/observers/use_counter_page_load_metrics_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc b/chromium_src/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/password_manager/credential_manager_browsertest.cc b/chromium_src/chrome/browser/password_manager/credential_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/password_manager/credential_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/password_manager/multi_profile_credentials_filter_unittest.cc b/chromium_src/chrome/browser/password_manager/multi_profile_credentials_filter_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/password_manager/multi_profile_credentials_filter_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/password_manager/password_manager_browsertest.cc b/chromium_src/chrome/browser/password_manager/password_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/password_manager/password_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/payments/abort_payment_handler_browsertest.cc b/chromium_src/chrome/browser/payments/abort_payment_handler_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/payments/abort_payment_handler_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/payments/colocated_payment_manifests_browsertest.cc b/chromium_src/chrome/browser/payments/colocated_payment_manifests_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/payments/colocated_payment_manifests_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/payments/ignore_payment_method_browsertest.cc b/chromium_src/chrome/browser/payments/ignore_payment_method_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/payments/ignore_payment_method_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/payments/load_and_remove_iframe_with_many_payment_requests_browsertest.cc b/chromium_src/chrome/browser/payments/load_and_remove_iframe_with_many_payment_requests_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/payments/load_and_remove_iframe_with_many_payment_requests_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/payments/payment_handler_capabilities_browsertest.cc b/chromium_src/chrome/browser/payments/payment_handler_capabilities_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/payments/payment_handler_capabilities_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/payments/payment_handler_enforce_full_delegation_browsertest.cc b/chromium_src/chrome/browser/payments/payment_handler_enforce_full_delegation_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/payments/payment_handler_enforce_full_delegation_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/payments/payment_request_can_make_payment_browsertest.cc b/chromium_src/chrome/browser/payments/payment_request_can_make_payment_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/payments/payment_request_can_make_payment_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/payments/payment_request_can_make_payment_event_browsertest.cc b/chromium_src/chrome/browser/payments/payment_request_can_make_payment_event_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/payments/payment_request_can_make_payment_event_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/payments/payment_request_minimal_ui_browsertest.cc b/chromium_src/chrome/browser/payments/payment_request_minimal_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/payments/payment_request_minimal_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/payments/secure_payment_confirmation_browsertest.cc b/chromium_src/chrome/browser/payments/secure_payment_confirmation_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/payments/secure_payment_confirmation_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc b/chromium_src/chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/pdf/pdf_extension_test.cc b/chromium_src/chrome/browser/pdf/pdf_extension_test.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/pdf/pdf_extension_test.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/performance_manager/background_tab_loading_policy_browsertest.cc b/chromium_src/chrome/browser/performance_manager/background_tab_loading_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/performance_manager/background_tab_loading_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/performance_manager/frame_node_impl_browsertest.cc b/chromium_src/chrome/browser/performance_manager/frame_node_impl_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/performance_manager/frame_node_impl_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/performance_manager/mechanisms/page_freezer_unittest.cc b/chromium_src/chrome/browser/performance_manager/mechanisms/page_freezer_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/performance_manager/mechanisms/page_freezer_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/performance_manager/page_load_tracker_decorator_browsertest.cc b/chromium_src/chrome/browser/performance_manager/page_load_tracker_decorator_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/performance_manager/page_load_tracker_decorator_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/performance_manager/policies/bfcache_policy_browsertest.cc b/chromium_src/chrome/browser/performance_manager/policies/bfcache_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/performance_manager/policies/bfcache_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/permissions/chrome_permission_request_manager_unittest.cc b/chromium_src/chrome/browser/permissions/chrome_permission_request_manager_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/permissions/chrome_permission_request_manager_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/permissions/permission_manager_browsertest.cc b/chromium_src/chrome/browser/permissions/permission_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/permissions/permission_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/permissions/permission_request_manager_browsertest.cc b/chromium_src/chrome/browser/permissions/permission_request_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/permissions/permission_request_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/picture_in_picture/picture_in_picture_window_controller_browsertest.cc b/chromium_src/chrome/browser/picture_in_picture/picture_in_picture_window_controller_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/picture_in_picture/picture_in_picture_window_controller_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/certificate_transparency_policy_browsertest.cc b/chromium_src/chrome/browser/policy/certificate_transparency_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/certificate_transparency_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/cloud/chrome_browser_cloud_management_browsertest.cc b/chromium_src/chrome/browser/policy/cloud/chrome_browser_cloud_management_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/cloud/chrome_browser_cloud_management_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc b/chromium_src/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/cloud/user_policy_signin_service_browsertest.cc b/chromium_src/chrome/browser/policy/cloud/user_policy_signin_service_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/cloud/user_policy_signin_service_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/component_updater_policy_browsertest.cc b/chromium_src/chrome/browser/policy/component_updater_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/component_updater_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/content_settings_policy_browsertest.cc b/chromium_src/chrome/browser/policy/content_settings_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/content_settings_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/developer_tools_policy_browsertest.cc b/chromium_src/chrome/browser/policy/developer_tools_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/developer_tools_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/extension_policy_browsertest.cc b/chromium_src/chrome/browser/policy/extension_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/extension_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/force_google_safe_search_policy_browsertest.cc b/chromium_src/chrome/browser/policy/force_google_safe_search_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/force_google_safe_search_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/hide_webstore_icon_policy_browsertest.cc b/chromium_src/chrome/browser/policy/hide_webstore_icon_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/hide_webstore_icon_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/policy_browsertest.cc b/chromium_src/chrome/browser/policy/policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/policy_prefs_browsertest.cc b/chromium_src/chrome/browser/policy/policy_prefs_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/policy_prefs_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/policy_test_google_browsertest.cc b/chromium_src/chrome/browser/policy/policy_test_google_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/policy_test_google_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/restore_on_startup_policy_browsertest.cc b/chromium_src/chrome/browser/policy/restore_on_startup_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/restore_on_startup_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/safe_browsing_policy_browsertest.cc b/chromium_src/chrome/browser/policy/safe_browsing_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/safe_browsing_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/signed_exchange_browsertest.cc b/chromium_src/chrome/browser/policy/signed_exchange_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/signed_exchange_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/test/component_updater_policy_browsertest.cc b/chromium_src/chrome/browser/policy/test/component_updater_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/test/component_updater_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/test/content_settings_policy_browsertest.cc b/chromium_src/chrome/browser/policy/test/content_settings_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/test/content_settings_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/test/hide_webstore_icon_policy_browsertest.cc b/chromium_src/chrome/browser/policy/test/hide_webstore_icon_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/test/hide_webstore_icon_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/test/locale_policy_browsertest.cc b/chromium_src/chrome/browser/policy/test/locale_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/test/locale_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/test/network_prediction_policy_browsertest.cc b/chromium_src/chrome/browser/policy/test/network_prediction_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/test/network_prediction_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/test/policy_browsertest.cc b/chromium_src/chrome/browser/policy/test/policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/test/policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/test/promotional_tabs_enabled_policy_browsertest.cc b/chromium_src/chrome/browser/policy/test/promotional_tabs_enabled_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/test/promotional_tabs_enabled_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/test/restore_on_startup_policy_browsertest.cc b/chromium_src/chrome/browser/policy/test/restore_on_startup_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/test/restore_on_startup_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/test/safe_browsing_policy_browsertest.cc b/chromium_src/chrome/browser/policy/test/safe_browsing_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/test/safe_browsing_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/test/signed_exchange_browsertest.cc b/chromium_src/chrome/browser/policy/test/signed_exchange_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/test/signed_exchange_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/policy/url_blacklist_policy_browsertest.cc b/chromium_src/chrome/browser/policy/url_blacklist_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/policy/url_blacklist_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/portal/portal_browsertest.cc b/chromium_src/chrome/browser/portal/portal_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/portal/portal_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/portal/portal_recently_audible_browsertest.cc b/chromium_src/chrome/browser/portal/portal_recently_audible_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/portal/portal_recently_audible_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/predictors/loading_predictor_browsertest.cc b/chromium_src/chrome/browser/predictors/loading_predictor_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/predictors/loading_predictor_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc b/chromium_src/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/prefetch/no_state_prefetch/prerender_unittest.cc b/chromium_src/chrome/browser/prefetch/no_state_prefetch/prerender_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/prefetch/no_state_prefetch/prerender_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/prefetch/prefetch_browsertest.cc b/chromium_src/chrome/browser/prefetch/prefetch_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/prefetch/prefetch_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_browsertest.cc b/chromium_src/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_tab_helper_unittest.cc b/chromium_src/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_tab_helper_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_tab_helper_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/prefetch/search_prefetch/search_prefetch_service_browsertest.cc b/chromium_src/chrome/browser/prefetch/search_prefetch/search_prefetch_service_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/prefetch/search_prefetch/search_prefetch_service_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/prefs/pref_functional_browsertest.cc b/chromium_src/chrome/browser/prefs/pref_functional_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/prefs/pref_functional_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/previews/defer_all_script_browsertest.cc b/chromium_src/chrome/browser/previews/defer_all_script_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/previews/defer_all_script_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/previews/defer_all_script_priority_browsertest.cc b/chromium_src/chrome/browser/previews/defer_all_script_priority_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/previews/defer_all_script_priority_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/previews/lazyload_browsertest.cc b/chromium_src/chrome/browser/previews/lazyload_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/previews/lazyload_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc b/chromium_src/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/printing/print_browsertest.cc b/chromium_src/chrome/browser/printing/print_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/printing/print_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc b/chromium_src/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/printing/print_preview_dialog_controller_unittest.cc b/chromium_src/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/printing/print_view_manager_unittest.cc b/chromium_src/chrome/browser/printing/print_view_manager_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/printing/print_view_manager_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/privacy/privacy_metrics_service_unittest.cc b/chromium_src/chrome/browser/privacy/privacy_metrics_service_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/privacy/privacy_metrics_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/privacy_budget/privacy_budget_browsertest.cc b/chromium_src/chrome/browser/privacy_budget/privacy_budget_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/privacy_budget/privacy_budget_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_browsertest.cc b/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_settings_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chromium_src/chrome/browser/profile_resetter/profile_resetter_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/profile_resetter/profile_resetter_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/profiles/gaia_info_update_service_unittest.cc b/chromium_src/chrome/browser/profiles/gaia_info_update_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/profiles/gaia_info_update_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/profiles/profile_attributes_storage_unittest.cc b/chromium_src/chrome/browser/profiles/profile_attributes_storage_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/profiles/profile_attributes_storage_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/profiles/profile_browsertest.cc b/chromium_src/chrome/browser/profiles/profile_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/profiles/profile_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/profiles/profile_info_cache_unittest.cc b/chromium_src/chrome/browser/profiles/profile_info_cache_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/profiles/profile_info_cache_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/profiles/profile_list_desktop_browsertest.cc b/chromium_src/chrome/browser/profiles/profile_list_desktop_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/profiles/profile_list_desktop_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/profiles/profile_list_desktop_unittest.cc b/chromium_src/chrome/browser/profiles/profile_list_desktop_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/profiles/profile_list_desktop_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/profiles/profile_manager_browsertest.cc b/chromium_src/chrome/browser/profiles/profile_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/profiles/profile_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/profiles/profile_manager_unittest.cc b/chromium_src/chrome/browser/profiles/profile_manager_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/profiles/profile_manager_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc b/chromium_src/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/profiles/profile_shortcut_manager_browsertest_win.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/profiles/profile_theme_update_service_browsertest.cc b/chromium_src/chrome/browser/profiles/profile_theme_update_service_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/profiles/profile_theme_update_service_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/profiles/profile_window_browsertest.cc b/chromium_src/chrome/browser/profiles/profile_window_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/profiles/profile_window_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/profiling_host/memlog_browsertest.cc b/chromium_src/chrome/browser/profiling_host/memlog_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/profiling_host/memlog_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/push_messaging/push_messaging_browsertest.cc b/chromium_src/chrome/browser/push_messaging/push_messaging_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/push_messaging/push_messaging_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/referrer_policy_browsertest.cc b/chromium_src/chrome/browser/referrer_policy_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/referrer_policy_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer_browsertest.cc b/chromium_src/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc b/chromium_src/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/renderer_context_menu/spelling_options_submenu_observer_browsertest.cc b/chromium_src/chrome/browser/renderer_context_menu/spelling_options_submenu_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/renderer_context_menu/spelling_options_submenu_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc b/chromium_src/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/resource_coordinator/tab_activity_watcher_unittest.cc b/chromium_src/chrome/browser/resource_coordinator/tab_activity_watcher_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/resource_coordinator/tab_activity_watcher_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/resource_coordinator/tab_load_tracker_unittest.cc b/chromium_src/chrome/browser/resource_coordinator/tab_load_tracker_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/resource_coordinator/tab_load_tracker_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/resource_coordinator/tab_manager_browsertest.cc b/chromium_src/chrome/browser/resource_coordinator/tab_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/resource_coordinator/tab_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/resource_coordinator/tab_manager_unittest.cc b/chromium_src/chrome/browser/resource_coordinator/tab_manager_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/resource_coordinator/tab_manager_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/resource_coordinator/tab_metrics_logger_unittest.cc b/chromium_src/chrome/browser/resource_coordinator/tab_metrics_logger_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/resource_coordinator/tab_metrics_logger_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc b/chromium_src/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/chrome_client_side_detection_host_delegate_unittest.cc b/chromium_src/chrome/browser/safe_browsing/chrome_client_side_detection_host_delegate_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/chrome_client_side_detection_host_delegate_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service_unittest.cc b/chromium_src/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc b/chromium_src/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc b/chromium_src/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc b/chromium_src/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/chrome_user_population_helper_unittest.cc b/chromium_src/chrome/browser/safe_browsing/chrome_user_population_helper_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/chrome_user_population_helper_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chromium_src/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_unittest.cc b/chromium_src/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/download_protection/deep_scanning_browsertest.cc b/chromium_src/chrome/browser/safe_browsing/download_protection/deep_scanning_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/download_protection/deep_scanning_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/download_protection/download_protection_service_browsertest.cc b/chromium_src/chrome/browser/safe_browsing/download_protection/download_protection_service_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/download_protection/download_protection_service_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc b/chromium_src/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/download_protection/download_request_maker_unittest.cc b/chromium_src/chrome/browser/safe_browsing/download_protection/download_request_maker_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/download_protection/download_request_maker_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/incident_reporting/platform_state_store_win_unittest.cc b/chromium_src/chrome/browser/safe_browsing/incident_reporting/platform_state_store_win_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/incident_reporting/platform_state_store_win_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chromium_src/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc b/chromium_src/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/safe_browsing_navigation_observer_unittest.cc b/chromium_src/chrome/browser/safe_browsing/safe_browsing_navigation_observer_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/safe_browsing_navigation_observer_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_unittest.cc b/chromium_src/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/search/chrome_colors/chrome_colors_service_unittest.cc b/chromium_src/chrome/browser/search/chrome_colors/chrome_colors_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/search/chrome_colors/chrome_colors_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/search/instant_service_unittest.cc b/chromium_src/chrome/browser/search/instant_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/search/instant_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/search/local_ntp_navigation_browsertest.cc b/chromium_src/chrome/browser/search/local_ntp_navigation_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/search/local_ntp_navigation_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/search/promos/promo_service_unittest.cc b/chromium_src/chrome/browser/search/promos/promo_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/search/promos/promo_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/search/search_engine_base_url_tracker_unittest.cc b/chromium_src/chrome/browser/search/search_engine_base_url_tracker_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/search/search_engine_base_url_tracker_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/search/search_unittest.cc b/chromium_src/chrome/browser/search/search_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/search/search_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/search_engines/template_url_scraper_browsertest.cc b/chromium_src/chrome/browser/search_engines/template_url_scraper_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/search_engines/template_url_scraper_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chromium_src/chrome/browser/search_engines/template_url_service_sync_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/search_engines/template_url_service_sync_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/search_engines/template_url_service_unittest.cc b/chromium_src/chrome/browser/search_engines/template_url_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/search_engines/template_url_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/send_tab_to_self/desktop_notification_handler_unittest.cc b/chromium_src/chrome/browser/send_tab_to_self/desktop_notification_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/send_tab_to_self/desktop_notification_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/send_tab_to_self/send_tab_to_self_desktop_util_unittest.cc b/chromium_src/chrome/browser/send_tab_to_self/send_tab_to_self_desktop_util_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/send_tab_to_self/send_tab_to_self_desktop_util_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/send_tab_to_self/send_tab_to_self_util_unittest.cc b/chromium_src/chrome/browser/send_tab_to_self/send_tab_to_self_util_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/send_tab_to_self/send_tab_to_self_util_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/sessions/better_session_restore_browsertest.cc b/chromium_src/chrome/browser/sessions/better_session_restore_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/sessions/better_session_restore_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/sessions/closed_tab_cache_browsertest.cc b/chromium_src/chrome/browser/sessions/closed_tab_cache_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/sessions/closed_tab_cache_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/sessions/exit_type_service_browsertest.cc b/chromium_src/chrome/browser/sessions/exit_type_service_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/sessions/exit_type_service_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/sessions/session_restore_browsertest.cc b/chromium_src/chrome/browser/sessions/session_restore_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/sessions/session_restore_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/sessions/session_restore_observer_browsertest.cc b/chromium_src/chrome/browser/sessions/session_restore_observer_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/sessions/session_restore_observer_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/sessions/session_service_unittest.cc b/chromium_src/chrome/browser/sessions/session_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/sessions/session_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/sessions/tab_loader_unittest.cc b/chromium_src/chrome/browser/sessions/tab_loader_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/sessions/tab_loader_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/sessions/tab_restore_browsertest.cc b/chromium_src/chrome/browser/sessions/tab_restore_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/sessions/tab_restore_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc b/chromium_src/chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/shell_integration_linux_unittest.cc b/chromium_src/chrome/browser/shell_integration_linux_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/shell_integration_linux_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/signin/dice_browsertest.cc b/chromium_src/chrome/browser/signin/dice_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/signin/dice_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/signin/dice_web_signin_interceptor_browsertest.cc b/chromium_src/chrome/browser/signin/dice_web_signin_interceptor_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/signin/dice_web_signin_interceptor_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/signin/dice_web_signin_interceptor_unittest.cc b/chromium_src/chrome/browser/signin/dice_web_signin_interceptor_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/signin/dice_web_signin_interceptor_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/signin/process_dice_header_delegate_impl_unittest.cc b/chromium_src/chrome/browser/signin/process_dice_header_delegate_impl_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/signin/process_dice_header_delegate_impl_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/signin/remove_local_account_browsertest.cc b/chromium_src/chrome/browser/signin/remove_local_account_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/signin/remove_local_account_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/signin/signin_manager_unittest.cc b/chromium_src/chrome/browser/signin/signin_manager_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/signin/signin_manager_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/signin/signin_ui_util_unittest.cc b/chromium_src/chrome/browser/signin/signin_ui_util_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/signin/signin_ui_util_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/signin/signin_util_win_browsertest.cc b/chromium_src/chrome/browser/signin/signin_util_win_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/signin/signin_util_win_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc b/chromium_src/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/site_isolation/site_details_browsertest.cc b/chromium_src/chrome/browser/site_isolation/site_details_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/site_isolation/site_details_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/spellchecker/spellcheck_service_browsertest.cc b/chromium_src/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc b/chromium_src/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ssl/crlset_browsertest.cc b/chromium_src/chrome/browser/ssl/crlset_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ssl/crlset_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ssl/known_interception_disclosure_infobar_browsertest.cc b/chromium_src/chrome/browser/ssl/known_interception_disclosure_infobar_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ssl/known_interception_disclosure_infobar_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ssl/known_interception_disclosure_ui_browsertest.cc b/chromium_src/chrome/browser/ssl/known_interception_disclosure_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ssl/known_interception_disclosure_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ssl/security_state_tab_helper_browsertest.cc b/chromium_src/chrome/browser/ssl/security_state_tab_helper_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ssl/security_state_tab_helper_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ssl/ssl_browsertest.cc b/chromium_src/chrome/browser/ssl/ssl_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ssl/ssl_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc b/chromium_src/chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/storage/durable_storage_browsertest.cc b/chromium_src/chrome/browser/storage/durable_storage_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/storage/durable_storage_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/storage/durable_storage_permission_context_unittest.cc b/chromium_src/chrome/browser/storage/durable_storage_permission_context_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/storage/durable_storage_permission_context_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/storage_access_api/api_browsertest.cc b/chromium_src/chrome/browser/storage_access_api/api_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/storage_access_api/api_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/storage_access_api/storage_access_grant_permission_context_unittest.cc b/chromium_src/chrome/browser/storage_access_api/storage_access_grant_permission_context_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/storage_access_api/storage_access_grant_permission_context_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/subresource_filter/ad_tagging_browsertest.cc b/chromium_src/chrome/browser/subresource_filter/ad_tagging_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/subresource_filter/ad_tagging_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/subresource_filter/subresource_filter_browsertest.cc b/chromium_src/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/subresource_filter/subresource_filter_devtools_browsertest.cc b/chromium_src/chrome/browser/subresource_filter/subresource_filter_devtools_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/subresource_filter/subresource_filter_devtools_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/subresource_filter/subresource_filter_intercepting_browsertest.cc b/chromium_src/chrome/browser/subresource_filter/subresource_filter_intercepting_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/subresource_filter/subresource_filter_intercepting_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/subresource_filter/subresource_filter_settings_browsertest.cc b/chromium_src/chrome/browser/subresource_filter/subresource_filter_settings_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/subresource_filter/subresource_filter_settings_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/subresource_filter/subresource_filter_special_subframe_navigations_browsertest.cc b/chromium_src/chrome/browser/subresource_filter/subresource_filter_special_subframe_navigations_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/subresource_filter/subresource_filter_special_subframe_navigations_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/subresource_filter/subresource_filter_worker_browsertest.cc b/chromium_src/chrome/browser/subresource_filter/subresource_filter_worker_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/subresource_filter/subresource_filter_worker_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/sync/sessions/browser_list_router_helper_unittest.cc b/chromium_src/chrome/browser/sync/sessions/browser_list_router_helper_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/sync/sessions/browser_list_router_helper_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/sync/sync_service_factory_unittest.cc b/chromium_src/chrome/browser/sync/sync_service_factory_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/sync/sync_service_factory_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/tab_contents/navigation_metrics_recorder_browsertest.cc b/chromium_src/chrome/browser/tab_contents/navigation_metrics_recorder_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/tab_contents/navigation_metrics_recorder_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/tab_contents/view_source_browsertest.cc b/chromium_src/chrome/browser/tab_contents/view_source_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/tab_contents/view_source_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/task_manager/providers/web_contents/background_contents_tag_browsertest.cc b/chromium_src/chrome/browser/task_manager/providers/web_contents/background_contents_tag_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/task_manager/providers/web_contents/background_contents_tag_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/task_manager/providers/web_contents/devtools_tag_browsertest.cc b/chromium_src/chrome/browser/task_manager/providers/web_contents/devtools_tag_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/task_manager/providers/web_contents/devtools_tag_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/task_manager/providers/web_contents/extension_tag_browsertest.cc b/chromium_src/chrome/browser/task_manager/providers/web_contents/extension_tag_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/task_manager/providers/web_contents/extension_tag_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/task_manager/providers/web_contents/subframe_task_browsertest.cc b/chromium_src/chrome/browser/task_manager/providers/web_contents/subframe_task_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/task_manager/providers/web_contents/subframe_task_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/task_manager/providers/web_contents/tab_contents_tag_browsertest.cc b/chromium_src/chrome/browser/task_manager/providers/web_contents/tab_contents_tag_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/task_manager/providers/web_contents/tab_contents_tag_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/task_manager/providers/worker_task_provider_browsertest.cc b/chromium_src/chrome/browser/task_manager/providers/worker_task_provider_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/task_manager/providers/worker_task_provider_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/task_manager/task_manager_browsertest.cc b/chromium_src/chrome/browser/task_manager/task_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/task_manager/task_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/themes/theme_service_unittest.cc b/chromium_src/chrome/browser/themes/theme_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/themes/theme_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/themes/theme_syncable_service_unittest.cc b/chromium_src/chrome/browser/themes/theme_syncable_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/themes/theme_syncable_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/translate/translate_manager_browsertest.cc b/chromium_src/chrome/browser/translate/translate_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/translate/translate_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/translate/translate_manager_render_view_host_unittest.cc b/chromium_src/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/translate/translate_model_service_browsertest.cc b/chromium_src/chrome/browser/translate/translate_model_service_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/translate/translate_model_service_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl_unittest.cc b/chromium_src/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl_unittest.cc b/chromium_src/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc b/chromium_src/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl_unittest.cc b/chromium_src/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/blocked_content/popup_opener_tab_helper_browsertest.cc b/chromium_src/chrome/browser/ui/blocked_content/popup_opener_tab_helper_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/blocked_content/popup_opener_tab_helper_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/blocked_content/popup_tracker_browsertest.cc b/chromium_src/chrome/browser/ui/blocked_content/popup_tracker_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/blocked_content/popup_tracker_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc b/chromium_src/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/blocked_content/tab_under_blocker_browsertest.cc b/chromium_src/chrome/browser/ui/blocked_content/tab_under_blocker_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/blocked_content/tab_under_blocker_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/bookmarks/bookmark_unittest.cc b/chromium_src/chrome/browser/ui/bookmarks/bookmark_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/bookmarks/bookmark_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/browser_browsertest.cc b/chromium_src/chrome/browser/ui/browser_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/browser_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/browser_instant_controller_unittest.cc b/chromium_src/chrome/browser/ui/browser_instant_controller_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/browser_instant_controller_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/browser_navigator_browsertest.cc b/chromium_src/chrome/browser/ui/browser_navigator_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/browser_navigator_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/browser_tabrestore_browsertest.cc b/chromium_src/chrome/browser/ui/browser_tabrestore_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/browser_tabrestore_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/browser_unittest.cc b/chromium_src/chrome/browser/ui/browser_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/browser_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm b/chromium_src/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm b/chromium_src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/cocoa/first_run_dialog_controller_unittest.mm b/chromium_src/chrome/browser/ui/cocoa/first_run_dialog_controller_unittest.mm
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/cocoa/first_run_dialog_controller_unittest.mm
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar_unittest.mm b/chromium_src/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar_unittest.mm
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar_unittest.mm
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/commander/entity_match_unittest.cc b/chromium_src/chrome/browser/ui/commander/entity_match_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/commander/entity_match_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/content_settings/content_setting_image_model_browsertest.cc b/chromium_src/chrome/browser/ui/content_settings/content_setting_image_model_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/content_settings/content_setting_image_model_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chromium_src/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/content_settings/framebust_block_browsertest.cc b/chromium_src/chrome/browser/ui/content_settings/framebust_block_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/content_settings/framebust_block_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/cookie_controls/cookie_controls_controller_unittest.cc b/chromium_src/chrome/browser/ui/cookie_controls/cookie_controls_controller_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/cookie_controls/cookie_controls_controller_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc b/chromium_src/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc b/chromium_src/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/extensions/extension_installed_bubble_model_unittest.cc b/chromium_src/chrome/browser/ui/extensions/extension_installed_bubble_model_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/extensions/extension_installed_bubble_model_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/extensions/extension_message_bubble_bridge_unittest.cc b/chromium_src/chrome/browser/ui/extensions/extension_message_bubble_bridge_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/extensions/extension_message_bubble_bridge_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/extensions/hosted_app_browsertest.cc b/chromium_src/chrome/browser/ui/extensions/hosted_app_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/extensions/hosted_app_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/extensions/settings_overridden_params_providers_browsertest.cc b/chromium_src/chrome/browser/ui/extensions/settings_overridden_params_providers_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/extensions/settings_overridden_params_providers_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/extensions/settings_overridden_params_providers_unittest.cc b/chromium_src/chrome/browser/ui/extensions/settings_overridden_params_providers_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/extensions/settings_overridden_params_providers_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chromium_src/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/global_media_controls/media_notification_service_unittest.cc b/chromium_src/chrome/browser/ui/global_media_controls/media_notification_service_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/global_media_controls/media_notification_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/global_media_controls/presentation_request_notification_producer_unittest.cc b/chromium_src/chrome/browser/ui/global_media_controls/presentation_request_notification_producer_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/global_media_controls/presentation_request_notification_producer_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/hats/hats_helper_unittest.cc b/chromium_src/chrome/browser/ui/hats/hats_helper_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/hats/hats_helper_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/login/login_handler_browsertest.cc b/chromium_src/chrome/browser/ui/login/login_handler_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/login/login_handler_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/managed_ui_browsertest.cc b/chromium_src/chrome/browser/ui/managed_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/managed_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/manifest_web_app_browsertest.cc b/chromium_src/chrome/browser/ui/manifest_web_app_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/manifest_web_app_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/media_router/media_router_ui_service_factory_unittest.cc b/chromium_src/chrome/browser/ui/media_router/media_router_ui_service_factory_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/media_router/media_router_ui_service_factory_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/media_router/media_router_ui_unittest.cc b/chromium_src/chrome/browser/ui/media_router/media_router_ui_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/media_router/media_router_ui_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc b/chromium_src/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer_unittest.cc b/chromium_src/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/passwords/bubble_controllers/move_to_account_store_bubble_controller_unittest.cc b/chromium_src/chrome/browser/ui/passwords/bubble_controllers/move_to_account_store_bubble_controller_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/passwords/bubble_controllers/move_to_account_store_bubble_controller_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/passwords/bubble_controllers/save_update_bubble_controller_unittest.cc b/chromium_src/chrome/browser/ui/passwords/bubble_controllers/save_update_bubble_controller_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/passwords/bubble_controllers/save_update_bubble_controller_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_browsertest.cc b/chromium_src/chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_unittest.cc b/chromium_src/chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/popup_browsertest.cc b/chromium_src/chrome/browser/ui/popup_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/popup_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/search/instant_theme_browsertest.cc b/chromium_src/chrome/browser/ui/search/instant_theme_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/search/instant_theme_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/search/local_ntp_backgrounds_browsertest.cc b/chromium_src/chrome/browser/ui/search/local_ntp_backgrounds_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/search/local_ntp_backgrounds_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/search/local_ntp_browsertest.cc b/chromium_src/chrome/browser/ui/search/local_ntp_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/search/local_ntp_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/search/local_ntp_doodle_browsertest.cc b/chromium_src/chrome/browser/ui/search/local_ntp_doodle_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/search/local_ntp_doodle_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/search/local_ntp_js_browsertest.cc b/chromium_src/chrome/browser/ui/search/local_ntp_js_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/search/local_ntp_js_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/search/local_ntp_promos_browsertest.cc b/chromium_src/chrome/browser/ui/search/local_ntp_promos_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/search/local_ntp_promos_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/search/new_tab_page_navigation_throttle_browsertest.cc b/chromium_src/chrome/browser/ui/search/new_tab_page_navigation_throttle_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/search/new_tab_page_navigation_throttle_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/search/ntp_user_data_logger_unittest.cc b/chromium_src/chrome/browser/ui/search/ntp_user_data_logger_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/search/ntp_user_data_logger_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc b/chromium_src/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/search/search_ipc_router_unittest.cc b/chromium_src/chrome/browser/ui/search/search_ipc_router_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/search/search_ipc_router_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/search/search_tab_helper_unittest.cc b/chromium_src/chrome/browser/ui/search/search_tab_helper_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/search/search_tab_helper_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/search/third_party_ntp_browsertest.cc b/chromium_src/chrome/browser/ui/search/third_party_ntp_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/search/third_party_ntp_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc b/chromium_src/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/send_tab_to_self/send_tab_to_self_sub_menu_model_unittest.cc b/chromium_src/chrome/browser/ui/send_tab_to_self/send_tab_to_self_sub_menu_model_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/send_tab_to_self/send_tab_to_self_sub_menu_model_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/signin/profile_colors_util_unittest.cc b/chromium_src/chrome/browser/ui/signin/profile_colors_util_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/signin/profile_colors_util_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/signin_reauth_view_controller_browsertest.cc b/chromium_src/chrome/browser/ui/signin_reauth_view_controller_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/signin_reauth_view_controller_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chromium_src/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc b/chromium_src/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/startup/startup_browser_policy_unittest.cc b/chromium_src/chrome/browser/ui/startup/startup_browser_policy_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/startup/startup_browser_policy_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/startup/startup_tab_provider_unittest.cc b/chromium_src/chrome/browser/ui/startup/startup_tab_provider_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/startup/startup_tab_provider_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc b/chromium_src/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chromium_src/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/sync/sync_promo_ui_unittest.cc b/chromium_src/chrome/browser/ui/sync/sync_promo_ui_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/sync/sync_promo_ui_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/tab_contents/chrome_web_contents_menu_helper_unittest.cc b/chromium_src/chrome/browser/ui/tab_contents/chrome_web_contents_menu_helper_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/tab_contents/chrome_web_contents_menu_helper_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc b/chromium_src/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/tab_sharing/tab_sharing_infobar_delegate_unittest.cc b/chromium_src/chrome/browser/ui/tab_sharing/tab_sharing_infobar_delegate_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/tab_sharing/tab_sharing_infobar_delegate_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model_unittest.cc b/chromium_src/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/tabs/existing_tab_group_sub_menu_model_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/tabs/existing_window_sub_menu_model_unittest.cc b/chromium_src/chrome/browser/ui/tabs/existing_window_sub_menu_model_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/tabs/existing_window_sub_menu_model_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/tabs/pinned_tab_codec_unittest.cc b/chromium_src/chrome/browser/ui/tabs/pinned_tab_codec_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/tabs/pinned_tab_codec_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc b/chromium_src/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/tabs/tab_menu_model_unittest.cc b/chromium_src/chrome/browser/ui/tabs/tab_menu_model_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/tabs/tab_menu_model_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chromium_src/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/thumbnails/thumbnail_tab_helper_browsertest.cc b/chromium_src/chrome/browser/ui/thumbnails/thumbnail_tab_helper_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/thumbnails/thumbnail_tab_helper_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/toolbar/app_menu_icon_controller_unittest.cc b/chromium_src/chrome/browser/ui/toolbar/app_menu_icon_controller_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/toolbar/app_menu_icon_controller_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chromium_src/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate_unittest.cc b/chromium_src/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/toolbar/location_bar_model_unittest.cc b/chromium_src/chrome/browser/ui/toolbar/location_bar_model_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/toolbar/location_bar_model_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc b/chromium_src/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc b/chromium_src/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/user_education/reopen_tab_in_product_help_unittest.cc b/chromium_src/chrome/browser/ui/user_education/reopen_tab_in_product_help_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/user_education/reopen_tab_in_product_help_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/accelerator_table_unittest_mac.mm b/chromium_src/chrome/browser/ui/views/accelerator_table_unittest_mac.mm
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/accelerator_table_unittest_mac.mm
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/accessibility/accessibility_focus_highlight_browsertest.cc b/chromium_src/chrome/browser/ui/views/accessibility/accessibility_focus_highlight_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/accessibility/accessibility_focus_highlight_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_browsertest.cc b/chromium_src/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc b/chromium_src/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/autofill/payments/local_card_migration_browsertest.cc b/chromium_src/chrome/browser/ui/views/autofill/payments/local_card_migration_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/autofill/payments/local_card_migration_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_browsertest.cc b/chromium_src/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc b/chromium_src/chrome/browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bar_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bar_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bar_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc b/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc b/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc b/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc b/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/collected_cookies_views_browsertest.cc b/chromium_src/chrome/browser/ui/views/collected_cookies_views_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/collected_cookies_views_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/desktop_capture/get_current_browsing_context_media_dialog_unittest.cc b/chromium_src/chrome/browser/ui/views/desktop_capture/get_current_browsing_context_media_dialog_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/desktop_capture/get_current_browsing_context_media_dialog_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/download/download_shelf_web_view_unittest.cc b/chromium_src/chrome/browser/ui/views/download/download_shelf_web_view_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/download/download_shelf_web_view_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/extensions/extension_dialog_browsertest.cc b/chromium_src/chrome/browser/ui/views/extensions/extension_dialog_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/extensions/extension_dialog_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/extensions/extensions_menu_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/extensions/extensions_menu_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/extensions/extensions_menu_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/extensions/extensions_menu_view_unittest.cc b/chromium_src/chrome/browser/ui/views/extensions/extensions_menu_view_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/extensions/extensions_menu_view_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/extensions/extensions_toolbar_controls_unittest.cc b/chromium_src/chrome/browser/ui/views/extensions/extensions_toolbar_controls_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/extensions/extensions_toolbar_controls_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/external_protocol_dialog_browsertest.cc b/chromium_src/chrome/browser/ui/views/external_protocol_dialog_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/external_protocol_dialog_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/file_system_access/file_system_access_browsertest.cc b/chromium_src/chrome/browser/ui/views/file_system_access/file_system_access_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/file_system_access/file_system_access_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/frame/browser_frame_browsertest.cc b/chromium_src/chrome/browser/ui/views/frame/browser_frame_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/frame/browser_frame_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/frame/browser_non_client_frame_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/frame/browser_non_client_frame_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/frame/browser_non_client_frame_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/frame/browser_non_client_frame_view_unittest.cc b/chromium_src/chrome/browser/ui/views/frame/browser_non_client_frame_view_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/frame/browser_non_client_frame_view_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/frame/browser_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/frame/browser_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/frame/browser_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/frame/browser_view_unittest.cc b/chromium_src/chrome/browser/ui/views/frame/browser_view_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/frame/browser_view_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/frame/glass_browser_frame_view_browsertest_win.cc b/chromium_src/chrome/browser/ui/views/frame/glass_browser_frame_view_browsertest_win.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/frame/glass_browser_frame_view_browsertest_win.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc b/chromium_src/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/hats/hats_browsertest.cc b/chromium_src/chrome/browser/ui/views/hats/hats_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/hats/hats_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/infobars/infobar_view_unittest.cc b/chromium_src/chrome/browser/ui/views/infobars/infobar_view_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/infobars/infobar_view_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/intent_picker_bubble_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/intent_picker_bubble_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/intent_picker_bubble_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc b/chromium_src/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/location_bar/content_setting_bubble_dialog_browsertest.cc b/chromium_src/chrome/browser/ui/views/location_bar/content_setting_bubble_dialog_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/location_bar/content_setting_bubble_dialog_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/location_bar/cookie_controls_bubble_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/location_bar/cookie_controls_bubble_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/location_bar/cookie_controls_bubble_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/location_bar/custom_tab_bar_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/location_bar/custom_tab_bar_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/location_bar/custom_tab_bar_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/location_bar/permission_chip_unittest.cc b/chromium_src/chrome/browser/ui/views/location_bar/permission_chip_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/location_bar/permission_chip_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc b/chromium_src/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/media_router/media_router_dialog_controller_views_browsertest.cc b/chromium_src/chrome/browser/ui/views/media_router/media_router_dialog_controller_views_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/media_router/media_router_dialog_controller_views_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc b/chromium_src/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc b/chromium_src/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/page_action/pwa_install_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view_dialog_browsertest.cc b/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view_dialog_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view_dialog_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc b/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view_sync_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view_unittest.cc b/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/passwords/password_bubble_browsertest.cc b/chromium_src/chrome/browser/ui/views/passwords/password_bubble_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/passwords/password_bubble_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/payments/contact_info_editor_view_controller_browsertest.cc b/chromium_src/chrome/browser/ui/views/payments/contact_info_editor_view_controller_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/payments/contact_info_editor_view_controller_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/payments/credit_card_editor_view_controller_browsertest.cc b/chromium_src/chrome/browser/ui/views/payments/credit_card_editor_view_controller_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/payments/credit_card_editor_view_controller_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/payments/modifiers_browsertest.cc b/chromium_src/chrome/browser/ui/views/payments/modifiers_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/payments/modifiers_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/payments/payment_handler_header_view_ui_browsertest.cc b/chromium_src/chrome/browser/ui/views/payments/payment_handler_header_view_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/payments/payment_handler_header_view_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/payments/payment_handler_icon_refetch_browsertest.cc b/chromium_src/chrome/browser/ui/views/payments/payment_handler_icon_refetch_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/payments/payment_handler_icon_refetch_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/payments/payment_request_can_make_payment_metrics_browsertest.cc b/chromium_src/chrome/browser/ui/views/payments/payment_request_can_make_payment_metrics_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/payments/payment_request_can_make_payment_metrics_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/payments/payment_request_journey_logger_browsertest.cc b/chromium_src/chrome/browser/ui/views/payments/payment_request_journey_logger_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/payments/payment_request_journey_logger_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/payments/payment_request_missing_fields_metrics_browsertest.cc b/chromium_src/chrome/browser/ui/views/payments/payment_request_missing_fields_metrics_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/payments/payment_request_missing_fields_metrics_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/payments/payment_request_payment_app_browsertest.cc b/chromium_src/chrome/browser/ui/views/payments/payment_request_payment_app_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/payments/payment_request_payment_app_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/payments/payment_request_payment_response_browsertest.cc b/chromium_src/chrome/browser/ui/views/payments/payment_request_payment_response_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/payments/payment_request_payment_response_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/payments/payment_request_show_promise_browsertest.cc b/chromium_src/chrome/browser/ui/views/payments/payment_request_show_promise_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/payments/payment_request_show_promise_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/payments/payment_sheet_view_controller_browsertest.cc b/chromium_src/chrome/browser/ui/views/payments/payment_sheet_view_controller_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/payments/payment_sheet_view_controller_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.cc b/chromium_src/chrome/browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/payments/shipping_option_view_controller_browsertest.cc b/chromium_src/chrome/browser/ui/views/payments/shipping_option_view_controller_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/payments/shipping_option_view_controller_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/profiles/avatar_toolbar_button_unittest.cc b/chromium_src/chrome/browser/ui/views/profiles/avatar_toolbar_button_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/profiles/avatar_toolbar_button_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/reader_mode/reader_mode_icon_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/reader_mode/reader_mode_icon_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/reader_mode/reader_mode_icon_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc b/chromium_src/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc b/chromium_src/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/sharing/shared_clipboard_browsertest.cc b/chromium_src/chrome/browser/ui/views/sharing/shared_clipboard_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/sharing/shared_clipboard_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/sharing/sharing_dialog_view_unittest.cc b/chromium_src/chrome/browser/ui/views/sharing/sharing_dialog_view_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/sharing/sharing_dialog_view_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc b/chromium_src/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_unittest.cc b/chromium_src/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views_browsertest.cc b/chromium_src/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller_unittest.cc b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_controller_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_strip_unittest.cc b/chromium_src/chrome/browser/ui/views/tabs/tab_strip_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/tabs/tab_strip_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_unittest.cc b/chromium_src/chrome/browser/ui/views/tabs/tab_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/tabs/tab_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/toolbar/avatar_toolbar_button_browsertest.cc b/chromium_src/chrome/browser/ui/views/toolbar/avatar_toolbar_button_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/toolbar/avatar_toolbar_button_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc b/chromium_src/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view_unittest.cc b/chromium_src/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/toolbar/chrome_labs_button_unittest.cc b/chromium_src/chrome/browser/ui/views/toolbar/chrome_labs_button_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/toolbar/chrome_labs_button_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/toolbar/webui_tab_counter_button_unittest.cc b/chromium_src/chrome/browser/ui/views/toolbar/webui_tab_counter_button_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/toolbar/webui_tab_counter_button_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/translate/translate_language_browsertest.cc b/chromium_src/chrome/browser/ui/views/translate/translate_language_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/translate/translate_language_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/user_education/feature_promo_bubble_view_unittest.cc b/chromium_src/chrome/browser/ui/views/user_education/feature_promo_bubble_view_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/user_education/feature_promo_bubble_view_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/user_education/feature_promo_controller_views_unittest.cc b/chromium_src/chrome/browser/ui/views/user_education/feature_promo_controller_views_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/views/user_education/feature_promo_controller_views_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_browsertest.cc b/chromium_src/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/web_apps/web_app_confirmation_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/web_apps/web_app_confirmation_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/web_apps/web_app_confirmation_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc b/chromium_src/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/web_applications/create_shortcut_browsertest.cc b/chromium_src/chrome/browser/ui/web_applications/create_shortcut_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/web_applications/create_shortcut_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/web_applications/pwa_mixed_content_browsertest.cc b/chromium_src/chrome/browser/ui/web_applications/pwa_mixed_content_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/web_applications/pwa_mixed_content_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/web_applications/test/system_web_app_ui_browsertest.cc b/chromium_src/chrome/browser/ui/web_applications/test/system_web_app_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/web_applications/test/system_web_app_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/web_applications/web_app_badging_browsertest.cc b/chromium_src/chrome/browser/ui/web_applications/web_app_badging_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/web_applications/web_app_badging_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/web_applications/web_app_browsertest.cc b/chromium_src/chrome/browser/ui/web_applications/web_app_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/web_applications/web_app_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/web_applications/web_app_engagement_browsertest.cc b/chromium_src/chrome/browser/ui/web_applications/web_app_engagement_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/web_applications/web_app_engagement_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc b/chromium_src/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/web_applications/web_app_link_capturing_browsertest.cc b/chromium_src/chrome/browser/ui/web_applications/web_app_link_capturing_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/web_applications/web_app_link_capturing_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/web_applications/web_app_metrics_browsertest.cc b/chromium_src/chrome/browser/ui/web_applications/web_app_metrics_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/web_applications/web_app_metrics_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/web_applications/web_app_navigate_browsertest.cc b/chromium_src/chrome/browser/ui/web_applications/web_app_navigate_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/web_applications/web_app_navigate_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/web_applications/web_app_ui_manager_impl_browsertest.cc b/chromium_src/chrome/browser/ui/web_applications/web_app_ui_manager_impl_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/web_applications/web_app_ui_manager_impl_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui_browsertest.cc b/chromium_src/chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/browser_command/browser_command_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/browser_command/browser_command_handler_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/browser_command/browser_command_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc b/chromium_src/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/customize_themes/chrome_customize_themes_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/customize_themes/chrome_customize_themes_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/customize_themes/chrome_customize_themes_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/devtools_ui_data_source_unittest.cc b/chromium_src/chrome/browser/ui/webui/devtools_ui_data_source_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/devtools_ui_data_source_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc b/chromium_src/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/inspect_ui_browsertest.cc b/chromium_src/chrome/browser/ui/webui/inspect_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/inspect_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/interstitials/interstitial_ui_browsertest.cc b/chromium_src/chrome/browser/ui/webui/interstitials/interstitial_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/interstitials/interstitial_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc b/chromium_src/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/new_tab_page/webui_ntp_browsertest.cc b/chromium_src/chrome/browser/ui/webui/new_tab_page/webui_ntp_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/new_tab_page/webui_ntp_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/ntp/app_launcher_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/ntp/app_launcher_handler_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/ntp/app_launcher_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chromium_src/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc b/chromium_src/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/prefs_internals_browsertest.cc b/chromium_src/chrome/browser/ui/webui/prefs_internals_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/prefs_internals_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/print_preview/pdf_printer_handler_posix_unittest.cc b/chromium_src/chrome/browser/ui/webui/print_preview/pdf_printer_handler_posix_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/print_preview/pdf_printer_handler_posix_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/print_preview/pdf_printer_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/print_preview/pdf_printer_handler_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/print_preview/pdf_printer_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc b/chromium_src/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc b/chromium_src/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chromium_src/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/profile_helper_browsertest.cc b/chromium_src/chrome/browser/ui/webui/profile_helper_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/profile_helper_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/read_later/read_later_page_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/read_later/read_later_page_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/read_later/read_later_page_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/settings/people_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/settings/people_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/settings/people_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_ui_browsertest.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/settings/settings_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/settings/site_settings_helper_unittest.cc b/chromium_src/chrome/browser/ui/webui/settings/site_settings_helper_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/settings/site_settings_helper_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc b/chromium_src/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc b/chromium_src/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/signin/profile_picker_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/signin/profile_picker_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/signin/profile_picker_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/signin/signin_error_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/signin/signin_error_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/signin/signin_error_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/signin/user_manager_ui_browsertest.cc b/chromium_src/chrome/browser/ui/webui/signin/user_manager_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/signin/user_manager_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/tab_search/tab_search_page_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/tab_search/tab_search_page_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/tab_search/tab_search_page_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/tab_search/tab_search_ui_browsertest.cc b/chromium_src/chrome/browser/ui/webui/tab_search/tab_search_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/tab_search/tab_search_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/tab_strip/tab_strip_page_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/tab_strip/tab_strip_page_handler_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/tab_strip/tab_strip_page_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/tab_strip/tab_strip_ui_handler_unittest.cc b/chromium_src/chrome/browser/ui/webui/tab_strip/tab_strip_ui_handler_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/tab_strip/tab_strip_ui_handler_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/theme_source_unittest.cc b/chromium_src/chrome/browser/ui/webui/theme_source_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/theme_source_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chromium_src/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/ui/webui/webui_webview_browsertest.cc b/chromium_src/chrome/browser/ui/webui/webui_webview_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/webui/webui_webview_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ui/zoom/zoom_controller_browsertest.cc b/chromium_src/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/ukm_worker_browsertest.cc b/chromium_src/chrome/browser/ukm_worker_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/ukm_worker_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/unified_consent/unified_consent_browsertest.cc b/chromium_src/chrome/browser/unified_consent/unified_consent_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/unified_consent/unified_consent_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/unload_browsertest.cc b/chromium_src/chrome/browser/unload_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/unload_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/upgrade_detector/upgrade_detector_impl_unittest.cc b/chromium_src/chrome/browser/upgrade_detector/upgrade_detector_impl_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/upgrade_detector/upgrade_detector_impl_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/usb/web_usb_detector_unittest.cc b/chromium_src/chrome/browser/usb/web_usb_detector_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/usb/web_usb_detector_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/web_applications/components/web_app_shortcut_linux_unittest.cc b/chromium_src/chrome/browser/web_applications/components/web_app_shortcut_linux_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/web_applications/components/web_app_shortcut_linux_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer_unittest.cc b/chromium_src/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/web_applications/extensions/bookmark_app_install_finalizer_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/web_applications/extensions/externally_installed_web_app_prefs_unittest.cc b/chromium_src/chrome/browser/web_applications/extensions/externally_installed_web_app_prefs_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/web_applications/extensions/externally_installed_web_app_prefs_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/web_applications/external_web_app_manager_unittest.cc b/chromium_src/chrome/browser/web_applications/external_web_app_manager_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/browser/web_applications/external_web_app_manager_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/browser/web_applications/manifest_update_manager_browsertest.cc b/chromium_src/chrome/browser/web_applications/manifest_update_manager_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/web_applications/manifest_update_manager_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/web_applications/preinstalled_web_app_manager_unittest.cc b/chromium_src/chrome/browser/web_applications/preinstalled_web_app_manager_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/web_applications/preinstalled_web_app_manager_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/web_applications/web_app_audio_focus_browsertest.cc b/chromium_src/chrome/browser/web_applications/web_app_audio_focus_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/web_applications/web_app_audio_focus_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/web_applications/web_app_mover_browsertest.cc b/chromium_src/chrome/browser/web_applications/web_app_mover_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/web_applications/web_app_mover_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/browser/web_applications/web_app_shortcut_linux_unittest.cc b/chromium_src/chrome/browser/web_applications/web_app_shortcut_linux_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/browser/web_applications/web_app_shortcut_linux_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/common/channel_info_unittest.cc b/chromium_src/chrome/common/channel_info_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/common/channel_info_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/common/chrome_paths_unittest.cc b/chromium_src/chrome/common/chrome_paths_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/common/chrome_paths_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc b/chromium_src/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/common/extensions/permissions/permission_set_unittest.cc b/chromium_src/chrome/common/extensions/permissions/permission_set_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/common/extensions/permissions/permission_set_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/chrome/common/extensions/sync_type_unittest.cc b/chromium_src/chrome/common/extensions/sync_type_unittest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/common/extensions/sync_type_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/renderer/cart/commerce_hint_agent_browsertest.cc b/chromium_src/chrome/renderer/cart/commerce_hint_agent_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/renderer/cart/commerce_hint_agent_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/services/media_gallery_util/public/cpp/media_gallery_util_browsertest.cc b/chromium_src/chrome/services/media_gallery_util/public/cpp/media_gallery_util_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/services/media_gallery_util/public/cpp/media_gallery_util_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/test/base/devtools_listener_browsertest.cc b/chromium_src/chrome/test/base/devtools_listener_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/test/base/devtools_listener_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/test/base/in_process_browser_test_browsertest.cc b/chromium_src/chrome/test/base/in_process_browser_test_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/test/base/in_process_browser_test_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/test/base/web_ui_browser_test_browsertest.cc b/chromium_src/chrome/test/base/web_ui_browser_test_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/test/base/web_ui_browser_test_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/test/data/webui/mojo/mojo_js_interface_broker_browsertest.cc b/chromium_src/chrome/test/data/webui/mojo/mojo_js_interface_broker_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/test/data/webui/mojo/mojo_js_interface_broker_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/test/media_router/media_router_e2e_browsertest.cc b/chromium_src/chrome/test/media_router/media_router_e2e_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/test/media_router/media_router_e2e_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/test/media_router/media_router_e2e_browsertest.h b/chromium_src/chrome/test/media_router/media_router_e2e_browsertest.h
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/test/media_router/media_router_e2e_browsertest.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/test/media_router/media_router_e2e_ui_browsertest.cc b/chromium_src/chrome/test/media_router/media_router_e2e_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/test/media_router/media_router_e2e_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/test/media_router/media_router_integration_browsertest.cc b/chromium_src/chrome/test/media_router/media_router_integration_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/test/media_router/media_router_integration_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/test/media_router/media_router_integration_browsertest.h b/chromium_src/chrome/test/media_router/media_router_integration_browsertest.h
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/test/media_router/media_router_integration_browsertest.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/test/media_router/media_router_integration_ui_browsertest.cc b/chromium_src/chrome/test/media_router/media_router_integration_ui_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/test/media_router/media_router_integration_ui_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/test/media_router/media_router_one_ua_integration_browsertest.cc b/chromium_src/chrome/test/media_router/media_router_one_ua_integration_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/test/media_router/media_router_one_ua_integration_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/test/ppapi/ppapi_browsertest.cc b/chromium_src/chrome/test/ppapi/ppapi_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/chrome/test/ppapi/ppapi_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.
diff --git a/chromium_src/chrome/test/views/accessibility_checker_unittest.cc b/chromium_src/chrome/test/views/accessibility_checker_unittest.cc
deleted file mode 100644
index 2954e2ba13243..0000000000000
--- a/chromium_src/chrome/test/views/accessibility_checker_unittest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8376 for more information.
diff --git a/chromium_src/extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc b/chromium_src/extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc
deleted file mode 100644
index 37f87fda12211..0000000000000
--- a/chromium_src/extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-// THIS FILE IS INTENTIONALLY EMPTY TO DISABLE TESTS FROM CHROMIUM UPSTREAM.
-// See https://github.com/brave/brave-browser/issues/8297 for more information.