diff --git a/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog.cc b/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog.cc index 2a8ec937b418..ddf16392c99d 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog.cc @@ -10,7 +10,7 @@ #include #include -#include "base/check_op.h" +#include "base/check.h" #include "base/time/time.h" #include "bat/ads/ads.h" #include "bat/ads/internal/ads_client_helper.h" @@ -19,14 +19,12 @@ #include "bat/ads/internal/base/time/time_formatting_util.h" #include "bat/ads/internal/base/url/url_request_string_util.h" #include "bat/ads/internal/base/url/url_response_string_util.h" -#include "bat/ads/internal/browser/browser_manager.h" #include "bat/ads/internal/catalog/catalog_constants.h" #include "bat/ads/internal/catalog/catalog_info.h" #include "bat/ads/internal/catalog/catalog_json_reader.h" #include "bat/ads/internal/catalog/catalog_url_request_builder.h" #include "bat/ads/internal/catalog/catalog_util.h" #include "bat/ads/internal/database/database_manager.h" -#include "bat/ads/internal/user_interaction/idle_detection/idle_detection_manager.h" namespace ads { @@ -39,15 +37,11 @@ constexpr base::TimeDelta kDebugCatalogPing = base::Minutes(15); } // namespace Catalog::Catalog() { - BrowserManager::GetInstance()->AddObserver(this); DatabaseManager::GetInstance()->AddObserver(this); - IdleDetectionManager::GetInstance()->AddObserver(this); } Catalog::~Catalog() { - BrowserManager::GetInstance()->RemoveObserver(this); DatabaseManager::GetInstance()->RemoveObserver(this); - IdleDetectionManager::GetInstance()->RemoveObserver(this); } void Catalog::AddObserver(CatalogObserver* observer) { @@ -182,24 +176,9 @@ void Catalog::NotifyFailedToUpdateCatalog() const { } } -void Catalog::OnBrowserDidEnterForeground() { - if (HasCatalogExpired()) { - MaybeFetch(); - } -} - void Catalog::OnDidMigrateDatabase(const int from_version, const int to_version) { - DCHECK_NE(from_version, to_version); - ResetCatalog(); } -void Catalog::OnUserDidBecomeActive(const base::TimeDelta idle_time, - const bool was_locked) { - if (HasCatalogExpired()) { - MaybeFetch(); - } -} - } // namespace ads diff --git a/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog.h b/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog.h index cee27b12f2c9..fedfbe633114 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog.h +++ b/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog.h @@ -9,10 +9,8 @@ #include "base/observer_list.h" #include "bat/ads/internal/base/timer/backoff_timer.h" #include "bat/ads/internal/base/timer/timer.h" -#include "bat/ads/internal/browser/browser_manager_observer.h" #include "bat/ads/internal/catalog/catalog_observer.h" #include "bat/ads/internal/database/database_manager_observer.h" -#include "bat/ads/internal/user_interaction/idle_detection/idle_detection_manager_observer.h" #include "bat/ads/public/interfaces/ads.mojom.h" namespace base { @@ -23,9 +21,7 @@ namespace ads { struct CatalogInfo; -class Catalog final : public BrowserManagerObserver, - public DatabaseManagerObserver, - public IdleDetectionManagerObserver { +class Catalog final : public DatabaseManagerObserver { public: Catalog(); Catalog(const Catalog&) = delete; @@ -48,17 +44,10 @@ class Catalog final : public BrowserManagerObserver, void NotifyDidUpdateCatalog(const CatalogInfo& catalog) const; void NotifyFailedToUpdateCatalog() const; - // BrowserManagerObserver: - void OnBrowserDidEnterForeground() override; - // DatabaseManagerObserver: void OnDidMigrateDatabase(const int from_version, const int to_version) override; - // IdleDetectionManagerObserver: - void OnUserDidBecomeActive(const base::TimeDelta idle_time, - const bool was_locked) override; - base::ObserverList observers_; bool is_processing_ = false; diff --git a/vendor/bat-native-ads/src/bat/ads/internal/database/database_manager.cc b/vendor/bat-native-ads/src/bat/ads/internal/database/database_manager.cc index 6b12b33df754..abc283fb876b 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/database/database_manager.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/database/database_manager.cc @@ -8,7 +8,7 @@ #include #include -#include "base/check.h" +#include "base/check_op.h" #include "bat/ads/internal/ads_client_helper.h" #include "bat/ads/internal/base/logging_util.h" #include "bat/ads/internal/legacy_migration/database/database_constants.h" @@ -157,6 +157,8 @@ void DatabaseManager::NotifyWillMigrateDatabase(const int from_version, void DatabaseManager::NotifyDidMigrateDatabase(const int from_version, const int to_version) const { + DCHECK_NE(from_version, to_version); + for (DatabaseManagerObserver& observer : observers_) { observer.OnDidMigrateDatabase(from_version, to_version); }