Merge pull request #17472 from /issues/13793

Moved bat-native-ads to components

.github/CODEOWNERS

@@ -37,15 +37,12 @@ components/brave_ads/**/*.mm @brave/ads-client
 components/services/bat_ads/**/*.cc @brave/ads-client
 components/services/bat_ads/**/*.h @brave/ads-client
 components/services/bat_ads/**/*.mm @brave/ads-client
-vendor/bat-native-ads/**/*.cc @brave/ads-client
-vendor/bat-native-ads/**/*.h @brave/ads-client
-vendor/bat-native-ads/**/*.mm @brave/ads-client
-vendor/bat-native-ads/src/bat/ads/internal/privacy/**/*.cc @brave/ads-client
-vendor/bat-native-ads/src/bat/ads/internal/privacy/**/*.h @brave/ads-client
-vendor/bat-native-ads/src/bat/ads/internal/privacy/**/*.mm @brave/ads-client
-vendor/bat-native-ads/src/bat/ads/internal/security/**/*.cc @brave/ads-client
-vendor/bat-native-ads/src/bat/ads/internal/security/**/*.h @brave/ads-client
-vendor/bat-native-ads/src/bat/ads/internal/security/**/*.mm @brave/ads-client
+brave/components/brave_ads/core/internal/privacy/**/*.cc @brave/ads-client
+brave/components/brave_ads/core/internal/privacy/**/*.h @brave/ads-client
+brave/components/brave_ads/core/internal/privacy/**/*.mm @brave/ads-client
+brave/components/brave_ads/core/internal/security/**/*.cc @brave/ads-client
+brave/components/brave_ads/core/internal/security/**/*.h @brave/ads-client
+brave/components/brave_ads/core/internal/security/**/*.mm @brave/ads-client
 
 # Network
 browser/net/ @iefremov

.gitignore

@@ -1,7 +1,6 @@
 .cache/clangd
 /vendor/*
 !/vendor/bat-native-ledger
-!/vendor/bat-native-ads
 .DS_Store
 .brave_gclient_*
 .gclient_*

android/java/org/chromium/base/BraveCommandLineInitUtil.java

@@ -43,7 +43,7 @@ private static void appendBraveSwitchesAndArguments() {
         if (sharedPreferences.getBoolean(PREF_QA_VLOG_REWARDS, false)) {
             qaCommandLine += " --enable-logging=stderr";
             qaCommandLine +=
-                    " --vmodule=*/bat-native-ads/*=6,*/brave_ads/*=6,*/brave_user_model/*=6,*/bat_ads/*=6,*/bat-native-ledger/*=6,*/brave_rewards/*=6";
+                    " --vmodule=*/brave_ads/*=6,*/brave_user_model/*=6,*/bat_ads/*=6,*/bat-native-ledger/*=6,*/brave_rewards/*=6";
         }
 
         // For testing we need custom variations server url prior to the first time run, so we try

browser/BUILD.gn

@@ -48,7 +48,6 @@ group("browser") {
     "//brave/vendor/bat-native-ledger:headers",
 
     # these are layering violation and need to be fixed
-    "//brave/components/brave_ads/test:brave_ads_unit_tests",
     "//brave/components/brave_rewards/browser:testutil",
     "//brave/components/brave_rewards/test:brave_rewards_unit_tests",
     "//brave/components/ipfs/test:*",

browser/brave_ads/DEPS

@@ -1,6 +1,4 @@
 include_rules = [
   "+bat/ledger",
   "-bat/ledger/internal",
-  "+bat/ads",
-  "-bat/ads/internal",
 ]

browser/brave_ads/search_result_ad/search_result_ad_browsertest.cc

@@ -10,11 +10,11 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/test/scoped_feature_list.h"
-#include "bat/ads/public/interfaces/ads.mojom.h"
 #include "brave/browser/brave_ads/search_result_ad/search_result_ad_tab_helper.h"
 #include "brave/components/brave_ads/browser/ads_service.h"
 #include "brave/components/brave_ads/browser/mock_ads_service.h"
 #include "brave/components/brave_ads/common/features.h"
+#include "brave/components/brave_ads/common/interfaces/ads.mojom.h"
 #include "brave/components/constants/brave_paths.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"

browser/brave_rewards/DEPS

@@ -1,5 +1,4 @@
 include_rules = [
   "+bat/ledger",
   "-bat/ledger/internal",
-  "+bat/ads/public",
 ]

browser/brave_rewards/android/brave_rewards_native_worker.h

@@ -19,9 +19,9 @@
 #include "base/types/expected.h"
 #include "bat/ledger/mojom_structs.h"
 #include "bat/ledger/public/interfaces/ledger_types.mojom.h"
+#include "brave/components/brave_ads/common/interfaces/ads.mojom.h"
 #include "brave/components/brave_rewards/browser/rewards_notification_service_observer.h"
 #include "brave/components/brave_rewards/browser/rewards_service_observer.h"
-#include "brave/vendor/bat-native-ads/include/bat/ads/public/interfaces/ads.mojom.h"
 #include "brave/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger_types.mojom.h"
 
 namespace brave_rewards {

browser/extensions/BUILD.gn

@@ -63,6 +63,7 @@ source_set("extensions") {
     "//brave/common/extensions/api",
     "//brave/components/brave_adaptive_captcha",
     "//brave/components/brave_ads/browser",
+    "//brave/components/brave_ads/core",
     "//brave/components/brave_component_updater/browser",
     "//brave/components/brave_rewards/browser",
     "//brave/components/brave_rewards/common",
@@ -78,7 +79,6 @@ source_set("extensions") {
     "//brave/components/ipfs/buildflags",
     "//brave/components/ntp_widget_utils/browser",
     "//brave/components/tor/buildflags",
-    "//brave/vendor/bat-native-ads:headers",
     "//brave/vendor/bat-native-ledger:headers",
     "//chrome/browser/extensions",
     "//chrome/common",

browser/extensions/api/brave_rewards_api.cc

@@ -13,7 +13,6 @@
 #include "base/functional/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/version.h"
-#include "bat/ads/supported_subdivisions.h"
 #include "brave/browser/brave_adaptive_captcha/brave_adaptive_captcha_service_factory.h"
 #include "brave/browser/brave_ads/ads_service_factory.h"
 #include "brave/browser/brave_rewards/rewards_panel/rewards_panel_coordinator.h"
@@ -26,6 +25,7 @@
 #include "brave/common/extensions/api/brave_rewards.h"
 #include "brave/components/brave_adaptive_captcha/brave_adaptive_captcha_service.h"
 #include "brave/components/brave_ads/browser/ads_service.h"
+#include "brave/components/brave_ads/core/supported_subdivisions.h"
 #include "brave/components/brave_rewards/browser/rewards_service.h"
 #include "brave/components/brave_rewards/common/pref_names.h"
 #include "brave/components/brave_rewards/common/rewards_util.h"

browser/extensions/api/brave_rewards_api.h

@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "base/types/expected.h"
-#include "brave/vendor/bat-native-ads/include/bat/ads/public/interfaces/ads.mojom.h"
+#include "brave/components/brave_ads/common/interfaces/ads.mojom.h"
 #include "brave/vendor/bat-native-ledger/include/bat/ledger/mojom_structs.h"
 #include "brave/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger_types.mojom.h"
 #include "extensions/browser/extension_function.h"

browser/sources.gni

@@ -53,7 +53,6 @@ brave_chrome_browser_visibility = [
   "//brave/test:*",
 
   # these are layering violation and need to be fixed
-  "//brave/components/brave_ads/test:*",
   "//brave/components/ipfs/test:*",
 
   # Chrome does not yet define a visibility list by itself, meaning we can't

browser/ui/BUILD.gn

@@ -41,6 +41,7 @@ source_set("favicon_source") {
 source_set("ui") {
   # Remove when https://github.com/brave/brave-browser/issues/10614 is resolved
   check_includes = false
+  deps = []
   public_deps = []
   sources = [
     "webui/brave_adblock_internals_ui.cc",
@@ -224,7 +225,9 @@ source_set("ui") {
       ]
     }
 
-    public_deps += [ "//brave/vendor/bat-native-ads" ]
+    deps += [ "//brave/components/brave_ads/core" ]
+
+    public_deps += [ "//brave/components/brave_ads/common/interfaces" ]
   }
 
   if (toolkit_views) {
@@ -393,7 +396,7 @@ source_set("ui") {
     ]
   }
 
-  deps = [
+  deps += [
     "tabs",
     "//base",
     "//brave/app:command_ids",
@@ -414,7 +417,6 @@ source_set("ui") {
     "//brave/components/brave_adblock_ui:generated_resources",
     "//brave/components/brave_adblock_ui/adblock_internals:generated_resources",
     "//brave/components/brave_ads/browser",
-    "//brave/components/brave_ads/browser",
     "//brave/components/brave_federated",
     "//brave/components/brave_federated/public/interfaces",
     "//brave/components/brave_rewards/browser",

browser/ui/webui/DEPS

@@ -1,6 +1,5 @@
 include_rules = [
   "+chrome/services/qrcode_generator/public/mojom",
   "+chrome/services/qrcode_generator/public/cpp",
-  "+bat/ads/supported_subdivisions.h",
   "+bat/ledger/mojom_structs.h",
 ]

browser/ui/webui/brave_rewards_page_ui.cc

@@ -17,13 +17,13 @@
 #include "base/scoped_observation.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
-#include "bat/ads/supported_subdivisions.h"
 #include "bat/ledger/mojom_structs.h"
 #include "brave/browser/brave_ads/ads_service_factory.h"
 #include "brave/browser/brave_rewards/rewards_service_factory.h"
 #include "brave/browser/ui/webui/brave_webui_source.h"
 #include "brave/components/brave_ads/browser/ads_service.h"
 #include "brave/components/brave_ads/common/pref_names.h"
+#include "brave/components/brave_ads/core/supported_subdivisions.h"
 #include "brave/components/brave_rewards/browser/rewards_notification_service.h"
 #include "brave/components/brave_rewards/browser/rewards_notification_service_observer.h"
 #include "brave/components/brave_rewards/browser/rewards_service.h"

chromium_presubmit_config.json5

@@ -74,7 +74,7 @@
     "CheckForRelativeIncludes": ["chromium_src/"],
     "CheckParseErrors": [
       ".*tsconfig\\.json",
-      "vendor/bat-native-ads/data/test/invalid\\.json",
+      "components/brave_ads/core/test/data/invalid\\.json",
     ],
 
     // Checks to be fixed.
@@ -299,6 +299,10 @@
       "components/cosmetic_filters/renderer/cosmetic_filters_js_handler\\.h",
       "components/speedreader/renderer/speedreader_js_handler\\.h",
     ],
+    // A temporary fix to silence a crashing presubmit check on a deleted file.
+    "CheckStableMojomChanges": [
+      "components/services/bat_ads/public/interfaces/bat_ads\\.mojom",
+    ],
     "CheckWebDevStyle": [
       "components/speedreader/resources/speedreader-desktop.css",
       "components/speedreader/resources/third_party/",

common/extensions/api/BUILD.gn

@@ -1,3 +1,8 @@
+# Copyright (c) 2023 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of 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/.
+
 import("//brave/browser/ethereum_remote_client/buildflags/buildflags.gni")
 import("//brave/components/ipfs/buildflags/buildflags.gni")
 import("//brave/resources/brave_grit.gni")
@@ -97,7 +102,7 @@ function_registration("generated_api_registration") {
   root_namespace = brave_extensions_api_root_namespace
 
   deps = [
-    "//brave/vendor/bat-native-ads/include/bat/ads/public/interfaces",
+    "//brave/components/brave_ads/common/interfaces",
     "//brave/vendor/bat-native-ledger/include/bat/ledger/public/interfaces",
     "//extensions/common",
   ]

components/brave_ads/browser/BUILD.gn

@@ -31,6 +31,7 @@ source_set("browser") {
     "//base",
     "//brave/components/brave_adaptive_captcha",
     "//brave/components/brave_ads/common",
+    "//brave/components/brave_ads/core",
     "//brave/components/brave_ads/resources",
     "//brave/components/brave_component_updater/browser",
     "//brave/components/l10n/common",
@@ -45,7 +46,7 @@ source_set("browser") {
     "//url",
   ]
 
-  public_deps = [ "//brave/vendor/bat-native-ads" ]
+  public_deps = [ "//brave/components/brave_ads/common/interfaces" ]
 
   # TODO(https://github.com/brave/brave-browser/issues/24163)
   check_includes = false

components/brave_ads/browser/DEPS

@@ -1,7 +1,5 @@
 
 include_rules = [
-  "+bat/ads",
-  "-bat/ads/internal",
   "+bat/ledger/mojom_structs.h",
   "+brave/components/constants",
   "+content/public/browser",

components/brave_ads/browser/ads_service.h

@@ -14,8 +14,8 @@
 #include "base/values.h"
 #include "brave/components/brave_ads/browser/ads_service_callback.h"
 #include "brave/components/brave_ads/browser/ads_service_observer.h"
-#include "brave/vendor/bat-native-ads/include/bat/ads/new_tab_page_ad_info.h"
-#include "brave/vendor/bat-native-ads/include/bat/ads/public/interfaces/ads.mojom.h"  // IWYU pragma: keep
+#include "brave/components/brave_ads/common/interfaces/ads.mojom.h"  // IWYU pragma: keep
+#include "brave/components/brave_ads/core/new_tab_page_ad_info.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/sessions/core/session_id.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"

components/brave_ads/browser/ads_service_callback.h

@@ -10,7 +10,7 @@
 
 #include "base/functional/callback.h"
 #include "base/values.h"
-#include "brave/vendor/bat-native-ads/include/bat/ads/public/interfaces/ads.mojom-forward.h"
+#include "brave/components/brave_ads/common/interfaces/ads.mojom-forward.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace brave_ads {

components/brave_ads/browser/ads_service_impl.cc

@@ -28,14 +28,6 @@
 #include "base/task/sequenced_task_runner.h"
 #include "base/task/thread_pool.h"
 #include "base/timer/timer.h"
-#include "bat/ads/ad_constants.h"
-#include "bat/ads/ads.h"
-#include "bat/ads/database.h"
-#include "bat/ads/new_tab_page_ad_info.h"
-#include "bat/ads/new_tab_page_ad_value_util.h"
-#include "bat/ads/notification_ad_info.h"
-#include "bat/ads/notification_ad_value_util.h"
-#include "bat/ads/resources/grit/bat_ads_resources.h"
 #include "brave/browser/brave_ads/notification_helper/notification_helper.h"
 #include "brave/browser/brave_ads/notifications/notification_ad_platform_bridge.h"
 #include "brave/browser/brave_browser_process.h"
@@ -50,6 +42,14 @@
 #include "brave/components/brave_ads/common/constants.h"
 #include "brave/components/brave_ads/common/features.h"
 #include "brave/components/brave_ads/common/pref_names.h"
+#include "brave/components/brave_ads/core/ad_constants.h"
+#include "brave/components/brave_ads/core/ads.h"
+#include "brave/components/brave_ads/core/database.h"
+#include "brave/components/brave_ads/core/new_tab_page_ad_info.h"
+#include "brave/components/brave_ads/core/new_tab_page_ad_value_util.h"
+#include "brave/components/brave_ads/core/notification_ad_info.h"
+#include "brave/components/brave_ads/core/notification_ad_value_util.h"
+#include "brave/components/brave_ads/resources/grit/bat_ads_resources.h"
 #include "brave/components/brave_federated/data_stores/async_data_store.h"
 #include "brave/components/brave_news/common/features.h"
 #include "brave/components/brave_news/common/pref_names.h"

components/brave_ads/browser/ads_service_impl.h

@@ -19,11 +19,11 @@
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "bat/ads/public/interfaces/ads.mojom.h"
 #include "brave/browser/brave_ads/background_helper/background_helper.h"
 #include "brave/components/brave_adaptive_captcha/brave_adaptive_captcha_service.h"
 #include "brave/components/brave_ads/browser/ads_service.h"
 #include "brave/components/brave_ads/browser/component_updater/resource_component_observer.h"
+#include "brave/components/brave_ads/common/interfaces/ads.mojom.h"
 #include "brave/components/services/bat_ads/public/interfaces/bat_ads.mojom.h"
 #include "brave/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.mojom-forward.h"
 #include "components/history/core/browser/history_service.h"

components/brave_ads/browser/frequency_capping_helper.h

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/memory/singleton.h"
-#include "bat/ads/ad_event_history.h"
+#include "brave/components/brave_ads/core/ad_event_history.h"
 
 namespace base {
 class Time;

components/brave_ads/common/constants.h

@@ -9,7 +9,7 @@
 #include <cstdint>
 
 // TODO(https://github.com/brave/brave-browser/issues/13793): Rename ads
-// namespace to brave_ads when bat-native-ads is moved to components/brave_ads
+// namespace to brave_ads
 namespace ads {
 
 // Brave Ads current version number

components/brave_ads/common/pref_names.cc

@@ -41,8 +41,7 @@ const char kSupportedCountryCodesLastSchemaVersion[] =
 }  // namespace brave_ads::prefs
 
 // TODO(https://github.com/brave/brave-browser/issues/13793): Rename ads::prefs
-// namespace to brave_ads::prefs when bat-native-ads is moved to
-// components/brave_ads
+// namespace to brave_ads::prefs
 namespace ads::prefs {
 
 // Stores whether Brave ads is enabled or disabled

components/brave_ads/common/pref_names.h

@@ -28,8 +28,7 @@ extern const char kSupportedCountryCodesLastSchemaVersion[];
 }  // namespace brave_ads::prefs
 
 // TODO(https://github.com/brave/brave-browser/issues/13793): Rename ads::prefs
-// namespace to brave_ads::prefs when bat-native-ads is moved to
-// components/brave_ads
+// namespace to brave_ads::prefs
 namespace ads::prefs {
 
 // Brave Ads enabled/disabled pref

components/brave_ads/content/browser/BUILD.gn

@@ -13,7 +13,7 @@ static_library("browser") {
     "//base",
     "//brave/components/brave_ads/browser",
     "//brave/components/brave_ads/common",
-    "//brave/components/brave_ads/core/browser",
+    "//brave/components/brave_ads/core",
     "//brave/components/brave_search/common",
     "//components/schema_org/common:mojom",
     "//content/public/browser",
@@ -24,7 +24,7 @@ static_library("browser") {
   ]
 
   public_deps = [
-    "//brave/vendor/bat-native-ads",
+    "//brave/components/brave_ads/common/interfaces",
     "//third_party/blink/public/mojom:mojom_platform_headers",
   ]
 }

components/brave_ads/content/browser/search_result_ad/search_result_ad_handler.cc

@@ -12,10 +12,10 @@
 #include "base/ranges/algorithm.h"
 #include "brave/components/brave_ads/browser/ads_service.h"
 #include "brave/components/brave_ads/common/features.h"
-#include "brave/components/brave_ads/core/browser/search_result_ad/search_result_ad_converting_util.h"
-#include "brave/components/brave_ads/core/browser/search_result_ad/search_result_ad_util.h"
+#include "brave/components/brave_ads/common/interfaces/ads.mojom.h"
+#include "brave/components/brave_ads/core/search_result_ad/search_result_ad_converting_util.h"
+#include "brave/components/brave_ads/core/search_result_ad/search_result_ad_util.h"
 #include "brave/components/brave_search/common/brave_search_utils.h"
-#include "brave/vendor/bat-native-ads/include/bat/ads/public/interfaces/ads.mojom.h"
 #include "content/public/browser/render_frame_host.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"

components/brave_ads/content/browser/search_result_ad/search_result_ad_handler.h

@@ -13,7 +13,7 @@
 #include "base/containers/flat_map.h"
 #include "base/memory/raw_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "brave/vendor/bat-native-ads/include/bat/ads/public/interfaces/ads.mojom-forward.h"
+#include "brave/components/brave_ads/common/interfaces/ads.mojom-forward.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/blink/public/mojom/document_metadata/document_metadata.mojom.h"