2424#include " brave/components/brave_ads/core/internal/common/logging_util.h"
2525#include " brave/components/brave_ads/core/internal/prefs/pref_path_util.h"
2626#include " brave/components/brave_ads/core/internal/settings/settings.h"
27- #include " brave/components/brave_ads/core/mojom/brave_ads.mojom.h" // IWYU pragma: keep
28- #include " brave/components/brave_ads/core/public/ad_units/ad_type.h"
27+ #include " brave/components/brave_ads/core/mojom/brave_ads.mojom.h"
2928#include " brave/components/brave_ads/core/public/ads_client/ads_client.h"
3029
3130namespace brave_ads {
@@ -77,89 +76,96 @@ void Account::GetStatement(GetStatementOfAccountsCallback callback) {
7776 return BuildStatement (std::move (callback));
7877}
7978
80- void Account::Deposit (const std::string& creative_instance_id,
81- const std::string& segment,
82- const AdType ad_type,
83- const ConfirmationType confirmation_type) const {
84- DepositWithUserData (creative_instance_id, segment, ad_type, confirmation_type,
79+ void Account::Deposit (
80+ const std::string& creative_instance_id,
81+ const std::string& segment,
82+ const mojom::AdType mojom_ad_type,
83+ const mojom::ConfirmationType mojom_confirmation_type) const {
84+ DepositWithUserData (creative_instance_id, segment, mojom_ad_type,
85+ mojom_confirmation_type,
8586 /* user_data=*/ base::Value::Dict ());
8687}
8788
88- void Account::DepositWithUserData (const std::string& creative_instance_id,
89- const std::string& segment,
90- const AdType ad_type,
91- const ConfirmationType confirmation_type,
92- base::Value::Dict user_data) const {
89+ void Account::DepositWithUserData (
90+ const std::string& creative_instance_id,
91+ const std::string& segment,
92+ const mojom::AdType mojom_ad_type,
93+ const mojom::ConfirmationType mojom_confirmation_type,
94+ base::Value::Dict user_data) const {
9395 CHECK (!creative_instance_id.empty ());
94- CHECK_NE (AdType::kUndefined , ad_type );
95- CHECK_NE (ConfirmationType::kUndefined , confirmation_type );
96+ CHECK_NE (mojom:: AdType::kUndefined , mojom_ad_type );
97+ CHECK_NE (mojom:: ConfirmationType::kUndefined , mojom_confirmation_type );
9698
97- if (!IsAllowedToDeposit (ad_type, confirmation_type )) {
99+ if (!IsAllowedToDeposit (mojom_ad_type, mojom_confirmation_type )) {
98100 return ;
99101 }
100102
101103 const std::unique_ptr<DepositInterface> deposit =
102- DepositsFactory::Build (confirmation_type );
104+ DepositsFactory::Build (mojom_confirmation_type );
103105 if (!deposit) {
104106 return ;
105107 }
106108
107109 deposit->GetValue (
108110 creative_instance_id,
109111 base::BindOnce (&Account::DepositCallback, weak_factory_.GetWeakPtr (),
110- creative_instance_id, segment, ad_type, confirmation_type ,
111- std::move (user_data)));
112+ creative_instance_id, segment, mojom_ad_type ,
113+ mojom_confirmation_type, std::move (user_data)));
112114}
113115
114116// /////////////////////////////////////////////////////////////////////////////
115117
116- void Account::DepositCallback (const std::string& creative_instance_id,
117- const std::string& segment,
118- const AdType ad_type,
119- const ConfirmationType confirmation_type,
120- base::Value::Dict user_data,
121- const bool success,
122- const double value) const {
118+ void Account::DepositCallback (
119+ const std::string& creative_instance_id,
120+ const std::string& segment,
121+ const mojom::AdType mojom_ad_type,
122+ const mojom::ConfirmationType mojom_confirmation_type,
123+ base::Value::Dict user_data,
124+ const bool success,
125+ const double value) const {
123126 if (!success) {
124- return FailedToProcessDeposit (creative_instance_id, ad_type ,
125- confirmation_type );
127+ return FailedToProcessDeposit (creative_instance_id, mojom_ad_type ,
128+ mojom_confirmation_type );
126129 }
127130
128- ProcessDeposit (creative_instance_id, segment, value, ad_type ,
129- confirmation_type , std::move (user_data));
131+ ProcessDeposit (creative_instance_id, segment, value, mojom_ad_type ,
132+ mojom_confirmation_type , std::move (user_data));
130133}
131134
132- void Account::ProcessDeposit (const std::string& creative_instance_id,
133- const std::string& segment,
134- const double value,
135- const AdType ad_type,
136- const ConfirmationType confirmation_type,
137- base::Value::Dict user_data) const {
135+ void Account::ProcessDeposit (
136+ const std::string& creative_instance_id,
137+ const std::string& segment,
138+ const double value,
139+ const mojom::AdType mojom_ad_type,
140+ const mojom::ConfirmationType mojom_confirmation_type,
141+ base::Value::Dict user_data) const {
138142 if (!UserHasJoinedBraveRewards ()) {
139143 // If the user has not joined Brave Rewards, there's no need to record
140144 // transactions.
141145 return SuccessfullyProcessedDeposit (
142- BuildTransaction (creative_instance_id, segment, value, ad_type ,
143- confirmation_type ),
146+ BuildTransaction (creative_instance_id, segment, value, mojom_ad_type ,
147+ mojom_confirmation_type ),
144148 std::move (user_data));
145149 }
146150
147- AddTransaction (
148- creative_instance_id, segment, value, ad_type, confirmation_type,
149- base::BindOnce (&Account::ProcessDepositCallback,
150- weak_factory_.GetWeakPtr (), creative_instance_id, ad_type,
151- confirmation_type, std::move (user_data)));
151+ AddTransaction (creative_instance_id, segment, value, mojom_ad_type,
152+ mojom_confirmation_type,
153+ base::BindOnce (&Account::ProcessDepositCallback,
154+ weak_factory_.GetWeakPtr (),
155+ creative_instance_id, mojom_ad_type,
156+ mojom_confirmation_type, std::move (user_data)));
152157}
153158
154- void Account::ProcessDepositCallback (const std::string& creative_instance_id,
155- const AdType ad_type,
156- const ConfirmationType confirmation_type,
157- base::Value::Dict user_data,
158- const bool success,
159- const TransactionInfo& transaction) const {
159+ void Account::ProcessDepositCallback (
160+ const std::string& creative_instance_id,
161+ const mojom::AdType mojom_ad_type,
162+ const mojom::ConfirmationType mojom_confirmation_type,
163+ base::Value::Dict user_data,
164+ const bool success,
165+ const TransactionInfo& transaction) const {
160166 if (!success) {
161- return FailedToProcessDeposit (creative_instance_id, ad_type ,
162- confirmation_type );
167+ return FailedToProcessDeposit (creative_instance_id, mojom_ad_type ,
168+ mojom_confirmation_type );
163169 }
164170
165171 SuccessfullyProcessedDeposit (transaction, std::move (user_data));
@@ -182,14 +188,14 @@ void Account::SuccessfullyProcessedDeposit(const TransactionInfo& transaction,
182188
183189void Account::FailedToProcessDeposit (
184190 const std::string& creative_instance_id,
185- const AdType ad_type ,
186- const ConfirmationType confirmation_type ) const {
191+ const mojom:: AdType mojom_ad_type ,
192+ const mojom:: ConfirmationType mojom_confirmation_type ) const {
187193 BLOG (0 , " Failed to process deposit for "
188- << ad_type << " with creative instance id "
189- << creative_instance_id << " and " confirmation_type );
194+ << mojom_ad_type << " with creative instance id "
195+ << creative_instance_id << " and " mojom_confirmation_type );
190196
191- NotifyFailedToProcessDeposit (creative_instance_id, ad_type ,
192- confirmation_type );
197+ NotifyFailedToProcessDeposit (creative_instance_id, mojom_ad_type ,
198+ mojom_confirmation_type );
193199}
194200
195201void Account::Initialize () {
@@ -255,11 +261,11 @@ void Account::NotifyDidProcessDeposit(
255261
256262void Account::NotifyFailedToProcessDeposit (
257263 const std::string& creative_instance_id,
258- const AdType ad_type ,
259- const ConfirmationType confirmation_type ) const {
264+ const mojom:: AdType mojom_ad_type ,
265+ const mojom:: ConfirmationType mojom_confirmation_type ) const {
260266 for (AccountObserver& observer : observers_) {
261- observer.OnFailedToProcessDeposit (creative_instance_id, ad_type ,
262- confirmation_type );
267+ observer.OnFailedToProcessDeposit (creative_instance_id, mojom_ad_type ,
268+ mojom_confirmation_type );
263269 }
264270}
265271
0 commit comments