diff --git a/browser/DEPS b/browser/DEPS index 92394c28c6f..f44ac90e0c8 100644 --- a/browser/DEPS +++ b/browser/DEPS @@ -86,7 +86,7 @@ include_rules += [ "+brave/components/https_upgrade_exceptions/browser", "+brave/components/brave_user_agent/browser", "+brave/components/localhost_permission", - "+brave/components/url_sanitizer/browser", + "+brave/components/url_sanitizer/core/browser", "+brave/components/body_sniffer", "+brave/components/brave_search/browser", "+brave/components/brave_search/common", diff --git a/browser/brave_browser_process_impl.h b/browser/brave_browser_process_impl.h index b9b0b9a6667..58d3da2786f 100644 --- a/browser/brave_browser_process_impl.h +++ b/browser/brave_browser_process_impl.h @@ -16,7 +16,7 @@ #include "brave/components/speedreader/common/buildflags/buildflags.h" #include "brave/components/tor/brave_tor_pluggable_transport_updater.h" #include "brave/components/tor/buildflags/buildflags.h" -#include "brave/components/url_sanitizer/browser/url_sanitizer_component_installer.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_component_installer.h" #include "build/build_config.h" #include "chrome/browser/browser_process_impl.h" #include "extensions/buildflags/buildflags.h" diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index c09f3825514..46308c7c37c 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -110,7 +110,7 @@ #include "brave/components/speedreader/common/buildflags/buildflags.h" #include "brave/components/tor/buildflags/buildflags.h" #include "brave/components/translate/core/common/brave_translate_switches.h" -#include "brave/components/url_sanitizer/browser/url_sanitizer_service.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_service.h" #include "brave/grit/brave_generated_resources.h" #include "brave/third_party/blink/renderer/brave_farbling_constants.h" #include "build/build_config.h" diff --git a/browser/ui/BUILD.gn b/browser/ui/BUILD.gn index ff4546c733c..a21e1b22091 100644 --- a/browser/ui/BUILD.gn +++ b/browser/ui/BUILD.gn @@ -848,7 +848,7 @@ source_set("ui") { "//brave/components/text_recognition/common/buildflags", "//brave/components/time_period_storage", "//brave/components/tor/buildflags", - "//brave/components/url_sanitizer/browser", + "//brave/components/url_sanitizer/core/browser", "//brave/components/vector_icons", "//brave/components/web_discovery/buildflags", "//brave/components/webui", diff --git a/browser/ui/browser_commands.cc b/browser/ui/browser_commands.cc index a884f16ed8c..52397d6a03e 100644 --- a/browser/ui/browser_commands.cc +++ b/browser/ui/browser_commands.cc @@ -43,7 +43,7 @@ #include "brave/components/sidebar/browser/sidebar_service.h" #include "brave/components/speedreader/common/buildflags/buildflags.h" #include "brave/components/tor/buildflags/buildflags.h" -#include "brave/components/url_sanitizer/browser/url_sanitizer_service.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_service.h" #include "chrome/browser/bookmarks/bookmark_html_writer.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/ui/views/omnibox/brave_omnibox_view_views_browsertest.cc b/browser/ui/views/omnibox/brave_omnibox_view_views_browsertest.cc index 88f99dd59e5..cf6441d5240 100644 --- a/browser/ui/views/omnibox/brave_omnibox_view_views_browsertest.cc +++ b/browser/ui/views/omnibox/brave_omnibox_view_views_browsertest.cc @@ -8,7 +8,7 @@ #include "base/strings/utf_string_conversions.h" #include "brave/browser/brave_browser_features.h" #include "brave/browser/url_sanitizer/url_sanitizer_service_factory.h" -#include "brave/components/url_sanitizer/browser/url_sanitizer_service.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_service.h" #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h" diff --git a/browser/url_sanitizer/BUILD.gn b/browser/url_sanitizer/BUILD.gn index d63f5e36b63..e08a9d2e258 100644 --- a/browser/url_sanitizer/BUILD.gn +++ b/browser/url_sanitizer/BUILD.gn @@ -9,7 +9,7 @@ source_set("browser_tests") { sources = [ "url_sanitizer_browsertest.cc" ] deps = [ - "//brave/components/url_sanitizer/browser", + "//brave/components/url_sanitizer/core/browser", "//chrome/browser", "//chrome/browser/profiles:profile", "//chrome/browser/ui", diff --git a/browser/url_sanitizer/DEPS b/browser/url_sanitizer/DEPS index cb5f644135b..1838fdc6c4f 100644 --- a/browser/url_sanitizer/DEPS +++ b/browser/url_sanitizer/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+brave/components/url_sanitizer/common", + "+brave/components/url_sanitizer/core/common", ] diff --git a/browser/url_sanitizer/sources.gni b/browser/url_sanitizer/sources.gni index cb952d0d7bd..37fd88f6d0e 100644 --- a/browser/url_sanitizer/sources.gni +++ b/browser/url_sanitizer/sources.gni @@ -1,3 +1,8 @@ +# Copyright (c) 2022 The Brave Authors. All rights reserved. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at https://mozilla.org/MPL/2.0/. + brave_browser_url_sanitizer_sources = [ "//brave/browser/url_sanitizer/url_sanitizer_service_factory.cc", "//brave/browser/url_sanitizer/url_sanitizer_service_factory.h", @@ -5,7 +10,7 @@ brave_browser_url_sanitizer_sources = [ brave_browser_url_sanitizer_deps = [ "//base", - "//brave/components/url_sanitizer/browser", + "//brave/components/url_sanitizer/core/browser", "//components/keyed_service/content", ] diff --git a/browser/url_sanitizer/url_sanitizer_browsertest.cc b/browser/url_sanitizer/url_sanitizer_browsertest.cc index 534efd17f5d..e3f3517d70f 100644 --- a/browser/url_sanitizer/url_sanitizer_browsertest.cc +++ b/browser/url_sanitizer/url_sanitizer_browsertest.cc @@ -11,7 +11,7 @@ #include "brave/browser/brave_browser_features.h" #include "brave/browser/url_sanitizer/url_sanitizer_service_factory.h" #include "brave/components/constants/brave_paths.h" -#include "brave/components/url_sanitizer/browser/url_sanitizer_service.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/browser/url_sanitizer/url_sanitizer_service_factory.cc b/browser/url_sanitizer/url_sanitizer_service_factory.cc index 0fae9c7e143..3a0c0f52109 100644 --- a/browser/url_sanitizer/url_sanitizer_service_factory.cc +++ b/browser/url_sanitizer/url_sanitizer_service_factory.cc @@ -11,8 +11,8 @@ #include "base/feature_list.h" #include "base/no_destructor.h" #include "brave/browser/brave_browser_process.h" -#include "brave/components/url_sanitizer/browser/url_sanitizer_component_installer.h" -#include "brave/components/url_sanitizer/browser/url_sanitizer_service.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_component_installer.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_service.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" diff --git a/browser/url_sanitizer/url_sanitizer_service_factory.h b/browser/url_sanitizer/url_sanitizer_service_factory.h index 792e49a2b47..f1037adda58 100644 --- a/browser/url_sanitizer/url_sanitizer_service_factory.h +++ b/browser/url_sanitizer/url_sanitizer_service_factory.h @@ -11,7 +11,7 @@ #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #if BUILDFLAG(IS_ANDROID) -#include "brave/components/url_sanitizer/common/mojom/url_sanitizer.mojom.h" +#include "brave/components/url_sanitizer/core/common/mojom/url_sanitizer.mojom.h" #include "mojo/public/cpp/bindings/pending_remote.h" #endif // # BUILDFLAG(IS_ANDROID) diff --git a/build/android/config.gni b/build/android/config.gni index 266131c7bcb..6e196f24570 100644 --- a/build/android/config.gni +++ b/build/android/config.gni @@ -50,7 +50,7 @@ brave_chrome_java_deps = [ "//brave/components/playlist/core/common/mojom:mojom_java", "//brave/components/safe_browsing/android:brave_safe_browsing_java", "//brave/components/skus/common:mojom_java", - "//brave/components/url_sanitizer/common/mojom:mojom_java", + "//brave/components/url_sanitizer/core/common/mojom:mojom_java", "//brave/components/variations/android:java", "//brave/components/version_info/android:java", "//brave/components/webcompat_reporter/common:mojom_java", diff --git a/components/BUILD.gn b/components/BUILD.gn index 11e9270e8ba..011b93feab5 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -36,6 +36,7 @@ test("brave_components_unittests") { "//brave/components/json:unit_tests", "//brave/components/static_redirect_helper:unit_tests", "//brave/components/update_client:unit_tests", + "//brave/components/url_sanitizer/core/browser:unit_tests", "//components/test:run_all_unittests", ] diff --git a/components/brave_component_updater/browser/BUILD.gn b/components/brave_component_updater/browser/BUILD.gn index 1b397ab122f..0eed7c80190 100644 --- a/components/brave_component_updater/browser/BUILD.gn +++ b/components/brave_component_updater/browser/BUILD.gn @@ -42,7 +42,7 @@ component("browser") { "//brave/components/https_upgrade_exceptions/browser", "//brave/components/request_otr/browser", "//brave/components/tor", - "//brave/components/url_sanitizer/browser", + "//brave/components/url_sanitizer/core/browser", "//brave/components/webcompat/content/browser", "//brave/ios/app", "//brave/ios/browser/application_context", diff --git a/components/url_sanitizer/browser/BUILD.gn b/components/url_sanitizer/core/browser/BUILD.gn similarity index 83% rename from components/url_sanitizer/browser/BUILD.gn rename to components/url_sanitizer/core/browser/BUILD.gn index 4472f6a53a1..054d65aad07 100644 --- a/components/url_sanitizer/browser/BUILD.gn +++ b/components/url_sanitizer/core/browser/BUILD.gn @@ -1,7 +1,7 @@ # Copyright (c) 2022 The Brave Authors. All rights reserved. # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. +# You can obtain one at https://mozilla.org/MPL/2.0/. source_set("browser") { sources = [ @@ -10,7 +10,7 @@ source_set("browser") { "url_sanitizer_service.cc", "url_sanitizer_service.h", ] - public_deps = [ "//brave/components/url_sanitizer/common/mojom" ] + public_deps = [ "//brave/components/url_sanitizer/core/common/mojom" ] deps = [ "//base", "//brave/components/brave_component_updater/browser", @@ -21,7 +21,7 @@ source_set("browser") { ] } -source_set("unittests") { +source_set("unit_tests") { testonly = true sources = [ "url_sanitizer_service_unittest.cc" ] diff --git a/components/url_sanitizer/browser/DEPS b/components/url_sanitizer/core/browser/DEPS similarity index 100% rename from components/url_sanitizer/browser/DEPS rename to components/url_sanitizer/core/browser/DEPS diff --git a/components/url_sanitizer/browser/url_sanitizer_component_installer.cc b/components/url_sanitizer/core/browser/url_sanitizer_component_installer.cc similarity index 95% rename from components/url_sanitizer/browser/url_sanitizer_component_installer.cc rename to components/url_sanitizer/core/browser/url_sanitizer_component_installer.cc index 37e69873dee..59671e7627a 100644 --- a/components/url_sanitizer/browser/url_sanitizer_component_installer.cc +++ b/components/url_sanitizer/core/browser/url_sanitizer_component_installer.cc @@ -1,9 +1,9 @@ /* Copyright (c) 2022 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "brave/components/url_sanitizer/browser/url_sanitizer_component_installer.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_component_installer.h" #include #include diff --git a/components/url_sanitizer/browser/url_sanitizer_component_installer.h b/components/url_sanitizer/core/browser/url_sanitizer_component_installer.h similarity index 86% rename from components/url_sanitizer/browser/url_sanitizer_component_installer.h rename to components/url_sanitizer/core/browser/url_sanitizer_component_installer.h index 44991a4d426..f26ad635ac2 100644 --- a/components/url_sanitizer/browser/url_sanitizer_component_installer.h +++ b/components/url_sanitizer/core/browser/url_sanitizer_component_installer.h @@ -1,10 +1,10 @@ /* Copyright (c) 2022 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_COMPONENTS_URL_SANITIZER_BROWSER_URL_SANITIZER_COMPONENT_INSTALLER_H_ -#define BRAVE_COMPONENTS_URL_SANITIZER_BROWSER_URL_SANITIZER_COMPONENT_INSTALLER_H_ +#ifndef BRAVE_COMPONENTS_URL_SANITIZER_CORE_BROWSER_URL_SANITIZER_COMPONENT_INSTALLER_H_ +#define BRAVE_COMPONENTS_URL_SANITIZER_CORE_BROWSER_URL_SANITIZER_COMPONENT_INSTALLER_H_ #include #include @@ -68,4 +68,4 @@ class URLSanitizerComponentInstaller } // namespace brave -#endif // BRAVE_COMPONENTS_URL_SANITIZER_BROWSER_URL_SANITIZER_COMPONENT_INSTALLER_H_ +#endif // BRAVE_COMPONENTS_URL_SANITIZER_CORE_BROWSER_URL_SANITIZER_COMPONENT_INSTALLER_H_ diff --git a/components/url_sanitizer/browser/url_sanitizer_service.cc b/components/url_sanitizer/core/browser/url_sanitizer_service.cc similarity index 98% rename from components/url_sanitizer/browser/url_sanitizer_service.cc rename to components/url_sanitizer/core/browser/url_sanitizer_service.cc index d97e88ae883..ffcc3217403 100644 --- a/components/url_sanitizer/browser/url_sanitizer_service.cc +++ b/components/url_sanitizer/core/browser/url_sanitizer_service.cc @@ -1,9 +1,9 @@ /* Copyright (c) 2022 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "brave/components/url_sanitizer/browser/url_sanitizer_service.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_service.h" #include #include diff --git a/components/url_sanitizer/browser/url_sanitizer_service.h b/components/url_sanitizer/core/browser/url_sanitizer_service.h similarity index 85% rename from components/url_sanitizer/browser/url_sanitizer_service.h rename to components/url_sanitizer/core/browser/url_sanitizer_service.h index 8bc20d2a18a..6ce0d3001b1 100644 --- a/components/url_sanitizer/browser/url_sanitizer_service.h +++ b/components/url_sanitizer/core/browser/url_sanitizer_service.h @@ -1,10 +1,10 @@ /* Copyright (c) 2022 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_COMPONENTS_URL_SANITIZER_BROWSER_URL_SANITIZER_SERVICE_H_ -#define BRAVE_COMPONENTS_URL_SANITIZER_BROWSER_URL_SANITIZER_SERVICE_H_ +#ifndef BRAVE_COMPONENTS_URL_SANITIZER_CORE_BROWSER_URL_SANITIZER_SERVICE_H_ +#define BRAVE_COMPONENTS_URL_SANITIZER_CORE_BROWSER_URL_SANITIZER_SERVICE_H_ #include #include @@ -13,8 +13,8 @@ #include "base/containers/flat_set.h" #include "base/functional/callback.h" #include "base/memory/weak_ptr.h" -#include "brave/components/url_sanitizer/browser/url_sanitizer_component_installer.h" -#include "brave/components/url_sanitizer/common/mojom/url_sanitizer.mojom.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_component_installer.h" +#include "brave/components/url_sanitizer/core/common/mojom/url_sanitizer.mojom.h" #include "components/keyed_service/core/keyed_service.h" #include "extensions/common/url_pattern_set.h" #include "url/gurl.h" @@ -102,4 +102,4 @@ class URLSanitizerService : public KeyedService, } // namespace brave -#endif // BRAVE_COMPONENTS_URL_SANITIZER_BROWSER_URL_SANITIZER_SERVICE_H_ +#endif // BRAVE_COMPONENTS_URL_SANITIZER_CORE_BROWSER_URL_SANITIZER_SERVICE_H_ diff --git a/components/url_sanitizer/browser/url_sanitizer_service_unittest.cc b/components/url_sanitizer/core/browser/url_sanitizer_service_unittest.cc similarity index 97% rename from components/url_sanitizer/browser/url_sanitizer_service_unittest.cc rename to components/url_sanitizer/core/browser/url_sanitizer_service_unittest.cc index ba6a278fe24..eb3c13e4aa0 100644 --- a/components/url_sanitizer/browser/url_sanitizer_service_unittest.cc +++ b/components/url_sanitizer/core/browser/url_sanitizer_service_unittest.cc @@ -1,9 +1,9 @@ /* Copyright (c) 2022 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "brave/components/url_sanitizer/browser/url_sanitizer_service.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_service.h" #include diff --git a/components/url_sanitizer/common/mojom/BUILD.gn b/components/url_sanitizer/core/common/mojom/BUILD.gn similarity index 100% rename from components/url_sanitizer/common/mojom/BUILD.gn rename to components/url_sanitizer/core/common/mojom/BUILD.gn diff --git a/components/url_sanitizer/common/mojom/url_sanitizer.mojom b/components/url_sanitizer/core/common/mojom/url_sanitizer.mojom similarity index 100% rename from components/url_sanitizer/common/mojom/url_sanitizer.mojom rename to components/url_sanitizer/core/common/mojom/url_sanitizer.mojom diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index 92e95ff3540..cb716e1c3c6 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -11,7 +11,7 @@ import("//extensions/buildflags/buildflags.gni") # content_settings::ContentSettingsPattern, etc.. deprecated_visibility_allowed = [ "//brave/components/static_redirect_helper", - "//brave/components/url_sanitizer/browser", + "//brave/components/url_sanitizer/core/browser", "//brave/components/debounce/core/browser", "//brave/components/ntp_background_images/browser", "//brave/components/psst/browser/core", diff --git a/ios/browser/api/url_sanitizer/BUILD.gn b/ios/browser/api/url_sanitizer/BUILD.gn index 9c95c65d85a..20084cdb9a2 100644 --- a/ios/browser/api/url_sanitizer/BUILD.gn +++ b/ios/browser/api/url_sanitizer/BUILD.gn @@ -11,7 +11,7 @@ source_set("url_sanitizer") { ] deps = [ "//base", - "//brave/components/url_sanitizer/browser", + "//brave/components/url_sanitizer/core/browser", "//net", "//url", ] diff --git a/ios/browser/api/url_sanitizer/DEPS b/ios/browser/api/url_sanitizer/DEPS index bc0952e1b5c..9114b26b16a 100644 --- a/ios/browser/api/url_sanitizer/DEPS +++ b/ios/browser/api/url_sanitizer/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+brave/components/url_sanitizer/browser", + "+brave/components/url_sanitizer/core/browser", ] diff --git a/ios/browser/api/url_sanitizer/url_sanitizer_service+private.h b/ios/browser/api/url_sanitizer/url_sanitizer_service+private.h index 7e9da06fa9d..35d671b1f68 100644 --- a/ios/browser/api/url_sanitizer/url_sanitizer_service+private.h +++ b/ios/browser/api/url_sanitizer/url_sanitizer_service+private.h @@ -9,7 +9,7 @@ #import #include "base/memory/raw_ptr.h" -#include "brave/components/url_sanitizer/browser/url_sanitizer_service.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_service.h" #include "brave/ios/browser/api/url_sanitizer/url_sanitizer_service.h" NS_ASSUME_NONNULL_BEGIN diff --git a/ios/browser/api/url_sanitizer/url_sanitizer_service.mm b/ios/browser/api/url_sanitizer/url_sanitizer_service.mm index f721d54c6c7..5542e16e8d5 100644 --- a/ios/browser/api/url_sanitizer/url_sanitizer_service.mm +++ b/ios/browser/api/url_sanitizer/url_sanitizer_service.mm @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at https://mozilla.org/MPL/2.0/. -#include "brave/components/url_sanitizer/browser/url_sanitizer_service.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_service.h" #include diff --git a/ios/browser/application_context/BUILD.gn b/ios/browser/application_context/BUILD.gn index 699a7d5cc9b..436ced1112e 100644 --- a/ios/browser/application_context/BUILD.gn +++ b/ios/browser/application_context/BUILD.gn @@ -18,7 +18,7 @@ source_set("application_context") { "//brave/components/brave_wallet/browser", "//brave/components/debounce/core/browser", "//brave/components/https_upgrade_exceptions/browser", - "//brave/components/url_sanitizer/browser", + "//brave/components/url_sanitizer/core/browser", "//brave/ios/browser/brave_wallet", "//components/application_locale_storage", "//ios/chrome/browser/application_context/model", diff --git a/ios/browser/application_context/DEPS b/ios/browser/application_context/DEPS index 919c5b1a587..62fb7b12492 100644 --- a/ios/browser/application_context/DEPS +++ b/ios/browser/application_context/DEPS @@ -4,5 +4,5 @@ include_rules = [ "+brave/components/debounce/core/browser", "+brave/components/brave_wallet/browser", "+brave/components/https_upgrade_exceptions/browser", - "+brave/components/url_sanitizer/browser", + "+brave/components/url_sanitizer/core/browser", ] diff --git a/ios/browser/application_context/brave_application_context_impl.h b/ios/browser/application_context/brave_application_context_impl.h index de137628a56..b4764574fb6 100644 --- a/ios/browser/application_context/brave_application_context_impl.h +++ b/ios/browser/application_context/brave_application_context_impl.h @@ -12,7 +12,7 @@ #include "brave/components/brave_component_updater/browser/brave_component.h" #include "brave/components/debounce/core/browser/debounce_component_installer.h" #include "brave/components/https_upgrade_exceptions/browser/https_upgrade_exceptions_service.h" -#include "brave/components/url_sanitizer/browser/url_sanitizer_component_installer.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_component_installer.h" #include "ios/chrome/browser/application_context/model/application_context_impl.h" namespace base { diff --git a/ios/browser/application_context/brave_application_context_impl.mm b/ios/browser/application_context/brave_application_context_impl.mm index 5b6386e5563..bdb0179dc86 100644 --- a/ios/browser/application_context/brave_application_context_impl.mm +++ b/ios/browser/application_context/brave_application_context_impl.mm @@ -17,7 +17,7 @@ #include "brave/components/brave_wallet/browser/wallet_data_files_installer.h" #include "brave/components/debounce/core/browser/debounce_component_installer.h" #include "brave/components/https_upgrade_exceptions/browser/https_upgrade_exceptions_service.h" -#include "brave/components/url_sanitizer/browser/url_sanitizer_component_installer.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_component_installer.h" #include "brave/ios/browser/brave_wallet/wallet_data_files_installer_delegate_impl.h" #include "components/application_locale_storage/application_locale_storage.h" #include "ios/chrome/browser/shared/model/application_context/application_context.h" diff --git a/ios/browser/url_sanitizer/BUILD.gn b/ios/browser/url_sanitizer/BUILD.gn index 59ab48cedd6..ae21d0d6e91 100644 --- a/ios/browser/url_sanitizer/BUILD.gn +++ b/ios/browser/url_sanitizer/BUILD.gn @@ -11,7 +11,7 @@ source_set("url_sanitizer") { ] deps = [ "//base", - "//brave/components/url_sanitizer/browser", + "//brave/components/url_sanitizer/core/browser", "//brave/ios/browser/api/url_sanitizer", "//brave/ios/browser/application_context", "//brave/ios/browser/keyed_service", diff --git a/ios/browser/url_sanitizer/DEPS b/ios/browser/url_sanitizer/DEPS index bc0952e1b5c..9114b26b16a 100644 --- a/ios/browser/url_sanitizer/DEPS +++ b/ios/browser/url_sanitizer/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+brave/components/url_sanitizer/browser", + "+brave/components/url_sanitizer/core/browser", ] diff --git a/ios/browser/url_sanitizer/url_sanitizer_service_factory.mm b/ios/browser/url_sanitizer/url_sanitizer_service_factory.mm index b69f8052e21..1bdfb54e67a 100644 --- a/ios/browser/url_sanitizer/url_sanitizer_service_factory.mm +++ b/ios/browser/url_sanitizer/url_sanitizer_service_factory.mm @@ -6,8 +6,8 @@ #include "brave/ios/browser/url_sanitizer/url_sanitizer_service_factory.h" #include "base/no_destructor.h" -#include "brave/components/url_sanitizer/browser/url_sanitizer_component_installer.h" -#include "brave/components/url_sanitizer/browser/url_sanitizer_service.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_component_installer.h" +#include "brave/components/url_sanitizer/core/browser/url_sanitizer_service.h" #include "brave/ios/browser/api/url_sanitizer/url_sanitizer_service+private.h" #include "brave/ios/browser/application_context/brave_application_context_impl.h" #include "brave/ios/browser/keyed_service/keyed_service_factory_wrapper+private.h" diff --git a/test/BUILD.gn b/test/BUILD.gn index 0c8de000d35..643a1cebf30 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -271,7 +271,6 @@ test("brave_unit_tests") { "//brave/components/sync/service:unit_tests", "//brave/components/time_period_storage", "//brave/components/tor/buildflags", - "//brave/components/url_sanitizer/browser:unittests", "//brave/components/variations:unit_tests", "//brave/components/version_info:unit_tests", "//brave/components/webcompat/content/browser", @@ -929,7 +928,7 @@ test("brave_browser_tests") { "//brave/components/skus/common", "//brave/components/speedreader/common/buildflags", "//brave/components/tor/buildflags", - "//brave/components/url_sanitizer/browser", + "//brave/components/url_sanitizer/core/browser", "//brave/components/web_discovery/buildflags", "//brave/components/webcompat/core/common", "//brave/renderer/skus:browser_tests",