Merge pull request #19522 from brave/issues/32017

Reload Brave Private Ads resources after Brave Rewards reset
brave · Aug 3, 2023 · 993d991 · 993d991
2 parents 4728ee3 + eadf9f9
commit 993d991
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/components/brave_ads/browser/ads_service_impl.cc b/components/brave_ads/browser/ads_service_impl.cc
@@ -269,10 +269,6 @@ AdsServiceImpl::AdsServiceImpl(
   g_brave_browser_process->resource_component()->AddObserver(this);
 
   rewards_service_->AddObserver(this);
-
-  if (ShouldAlwaysRunService()) {
-    RegisterResourceComponentsForDefaultLocale();
-  }
 }
 
 AdsServiceImpl::~AdsServiceImpl() {
@@ -503,9 +499,7 @@ void AdsServiceImpl::InitializeBatAdsCallback(const bool success) {
 
   is_bat_ads_initialized_ = true;
 
-  if (!ShouldAlwaysRunService()) {
-    RegisterResourceComponentsForDefaultLocale();
-  }
+  RegisterResourceComponentsForDefaultLocale();
 
   BackgroundHelper::GetInstance()->AddObserver(this);
 

diff --git a/components/brave_ads/core/internal/database/database_manager.cc b/components/brave_ads/core/internal/database/database_manager.cc
@@ -8,6 +8,8 @@
 #include <utility>
 
 #include "base/check_op.h"
+#include "base/debug/crash_logging.h"
+#include "base/debug/dump_without_crashing.h"
 #include "base/functional/bind.h"
 #include "brave/components/brave_ads/common/interfaces/brave_ads.mojom.h"
 #include "brave/components/brave_ads/core/internal/ads_client_helper.h"
@@ -19,6 +21,18 @@
 
 namespace brave_ads {
 
+namespace {
+
+// TODO(https://github.com/brave/brave-browser/issues/32066): Remove brave ads
+// migration failure dumps
+void DoDumpWithoutCrashing(const int from_version, const int to_version) {
+  SCOPED_CRASH_KEY_NUMBER("FromVersion", "value", from_version);
+  SCOPED_CRASH_KEY_NUMBER("ToVersion", "value", to_version);
+  base::debug::DumpWithoutCrashing();
+}
+
+}  // namespace
+
 DatabaseManager::DatabaseManager() = default;
 
 DatabaseManager::~DatabaseManager() = default;
@@ -143,6 +157,8 @@ void DatabaseManager::MigrateFromVersionCallback(const int from_version,
   const int to_version = database::kVersion;
 
   if (!success) {
+    DoDumpWithoutCrashing(from_version, to_version);
+
     BLOG(1, "Failed to migrate database from schema version "
                 << from_version << " to schema version " << to_version);
     NotifyFailedToMigrateDatabase(from_version, to_version);