From a27e4ef079f53780023fddfb0f62f080f27de1af Mon Sep 17 00:00:00 2001 From: zenparsing Date: Tue, 26 Mar 2024 11:17:43 -0400 Subject: [PATCH] Rename RewardsEngineImpl to brave_rewards::internal::RewardsEngine --- components/brave_rewards/core/BUILD.gn | 4 +- .../brave_rewards/core/bitflyer/bitflyer.cc | 4 +- .../brave_rewards/core/bitflyer/bitflyer.h | 4 +- .../core/common/environment_config.cc | 2 +- .../core/common/environment_config.h | 2 +- .../brave_rewards/core/common/random_util.cc | 2 +- .../brave_rewards/core/common/url_loader.cc | 2 +- .../brave_rewards/core/common/url_loader.h | 2 +- .../core/contribution/contribution.cc | 4 +- .../core/contribution/contribution.h | 6 +- .../core/contribution/contribution_ac.cc | 4 +- .../core/contribution/contribution_ac.h | 6 +- .../contribution_external_wallet.cc | 5 +- .../contribution_external_wallet.h | 6 +- .../core/contribution/contribution_monthly.cc | 4 +- .../core/contribution/contribution_monthly.h | 6 +- .../core/contribution/contribution_sku.cc | 4 +- .../core/contribution/contribution_sku.h | 6 +- .../core/contribution/contribution_tip.cc | 4 +- .../core/contribution/contribution_tip.h | 6 +- .../contribution/contribution_unblinded.cc | 7 +- .../contribution/contribution_unblinded.h | 6 +- .../contribution_unblinded_unittest.cc | 4 +- .../core/credentials/credentials_common.cc | 5 +- .../core/credentials/credentials_common.h | 6 +- .../core/credentials/credentials_sku.cc | 4 +- .../core/credentials/credentials_sku.h | 4 +- .../core/credentials/credentials_util.cc | 4 +- .../core/credentials/credentials_util.h | 4 +- .../brave_rewards/core/database/database.cc | 4 +- .../brave_rewards/core/database/database.h | 6 +- .../core/database/database_activity_info.cc | 4 +- .../core/database/database_activity_info.h | 2 +- .../database_activity_info_unittest.cc | 4 +- .../core/database/database_balance_report.cc | 4 +- .../core/database/database_balance_report.h | 2 +- .../database_balance_report_info_unittest.cc | 4 +- .../database/database_contribution_info.cc | 4 +- .../database/database_contribution_info.h | 2 +- .../database_contribution_info_publishers.cc | 4 +- .../database_contribution_info_publishers.h | 2 +- .../database/database_contribution_queue.cc | 4 +- .../database/database_contribution_queue.h | 2 +- .../database_contribution_queue_publishers.cc | 4 +- .../database_contribution_queue_publishers.h | 2 +- .../core/database/database_creds_batch.cc | 4 +- .../core/database/database_creds_batch.h | 2 +- .../core/database/database_event_log.cc | 4 +- .../core/database/database_event_log.h | 2 +- .../database_external_transactions.cc | 4 +- .../database/database_external_transactions.h | 2 +- .../core/database/database_initialize.cc | 4 +- .../core/database/database_initialize.h | 6 +- .../database/database_media_publisher_info.cc | 5 +- .../database/database_media_publisher_info.h | 2 +- .../core/database/database_migration.cc | 5 +- .../core/database/database_migration.h | 6 +- .../database/database_migration_unittest.cc | 2 +- .../core/database/database_mock.cc | 2 +- .../core/database/database_mock.h | 2 +- .../core/database/database_publisher_info.cc | 4 +- .../core/database/database_publisher_info.h | 2 +- .../database_publisher_prefix_list.cc | 5 +- .../database/database_publisher_prefix_list.h | 2 +- ...database_publisher_prefix_list_unittest.cc | 4 +- .../core/database/database_recurring_tip.cc | 4 +- .../core/database/database_recurring_tip.h | 2 +- .../database_server_publisher_banner.cc | 4 +- .../database_server_publisher_banner.h | 2 +- .../database_server_publisher_info.cc | 5 +- .../database/database_server_publisher_info.h | 2 +- .../database_server_publisher_links.cc | 4 +- .../database_server_publisher_links.h | 2 +- .../core/database/database_sku_order.cc | 4 +- .../core/database/database_sku_order.h | 2 +- .../core/database/database_sku_order_items.cc | 4 +- .../core/database/database_sku_order_items.h | 2 +- .../core/database/database_sku_transaction.cc | 4 +- .../core/database/database_sku_transaction.h | 2 +- .../core/database/database_table.cc | 4 +- .../core/database/database_table.h | 6 +- .../core/database/database_unblinded_token.cc | 4 +- .../core/database/database_unblinded_token.h | 2 +- .../core/endpoint/bitflyer/bitflyer_server.cc | 4 +- .../core/endpoint/bitflyer/bitflyer_server.h | 4 +- .../get_balance/get_balance_bitflyer.cc | 4 +- .../get_balance/get_balance_bitflyer.h | 6 +- .../get_balance_bitflyer_unittest.cc | 4 +- .../post_oauth/post_oauth_bitflyer.cc | 4 +- .../bitflyer/post_oauth/post_oauth_bitflyer.h | 6 +- .../post_oauth_bitflyer_unittest.cc | 4 +- .../core/endpoint/gemini/gemini_server.cc | 4 +- .../core/endpoint/gemini/gemini_server.h | 4 +- .../post_account/post_account_gemini.cc | 4 +- .../gemini/post_account/post_account_gemini.h | 6 +- .../post_account_gemini_unittest.cc | 4 +- .../post_balance/post_balance_gemini.cc | 4 +- .../gemini/post_balance/post_balance_gemini.h | 6 +- .../post_balance_gemini_unittest.cc | 4 +- .../gemini/post_oauth/post_oauth_gemini.cc | 4 +- .../gemini/post_oauth/post_oauth_gemini.h | 6 +- .../post_oauth/post_oauth_gemini_unittest.cc | 4 +- .../post_recipient_id_gemini.cc | 4 +- .../post_recipient_id_gemini.h | 6 +- .../post_recipient_id_gemini_unittest.cc | 4 +- .../get_credentials/get_credentials.cc | 4 +- .../payment/get_credentials/get_credentials.h | 6 +- .../get_credentials_unittest.cc | 4 +- .../core/endpoint/payment/payment_server.cc | 4 +- .../core/endpoint/payment/payment_server.h | 4 +- .../post_credentials/post_credentials.cc | 4 +- .../post_credentials/post_credentials.h | 6 +- .../post_credentials_unittest.cc | 4 +- .../endpoint/payment/post_order/post_order.cc | 4 +- .../endpoint/payment/post_order/post_order.h | 6 +- .../payment/post_order/post_order_unittest.cc | 4 +- .../post_transaction_sku_gemini.cc | 4 +- .../post_transaction_sku_gemini.h | 6 +- .../post_transaction_sku_gemini_unittest.cc | 4 +- .../post_transaction_uphold.cc | 4 +- .../post_transaction_uphold.h | 6 +- .../post_transaction_uphold_unittest.cc | 4 +- .../endpoint/payment/post_votes/post_votes.cc | 4 +- .../endpoint/payment/post_votes/post_votes.h | 6 +- .../payment/post_votes/post_votes_unittest.cc | 4 +- .../get_publisher/get_publisher.cc | 4 +- .../private_cdn/get_publisher/get_publisher.h | 6 +- .../private_cdn/private_cdn_server.cc | 4 +- .../endpoint/private_cdn/private_cdn_server.h | 4 +- .../get_prefix_list/get_prefix_list.cc | 4 +- .../rewards/get_prefix_list/get_prefix_list.h | 6 +- .../get_prefix_list_unittest.cc | 4 +- .../core/endpoint/rewards/rewards_server.cc | 4 +- .../core/endpoint/rewards/rewards_server.h | 4 +- .../get_capabilities/get_capabilities.cc | 4 +- .../get_capabilities/get_capabilities.h | 6 +- .../get_capabilities_unittest.cc | 4 +- .../core/endpoint/uphold/get_card/get_card.cc | 4 +- .../core/endpoint/uphold/get_card/get_card.h | 6 +- .../uphold/get_card/get_card_unittest.cc | 4 +- .../endpoint/uphold/get_cards/get_cards.cc | 4 +- .../endpoint/uphold/get_cards/get_cards.h | 6 +- .../uphold/get_cards/get_cards_unittest.cc | 4 +- .../core/endpoint/uphold/get_me/get_me.cc | 4 +- .../core/endpoint/uphold/get_me/get_me.h | 6 +- .../endpoint/uphold/get_me/get_me_unittest.cc | 4 +- .../endpoint/uphold/patch_card/patch_card.cc | 4 +- .../endpoint/uphold/patch_card/patch_card.h | 6 +- .../uphold/patch_card/patch_card_unittest.cc | 4 +- .../endpoint/uphold/post_cards/post_cards.cc | 4 +- .../endpoint/uphold/post_cards/post_cards.h | 6 +- .../uphold/post_cards/post_cards_unittest.cc | 4 +- .../core/endpoint/uphold/uphold_server.cc | 4 +- .../core/endpoint/uphold/uphold_server.h | 4 +- .../post_commit_transaction_bitflyer.cc | 6 +- .../post_commit_transaction_bitflyer.h | 2 +- ...st_commit_transaction_bitflyer_unittest.cc | 4 +- .../core/endpoints/brave/get_parameters.cc | 9 +- .../core/endpoints/brave/get_parameters.h | 6 +- .../brave/get_parameters_unittest.cc | 8 +- .../core/endpoints/brave/get_wallet.cc | 8 +- .../core/endpoints/brave/get_wallet.h | 6 +- .../core/endpoints/brave/patch_wallets.cc | 8 +- .../core/endpoints/brave/patch_wallets.h | 6 +- .../endpoints/brave/patch_wallets_unittest.cc | 4 +- .../core/endpoints/brave/post_challenges.cc | 2 +- .../core/endpoints/brave/post_challenges.h | 2 +- .../endpoints/brave/post_connect_bitflyer.cc | 4 +- .../endpoints/brave/post_connect_bitflyer.h | 4 +- .../endpoints/brave/post_connect_gemini.cc | 4 +- .../endpoints/brave/post_connect_gemini.h | 4 +- .../endpoints/brave/post_connect_uphold.cc | 4 +- .../endpoints/brave/post_connect_uphold.h | 4 +- .../endpoints/brave/post_connect_zebpay.cc | 4 +- .../endpoints/brave/post_connect_zebpay.h | 4 +- .../core/endpoints/brave/post_wallets.cc | 8 +- .../core/endpoints/brave/post_wallets.h | 7 +- .../endpoints/brave/post_wallets_unittest.cc | 4 +- .../common/get_transaction_status.cc | 2 +- .../endpoints/common/get_transaction_status.h | 4 +- .../common/post_commit_transaction.cc | 2 +- .../common/post_commit_transaction.h | 4 +- .../core/endpoints/common/post_connect.cc | 10 +- .../core/endpoints/common/post_connect.h | 6 +- .../endpoints/common/post_connect_unittest.cc | 6 +- .../common/post_create_transaction.cc | 2 +- .../common/post_create_transaction.h | 4 +- .../gemini/get_recipient_id_gemini.cc | 8 +- .../gemini/get_recipient_id_gemini.h | 6 +- .../get_recipient_id_gemini_unittest.cc | 4 +- .../gemini/post_commit_transaction_gemini.cc | 6 +- .../gemini/post_commit_transaction_gemini.h | 2 +- ...post_commit_transaction_gemini_unittest.cc | 4 +- .../core/endpoints/request_builder.cc | 2 +- .../core/endpoints/request_builder.h | 6 +- .../core/endpoints/request_for.h | 8 +- .../core/endpoints/response_handler.h | 4 +- .../uphold/get_transaction_status_uphold.cc | 4 +- .../uphold/get_transaction_status_uphold.h | 2 +- .../get_transaction_status_uphold_unittest.cc | 4 +- .../uphold/post_commit_transaction_uphold.cc | 6 +- .../uphold/post_commit_transaction_uphold.h | 2 +- ...post_commit_transaction_uphold_unittest.cc | 4 +- .../uphold/post_create_transaction_uphold.cc | 6 +- .../uphold/post_create_transaction_uphold.h | 2 +- ...post_create_transaction_uphold_unittest.cc | 4 +- .../endpoints/uphold/post_oauth_uphold.cc | 9 +- .../core/endpoints/uphold/post_oauth_uphold.h | 6 +- .../uphold/post_oauth_uphold_unittest.cc | 4 +- .../endpoints/zebpay/get_balance_zebpay.cc | 9 +- .../endpoints/zebpay/get_balance_zebpay.h | 6 +- .../zebpay/get_balance_zebpay_unittest.cc | 4 +- .../endpoints/zebpay/post_oauth_zebpay.cc | 12 +- .../core/endpoints/zebpay/post_oauth_zebpay.h | 6 +- .../zebpay/post_oauth_zebpay_unittest.cc | 4 +- .../brave_rewards/core/gemini/gemini.cc | 4 +- components/brave_rewards/core/gemini/gemini.h | 4 +- .../core/initialization_manager.cc | 2 +- .../core/initialization_manager.h | 2 +- .../brave_rewards/core/legacy/bat_state.cc | 4 +- .../brave_rewards/core/legacy/bat_state.h | 6 +- .../brave_rewards/core/legacy/media/github.cc | 4 +- .../brave_rewards/core/legacy/media/github.h | 6 +- .../brave_rewards/core/legacy/media/media.cc | 4 +- .../brave_rewards/core/legacy/media/media.h | 6 +- .../core/legacy/media/youtube.cc | 4 +- .../brave_rewards/core/legacy/media/youtube.h | 6 +- .../core/legacy/publisher_state.cc | 4 +- .../core/legacy/publisher_state.h | 6 +- .../parameters/rewards_parameters_provider.cc | 2 +- .../parameters/rewards_parameters_provider.h | 2 +- .../brave_rewards/core/publisher/publisher.cc | 4 +- .../brave_rewards/core/publisher/publisher.h | 6 +- .../publisher_prefix_list_updater.cc | 5 +- .../publisher/publisher_prefix_list_updater.h | 6 +- .../core/publisher/publisher_status_helper.cc | 10 +- .../core/publisher/publisher_status_helper.h | 4 +- .../core/publisher/publisher_unittest.cc | 4 +- .../publisher/server_publisher_fetcher.cc | 4 +- .../core/publisher/server_publisher_fetcher.h | 6 +- ...wards_engine_impl.cc => rewards_engine.cc} | 157 +++++++++--------- ...rewards_engine_impl.h => rewards_engine.h} | 24 +-- .../core/rewards_engine_helper.cc | 2 +- .../core/rewards_engine_helper.h | 10 +- ...ne_impl_mock.cc => rewards_engine_mock.cc} | 12 +- ...gine_impl_mock.h => rewards_engine_mock.h} | 16 +- components/brave_rewards/core/sku/sku.cc | 4 +- components/brave_rewards/core/sku/sku.h | 6 +- .../brave_rewards/core/sku/sku_common.cc | 4 +- .../brave_rewards/core/sku/sku_common.h | 6 +- .../brave_rewards/core/sku/sku_order.cc | 4 +- components/brave_rewards/core/sku/sku_order.h | 6 +- .../brave_rewards/core/sku/sku_transaction.cc | 4 +- .../brave_rewards/core/sku/sku_transaction.h | 6 +- components/brave_rewards/core/state/state.cc | 4 +- components/brave_rewards/core/state/state.h | 6 +- .../core/state/state_migration.cc | 4 +- .../core/state/state_migration.h | 6 +- .../core/state/state_migration_v1.cc | 5 +- .../core/state/state_migration_v1.h | 6 +- .../core/state/state_migration_v10.cc | 5 +- .../core/state/state_migration_v10.h | 6 +- .../core/state/state_migration_v11.cc | 5 +- .../core/state/state_migration_v11.h | 6 +- .../core/state/state_migration_v12.cc | 5 +- .../core/state/state_migration_v12.h | 6 +- .../core/state/state_migration_v13.cc | 5 +- .../core/state/state_migration_v13.h | 6 +- .../core/state/state_migration_v14.cc | 5 +- .../core/state/state_migration_v14.h | 6 +- .../core/state/state_migration_v2.cc | 5 +- .../core/state/state_migration_v2.h | 6 +- .../core/state/state_migration_v4.cc | 5 +- .../core/state/state_migration_v4.h | 6 +- .../core/state/state_migration_v5.cc | 5 +- .../core/state/state_migration_v5.h | 6 +- .../core/state/state_migration_v6.cc | 5 +- .../core/state/state_migration_v6.h | 6 +- .../core/state/state_migration_v7.cc | 5 +- .../core/state/state_migration_v7.h | 6 +- .../core/state/state_migration_v8.cc | 5 +- .../core/state/state_migration_v8.h | 6 +- components/brave_rewards/core/test/BUILD.gn | 4 +- .../core/test/rewards_engine_test.h | 8 +- .../brave_rewards/core/uphold/uphold.cc | 4 +- components/brave_rewards/core/uphold/uphold.h | 4 +- .../brave_rewards/core/uphold/uphold_card.cc | 4 +- .../brave_rewards/core/uphold/uphold_card.h | 6 +- .../brave_rewards/core/wallet/wallet.cc | 4 +- components/brave_rewards/core/wallet/wallet.h | 6 +- .../core/wallet/wallet_balance.cc | 4 +- .../core/wallet/wallet_balance.h | 6 +- .../core/wallet/wallet_create.cc | 4 +- .../brave_rewards/core/wallet/wallet_create.h | 6 +- .../core/wallet/wallet_unittest.cc | 2 +- .../brave_rewards/core/wallet/wallet_util.cc | 24 +-- .../brave_rewards/core/wallet/wallet_util.h | 14 +- .../core/wallet/wallet_utils_unittest.cc | 10 +- .../bitflyer/bitflyer_transfer.cc | 2 +- .../bitflyer/connect_bitflyer_wallet.cc | 4 +- .../bitflyer/connect_bitflyer_wallet.h | 4 +- .../connect_external_wallet.cc | 4 +- .../wallet_provider/connect_external_wallet.h | 6 +- .../connect_external_wallet_unittest.cc | 7 +- .../gemini/connect_gemini_wallet.cc | 4 +- .../gemini/connect_gemini_wallet.h | 4 +- .../wallet_provider/gemini/gemini_transfer.cc | 2 +- .../core/wallet_provider/linkage_checker.cc | 2 +- .../core/wallet_provider/linkage_checker.h | 2 +- .../solana/solana_wallet_provider.cc | 2 +- .../solana/solana_wallet_provider.h | 2 +- .../core/wallet_provider/transfer.cc | 4 +- .../core/wallet_provider/transfer.h | 6 +- .../uphold/connect_uphold_wallet.cc | 4 +- .../uphold/connect_uphold_wallet.h | 2 +- .../wallet_provider/uphold/uphold_transfer.cc | 2 +- .../core/wallet_provider/wallet_provider.cc | 4 +- .../core/wallet_provider/wallet_provider.h | 6 +- .../zebpay/connect_zebpay_wallet.cc | 4 +- .../zebpay/connect_zebpay_wallet.h | 4 +- .../brave_rewards/core/zebpay/zebpay.cc | 4 +- components/brave_rewards/core/zebpay/zebpay.h | 6 +- .../bat_rewards/rewards_engine_factory.cc | 4 +- .../api/brave_rewards/brave_rewards_api.mm | 59 ++++--- 324 files changed, 852 insertions(+), 879 deletions(-) rename components/brave_rewards/core/{rewards_engine_impl.cc => rewards_engine.cc} (80%) rename components/brave_rewards/core/{rewards_engine_impl.h => rewards_engine.h} (95%) rename components/brave_rewards/core/{rewards_engine_impl_mock.cc => rewards_engine_mock.cc} (69%) rename components/brave_rewards/core/{rewards_engine_impl_mock.h => rewards_engine_mock.h} (69%) diff --git a/components/brave_rewards/core/BUILD.gn b/components/brave_rewards/core/BUILD.gn index 2a573b8c4fe..4df7f7bfe2c 100644 --- a/components/brave_rewards/core/BUILD.gn +++ b/components/brave_rewards/core/BUILD.gn @@ -387,10 +387,10 @@ static_library("engine") { "publisher/publisher_status_helper.h", "publisher/server_publisher_fetcher.cc", "publisher/server_publisher_fetcher.h", + "rewards_engine.cc", + "rewards_engine.h", "rewards_engine_helper.cc", "rewards_engine_helper.h", - "rewards_engine_impl.cc", - "rewards_engine_impl.h", "rewards_log_stream.cc", "rewards_log_stream.h", "sku/sku.cc", diff --git a/components/brave_rewards/core/bitflyer/bitflyer.cc b/components/brave_rewards/core/bitflyer/bitflyer.cc index 01c9cfd2e2f..b151c89387b 100644 --- a/components/brave_rewards/core/bitflyer/bitflyer.cc +++ b/components/brave_rewards/core/bitflyer/bitflyer.cc @@ -12,13 +12,13 @@ #include "brave/components/brave_rewards/core/buildflags.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/wallet_provider/bitflyer/bitflyer_transfer.h" #include "brave/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.h" namespace brave_rewards::internal::bitflyer { -Bitflyer::Bitflyer(RewardsEngineImpl& engine) +Bitflyer::Bitflyer(RewardsEngine& engine) : WalletProvider(engine), server_(engine) { connect_wallet_ = std::make_unique(engine); transfer_ = std::make_unique(engine); diff --git a/components/brave_rewards/core/bitflyer/bitflyer.h b/components/brave_rewards/core/bitflyer/bitflyer.h index 8e9d2ae3513..d79918f2a71 100644 --- a/components/brave_rewards/core/bitflyer/bitflyer.h +++ b/components/brave_rewards/core/bitflyer/bitflyer.h @@ -15,13 +15,13 @@ #include "brave/components/brave_rewards/core/wallet_provider/wallet_provider.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace bitflyer { class Bitflyer final : public wallet_provider::WalletProvider { public: - explicit Bitflyer(RewardsEngineImpl& engine); + explicit Bitflyer(RewardsEngine& engine); const char* WalletType() const override; diff --git a/components/brave_rewards/core/common/environment_config.cc b/components/brave_rewards/core/common/environment_config.cc index db5b27e4768..ad3094938a6 100644 --- a/components/brave_rewards/core/common/environment_config.cc +++ b/components/brave_rewards/core/common/environment_config.cc @@ -9,7 +9,7 @@ namespace brave_rewards::internal { -EnvironmentConfig::EnvironmentConfig(RewardsEngineImpl& engine) +EnvironmentConfig::EnvironmentConfig(RewardsEngine& engine) : RewardsEngineHelper(engine) {} EnvironmentConfig::~EnvironmentConfig() = default; diff --git a/components/brave_rewards/core/common/environment_config.h b/components/brave_rewards/core/common/environment_config.h index 2350f4b3fe1..ad450e3eea7 100644 --- a/components/brave_rewards/core/common/environment_config.h +++ b/components/brave_rewards/core/common/environment_config.h @@ -18,7 +18,7 @@ namespace brave_rewards::internal { class EnvironmentConfig : public RewardsEngineHelper, public WithHelperKey { public: - explicit EnvironmentConfig(RewardsEngineImpl& engine); + explicit EnvironmentConfig(RewardsEngine& engine); ~EnvironmentConfig() override; mojom::Environment current_environment() const; diff --git a/components/brave_rewards/core/common/random_util.cc b/components/brave_rewards/core/common/random_util.cc index a2517f2205d..13df6ac12be 100644 --- a/components/brave_rewards/core/common/random_util.cc +++ b/components/brave_rewards/core/common/random_util.cc @@ -8,7 +8,7 @@ #include "base/base64url.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "crypto/random.h" #include "crypto/sha2.h" diff --git a/components/brave_rewards/core/common/url_loader.cc b/components/brave_rewards/core/common/url_loader.cc index ef1f8e9d670..c0fddd271a3 100644 --- a/components/brave_rewards/core/common/url_loader.cc +++ b/components/brave_rewards/core/common/url_loader.cc @@ -25,7 +25,7 @@ mojom::UrlResponsePtr CreateShutdownResponse(const mojom::UrlRequest& request) { } // namespace -URLLoader::URLLoader(RewardsEngineImpl& engine) : RewardsEngineHelper(engine) {} +URLLoader::URLLoader(RewardsEngine& engine) : RewardsEngineHelper(engine) {} URLLoader::~URLLoader() = default; diff --git a/components/brave_rewards/core/common/url_loader.h b/components/brave_rewards/core/common/url_loader.h index 581d925067a..e8578edbb07 100644 --- a/components/brave_rewards/core/common/url_loader.h +++ b/components/brave_rewards/core/common/url_loader.h @@ -18,7 +18,7 @@ namespace brave_rewards::internal { // both requests and responses. class URLLoader : public RewardsEngineHelper, public WithHelperKey { public: - explicit URLLoader(RewardsEngineImpl& engine); + explicit URLLoader(RewardsEngine& engine); ~URLLoader() override; enum class LogLevel { diff --git a/components/brave_rewards/core/contribution/contribution.cc b/components/brave_rewards/core/contribution/contribution.cc index 0e20964de66..ad4bcb04ea8 100644 --- a/components/brave_rewards/core/contribution/contribution.cc +++ b/components/brave_rewards/core/contribution/contribution.cc @@ -25,7 +25,7 @@ #include "brave/components/brave_rewards/core/gemini/gemini.h" #include "brave/components/brave_rewards/core/global_constants.h" #include "brave/components/brave_rewards/core/publisher/publisher_status_helper.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/uphold/uphold.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" @@ -109,7 +109,7 @@ Contribution::ContributionRequest& Contribution::ContributionRequest::operator=( Contribution::ContributionRequest::~ContributionRequest() = default; -Contribution::Contribution(RewardsEngineImpl& engine) +Contribution::Contribution(RewardsEngine& engine) : engine_(engine), unblinded_(engine), sku_(engine), diff --git a/components/brave_rewards/core/contribution/contribution.h b/components/brave_rewards/core/contribution/contribution.h index 009fcdea601..25fc55a7e41 100644 --- a/components/brave_rewards/core/contribution/contribution.h +++ b/components/brave_rewards/core/contribution/contribution.h @@ -29,13 +29,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace contribution { class Contribution { public: - explicit Contribution(RewardsEngineImpl& engine); + explicit Contribution(RewardsEngine& engine); ~Contribution(); @@ -184,7 +184,7 @@ class Contribution { void OnRecurringTipsRead(GetRecurringTipsCallback callback, std::vector list); - const raw_ref engine_; + const raw_ref engine_; Unblinded unblinded_; ContributionSKU sku_; ContributionMonthly monthly_; diff --git a/components/brave_rewards/core/contribution/contribution_ac.cc b/components/brave_rewards/core/contribution/contribution_ac.cc index 570369f3bf7..82de26968ce 100644 --- a/components/brave_rewards/core/contribution/contribution_ac.cc +++ b/components/brave_rewards/core/contribution/contribution_ac.cc @@ -11,12 +11,12 @@ #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state.h" namespace brave_rewards::internal::contribution { -ContributionAC::ContributionAC(RewardsEngineImpl& engine) : engine_(engine) {} +ContributionAC::ContributionAC(RewardsEngine& engine) : engine_(engine) {} ContributionAC::~ContributionAC() = default; diff --git a/components/brave_rewards/core/contribution/contribution_ac.h b/components/brave_rewards/core/contribution/contribution_ac.h index e26fbc1645c..a76ecbb5180 100644 --- a/components/brave_rewards/core/contribution/contribution_ac.h +++ b/components/brave_rewards/core/contribution/contribution_ac.h @@ -13,13 +13,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace contribution { class ContributionAC { public: - explicit ContributionAC(RewardsEngineImpl& engine); + explicit ContributionAC(RewardsEngine& engine); ~ContributionAC(); @@ -30,7 +30,7 @@ class ContributionAC { void QueueSaved(const mojom::Result result); - const raw_ref engine_; + const raw_ref engine_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_rewards/core/contribution/contribution_external_wallet.cc b/components/brave_rewards/core/contribution/contribution_external_wallet.cc index 3446f686e31..e276a5a5670 100644 --- a/components/brave_rewards/core/contribution/contribution_external_wallet.cc +++ b/components/brave_rewards/core/contribution/contribution_external_wallet.cc @@ -13,13 +13,12 @@ #include "brave/components/brave_rewards/core/gemini/gemini.h" #include "brave/components/brave_rewards/core/global_constants.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/uphold/uphold.h" namespace brave_rewards::internal::contribution { -ContributionExternalWallet::ContributionExternalWallet( - RewardsEngineImpl& engine) +ContributionExternalWallet::ContributionExternalWallet(RewardsEngine& engine) : engine_(engine) {} ContributionExternalWallet::~ContributionExternalWallet() = default; diff --git a/components/brave_rewards/core/contribution/contribution_external_wallet.h b/components/brave_rewards/core/contribution/contribution_external_wallet.h index 8a504899082..895afd2fe53 100644 --- a/components/brave_rewards/core/contribution/contribution_external_wallet.h +++ b/components/brave_rewards/core/contribution/contribution_external_wallet.h @@ -14,13 +14,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace contribution { class ContributionExternalWallet { public: - explicit ContributionExternalWallet(RewardsEngineImpl& engine); + explicit ContributionExternalWallet(RewardsEngine& engine); ~ContributionExternalWallet(); @@ -44,7 +44,7 @@ class ContributionExternalWallet { ResultCallback callback, mojom::Result result); - const raw_ref engine_; + const raw_ref engine_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_rewards/core/contribution/contribution_monthly.cc b/components/brave_rewards/core/contribution/contribution_monthly.cc index 9e38b580422..92275315e21 100644 --- a/components/brave_rewards/core/contribution/contribution_monthly.cc +++ b/components/brave_rewards/core/contribution/contribution_monthly.cc @@ -16,12 +16,12 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/contribution/contribution.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace contribution { -ContributionMonthly::ContributionMonthly(RewardsEngineImpl& engine) +ContributionMonthly::ContributionMonthly(RewardsEngine& engine) : engine_(engine) {} ContributionMonthly::~ContributionMonthly() = default; diff --git a/components/brave_rewards/core/contribution/contribution_monthly.h b/components/brave_rewards/core/contribution/contribution_monthly.h index 1092ec10cbc..84b2ae75414 100644 --- a/components/brave_rewards/core/contribution/contribution_monthly.h +++ b/components/brave_rewards/core/contribution/contribution_monthly.h @@ -15,13 +15,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace contribution { class ContributionMonthly { public: - explicit ContributionMonthly(RewardsEngineImpl& engine); + explicit ContributionMonthly(RewardsEngine& engine); ~ContributionMonthly(); @@ -38,7 +38,7 @@ class ContributionMonthly { ResultCallback callback, bool success); - const raw_ref engine_; + const raw_ref engine_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_rewards/core/contribution/contribution_sku.cc b/components/brave_rewards/core/contribution/contribution_sku.cc index d26419d99ef..ca85be3064b 100644 --- a/components/brave_rewards/core/contribution/contribution_sku.cc +++ b/components/brave_rewards/core/contribution/contribution_sku.cc @@ -14,7 +14,7 @@ #include "brave/components/brave_rewards/core/contribution/contribution_util.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { @@ -42,7 +42,7 @@ void GetCredentialTrigger(mojom::SKUOrderPtr order, namespace contribution { -ContributionSKU::ContributionSKU(RewardsEngineImpl& engine) +ContributionSKU::ContributionSKU(RewardsEngine& engine) : engine_(engine), credentials_(engine), sku_(engine) {} ContributionSKU::~ContributionSKU() = default; diff --git a/components/brave_rewards/core/contribution/contribution_sku.h b/components/brave_rewards/core/contribution/contribution_sku.h index 2b7081806b8..d05f504d387 100644 --- a/components/brave_rewards/core/contribution/contribution_sku.h +++ b/components/brave_rewards/core/contribution/contribution_sku.h @@ -17,13 +17,13 @@ #include "brave/components/brave_rewards/core/sku/sku.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace contribution { class ContributionSKU { public: - explicit ContributionSKU(RewardsEngineImpl& engine); + explicit ContributionSKU(RewardsEngine& engine); ~ContributionSKU(); void AutoContribution(const std::string& contribution_id, @@ -69,7 +69,7 @@ class ContributionSKU { mojom::SKUOrderPtr order, ResultCallback callback); - const raw_ref engine_; + const raw_ref engine_; credential::CredentialsSKU credentials_; sku::SKU sku_; base::WeakPtrFactory weak_factory_{this}; diff --git a/components/brave_rewards/core/contribution/contribution_tip.cc b/components/brave_rewards/core/contribution/contribution_tip.cc index e7926f4cc02..09a64a4b6aa 100644 --- a/components/brave_rewards/core/contribution/contribution_tip.cc +++ b/components/brave_rewards/core/contribution/contribution_tip.cc @@ -15,11 +15,11 @@ #include "brave/components/brave_rewards/core/contribution/contribution.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal::contribution { -ContributionTip::ContributionTip(RewardsEngineImpl& engine) : engine_(engine) {} +ContributionTip::ContributionTip(RewardsEngine& engine) : engine_(engine) {} ContributionTip::~ContributionTip() = default; diff --git a/components/brave_rewards/core/contribution/contribution_tip.h b/components/brave_rewards/core/contribution/contribution_tip.h index a896e9c75ce..1562e17a09c 100644 --- a/components/brave_rewards/core/contribution/contribution_tip.h +++ b/components/brave_rewards/core/contribution/contribution_tip.h @@ -16,13 +16,13 @@ namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace contribution { class ContributionTip { public: - explicit ContributionTip(RewardsEngineImpl& engine); + explicit ContributionTip(RewardsEngine& engine); ~ContributionTip(); @@ -44,7 +44,7 @@ class ContributionTip { void OnPendingTipSaved(mojom::Result result); - const raw_ref engine_; + const raw_ref engine_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_rewards/core/contribution/contribution_unblinded.cc b/components/brave_rewards/core/contribution/contribution_unblinded.cc index ab823c77604..6fb26e0da94 100644 --- a/components/brave_rewards/core/contribution/contribution_unblinded.cc +++ b/components/brave_rewards/core/contribution/contribution_unblinded.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/contribution/contribution_unblinded.h" #include "brave/components/brave_rewards/core/contribution/contribution_util.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave_base/random.h" namespace brave_rewards::internal::contribution { @@ -90,9 +90,8 @@ void GetStatisticalVotingWinners( } // namespace -Unblinded::Unblinded(RewardsEngineImpl& engine) - : engine_(engine), - credentials_sku_(engine) {} +Unblinded::Unblinded(RewardsEngine& engine) + : engine_(engine), credentials_sku_(engine) {} Unblinded::~Unblinded() = default; diff --git a/components/brave_rewards/core/contribution/contribution_unblinded.h b/components/brave_rewards/core/contribution/contribution_unblinded.h index 9de790eeb98..0e7a49d5a49 100644 --- a/components/brave_rewards/core/contribution/contribution_unblinded.h +++ b/components/brave_rewards/core/contribution/contribution_unblinded.h @@ -20,13 +20,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace contribution { class Unblinded { public: - explicit Unblinded(RewardsEngineImpl& engine); + explicit Unblinded(RewardsEngine& engine); ~Unblinded(); void Start(const std::vector& types, @@ -130,7 +130,7 @@ class Unblinded { double amount, const std::vector& publisher_list); - const raw_ref engine_; + const raw_ref engine_; credential::CredentialsSKU credentials_sku_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_rewards/core/contribution/contribution_unblinded_unittest.cc b/components/brave_rewards/core/contribution/contribution_unblinded_unittest.cc index 92801065305..b78b31a4299 100644 --- a/components/brave_rewards/core/contribution/contribution_unblinded_unittest.cc +++ b/components/brave_rewards/core/contribution/contribution_unblinded_unittest.cc @@ -10,7 +10,7 @@ #include "brave/components/brave_rewards/core/contribution/contribution_unblinded.h" #include "brave/components/brave_rewards/core/database/database_contribution_info.h" #include "brave/components/brave_rewards/core/database/database_unblinded_token.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" // npm run test -- brave_unit_tests --filter=UnblindedTest.* @@ -22,7 +22,7 @@ namespace contribution { class UnblindedTest : public ::testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; Unblinded unblinded_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/credentials/credentials_common.cc b/components/brave_rewards/core/credentials/credentials_common.cc index 85374f9a27f..2020b083588 100644 --- a/components/brave_rewards/core/credentials/credentials_common.cc +++ b/components/brave_rewards/core/credentials/credentials_common.cc @@ -12,13 +12,12 @@ #include "brave/components/brave_rewards/core/credentials/credentials_common.h" #include "brave/components/brave_rewards/core/credentials/credentials_util.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace credential { -CredentialsCommon::CredentialsCommon(RewardsEngineImpl& engine) - : engine_(engine) {} +CredentialsCommon::CredentialsCommon(RewardsEngine& engine) : engine_(engine) {} CredentialsCommon::~CredentialsCommon() = default; diff --git a/components/brave_rewards/core/credentials/credentials_common.h b/components/brave_rewards/core/credentials/credentials_common.h index 1d6fe751f0c..71f6d0c7e70 100644 --- a/components/brave_rewards/core/credentials/credentials_common.h +++ b/components/brave_rewards/core/credentials/credentials_common.h @@ -19,13 +19,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace credential { class CredentialsCommon { public: - explicit CredentialsCommon(RewardsEngineImpl& engine); + explicit CredentialsCommon(RewardsEngine& engine); ~CredentialsCommon(); void GetBlindedCreds(const CredentialsTrigger& trigger, @@ -46,7 +46,7 @@ class CredentialsCommon { const CredentialsTrigger& trigger, mojom::Result result); - const raw_ref engine_; + const raw_ref engine_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_rewards/core/credentials/credentials_sku.cc b/components/brave_rewards/core/credentials/credentials_sku.cc index 130969ef17f..bcb3e7e94d4 100644 --- a/components/brave_rewards/core/credentials/credentials_sku.cc +++ b/components/brave_rewards/core/credentials/credentials_sku.cc @@ -18,7 +18,7 @@ #include "brave/components/brave_rewards/core/credentials/credentials_sku.h" #include "brave/components/brave_rewards/core/credentials/credentials_util.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { @@ -41,7 +41,7 @@ std::string ConvertItemTypeToString(const std::string& type) { namespace credential { -CredentialsSKU::CredentialsSKU(RewardsEngineImpl& engine) +CredentialsSKU::CredentialsSKU(RewardsEngine& engine) : engine_(engine), common_(engine), payment_server_(engine) {} CredentialsSKU::~CredentialsSKU() = default; diff --git a/components/brave_rewards/core/credentials/credentials_sku.h b/components/brave_rewards/core/credentials/credentials_sku.h index e86e0b4401a..77ae6be5f50 100644 --- a/components/brave_rewards/core/credentials/credentials_sku.h +++ b/components/brave_rewards/core/credentials/credentials_sku.h @@ -20,7 +20,7 @@ namespace credential { class CredentialsSKU : public Credentials { public: - explicit CredentialsSKU(RewardsEngineImpl& engine); + explicit CredentialsSKU(RewardsEngine& engine); ~CredentialsSKU() override; void Start(const CredentialsTrigger& trigger, @@ -80,7 +80,7 @@ class CredentialsSKU : public Credentials { ResultCallback callback, mojom::Result result); - const raw_ref engine_; + const raw_ref engine_; CredentialsCommon common_; endpoint::PaymentServer payment_server_; base::WeakPtrFactory weak_factory_{this}; diff --git a/components/brave_rewards/core/credentials/credentials_util.cc b/components/brave_rewards/core/credentials/credentials_util.cc index 82af64e1350..6e17ed09a42 100644 --- a/components/brave_rewards/core/credentials/credentials_util.cc +++ b/components/brave_rewards/core/credentials/credentials_util.cc @@ -10,7 +10,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/challenge_bypass_ristretto/batch_dleq_proof.h" #include "brave/components/challenge_bypass_ristretto/public_key.h" #include "brave/components/challenge_bypass_ristretto/signed_token.h" @@ -188,7 +188,7 @@ std::string ConvertRewardTypeToString(const mojom::RewardsType type) { } base::Value::List GenerateCredentials( - RewardsEngineImpl& engine, + RewardsEngine& engine, const std::vector& token_list, const std::string& body) { base::Value::List credentials; diff --git a/components/brave_rewards/core/credentials/credentials_util.h b/components/brave_rewards/core/credentials/credentials_util.h index 9f787180eae..d2eb8880f40 100644 --- a/components/brave_rewards/core/credentials/credentials_util.h +++ b/components/brave_rewards/core/credentials/credentials_util.h @@ -22,7 +22,7 @@ using challenge_bypass_ristretto::Token; namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace credential { @@ -45,7 +45,7 @@ std::vector UnBlindCredsMock(const mojom::CredsBatch& creds); std::string ConvertRewardTypeToString(const mojom::RewardsType type); base::Value::List GenerateCredentials( - RewardsEngineImpl& engine, + RewardsEngine& engine, const std::vector& token_list, const std::string& body); diff --git a/components/brave_rewards/core/database/database.cc b/components/brave_rewards/core/database/database.cc index e51ff130818..5ffd816e019 100644 --- a/components/brave_rewards/core/database/database.cc +++ b/components/brave_rewards/core/database/database.cc @@ -10,12 +10,12 @@ #include "brave/components/brave_rewards/core/database/database_util.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace database { -Database::Database(RewardsEngineImpl& engine) +Database::Database(RewardsEngine& engine) : engine_(engine), initialize_(engine), activity_info_(engine), diff --git a/components/brave_rewards/core/database/database.h b/components/brave_rewards/core/database/database.h index 1ab6df9ee33..fd62276de94 100644 --- a/components/brave_rewards/core/database/database.h +++ b/components/brave_rewards/core/database/database.h @@ -36,13 +36,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace database { class Database { public: - explicit Database(RewardsEngineImpl& engine); + explicit Database(RewardsEngine& engine); virtual ~Database(); void Initialize(ResultCallback callback); @@ -306,7 +306,7 @@ class Database { GetUnblindedTokenListCallback callback); private: - const raw_ref engine_; + const raw_ref engine_; DatabaseInitialize initialize_; DatabaseActivityInfo activity_info_; DatabaseBalanceReport balance_report_; diff --git a/components/brave_rewards/core/database/database_activity_info.cc b/components/brave_rewards/core/database/database_activity_info.cc index ceff4b6e534..0c7444453d0 100644 --- a/components/brave_rewards/core/database/database_activity_info.cc +++ b/components/brave_rewards/core/database/database_activity_info.cc @@ -10,7 +10,7 @@ #include "base/types/cxx23_to_underlying.h" #include "brave/components/brave_rewards/core/database/database_activity_info.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state.h" namespace brave_rewards::internal { @@ -122,7 +122,7 @@ void GenerateActivityFilterBind(mojom::DBCommand* command, namespace database { -DatabaseActivityInfo::DatabaseActivityInfo(RewardsEngineImpl& engine) +DatabaseActivityInfo::DatabaseActivityInfo(RewardsEngine& engine) : DatabaseTable(engine) {} DatabaseActivityInfo::~DatabaseActivityInfo() = default; diff --git a/components/brave_rewards/core/database/database_activity_info.h b/components/brave_rewards/core/database/database_activity_info.h index d5ab8561810..6ed251823d9 100644 --- a/components/brave_rewards/core/database/database_activity_info.h +++ b/components/brave_rewards/core/database/database_activity_info.h @@ -16,7 +16,7 @@ namespace database { class DatabaseActivityInfo : public DatabaseTable { public: - explicit DatabaseActivityInfo(RewardsEngineImpl& engine); + explicit DatabaseActivityInfo(RewardsEngine& engine); ~DatabaseActivityInfo() override; void InsertOrUpdate(mojom::PublisherInfoPtr info, ResultCallback callback); diff --git a/components/brave_rewards/core/database/database_activity_info_unittest.cc b/components/brave_rewards/core/database/database_activity_info_unittest.cc index 6dc5ad91736..adc1e709605 100644 --- a/components/brave_rewards/core/database/database_activity_info_unittest.cc +++ b/components/brave_rewards/core/database/database_activity_info_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/database/database_activity_info.h" #include "brave/components/brave_rewards/core/database/database_util.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" // npm run test -- brave_unit_tests --filter=DatabaseActivityInfoTest.* @@ -24,7 +24,7 @@ namespace database { class DatabaseActivityInfoTest : public ::testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; DatabaseActivityInfo activity_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/database/database_balance_report.cc b/components/brave_rewards/core/database/database_balance_report.cc index 96fb982cd8d..43a37fc489d 100644 --- a/components/brave_rewards/core/database/database_balance_report.cc +++ b/components/brave_rewards/core/database/database_balance_report.cc @@ -11,7 +11,7 @@ #include "brave/components/brave_rewards/core/database/database_balance_report.h" #include "brave/components/brave_rewards/core/database/database_util.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { @@ -47,7 +47,7 @@ std::string GetTypeColumn(mojom::ReportType type) { namespace database { -DatabaseBalanceReport::DatabaseBalanceReport(RewardsEngineImpl& engine) +DatabaseBalanceReport::DatabaseBalanceReport(RewardsEngine& engine) : DatabaseTable(engine) {} DatabaseBalanceReport::~DatabaseBalanceReport() = default; diff --git a/components/brave_rewards/core/database/database_balance_report.h b/components/brave_rewards/core/database/database_balance_report.h index 1ce23cb8a2c..453fbe30ff5 100644 --- a/components/brave_rewards/core/database/database_balance_report.h +++ b/components/brave_rewards/core/database/database_balance_report.h @@ -16,7 +16,7 @@ namespace database { class DatabaseBalanceReport : public DatabaseTable { public: - explicit DatabaseBalanceReport(RewardsEngineImpl& engine); + explicit DatabaseBalanceReport(RewardsEngine& engine); ~DatabaseBalanceReport() override; void InsertOrUpdate(mojom::BalanceReportInfoPtr info, diff --git a/components/brave_rewards/core/database/database_balance_report_info_unittest.cc b/components/brave_rewards/core/database/database_balance_report_info_unittest.cc index b8a13db48e8..c5ad992c2fb 100644 --- a/components/brave_rewards/core/database/database_balance_report_info_unittest.cc +++ b/components/brave_rewards/core/database/database_balance_report_info_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/database/database_balance_report.h" #include "brave/components/brave_rewards/core/database/database_util.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" // npm run test -- brave_unit_tests --filter=DatabaseBalanceReportTest.* @@ -24,7 +24,7 @@ namespace database { class DatabaseBalanceReportTest : public ::testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; DatabaseBalanceReport balance_report_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/database/database_contribution_info.cc b/components/brave_rewards/core/database/database_contribution_info.cc index 02481001eaa..c2fa00cc919 100644 --- a/components/brave_rewards/core/database/database_contribution_info.cc +++ b/components/brave_rewards/core/database/database_contribution_info.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database_contribution_info.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace database { @@ -24,7 +24,7 @@ const char kChildTableName[] = "contribution_info_publishers"; } // namespace -DatabaseContributionInfo::DatabaseContributionInfo(RewardsEngineImpl& engine) +DatabaseContributionInfo::DatabaseContributionInfo(RewardsEngine& engine) : DatabaseTable(engine), publishers_(engine) {} DatabaseContributionInfo::~DatabaseContributionInfo() = default; diff --git a/components/brave_rewards/core/database/database_contribution_info.h b/components/brave_rewards/core/database/database_contribution_info.h index ec2a54dd0b8..8831aeab059 100644 --- a/components/brave_rewards/core/database/database_contribution_info.h +++ b/components/brave_rewards/core/database/database_contribution_info.h @@ -22,7 +22,7 @@ using GetContributionInfoCallback = class DatabaseContributionInfo : public DatabaseTable { public: - explicit DatabaseContributionInfo(RewardsEngineImpl& engine); + explicit DatabaseContributionInfo(RewardsEngine& engine); ~DatabaseContributionInfo() override; void InsertOrUpdate(mojom::ContributionInfoPtr info, ResultCallback callback); diff --git a/components/brave_rewards/core/database/database_contribution_info_publishers.cc b/components/brave_rewards/core/database/database_contribution_info_publishers.cc index 0266321f742..b8b35b60ed5 100644 --- a/components/brave_rewards/core/database/database_contribution_info_publishers.cc +++ b/components/brave_rewards/core/database/database_contribution_info_publishers.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_contribution_info_publishers.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace database { @@ -21,7 +21,7 @@ const char kTableName[] = "contribution_info_publishers"; } // namespace DatabaseContributionInfoPublishers::DatabaseContributionInfoPublishers( - RewardsEngineImpl& engine) + RewardsEngine& engine) : DatabaseTable(engine) {} DatabaseContributionInfoPublishers::~DatabaseContributionInfoPublishers() = diff --git a/components/brave_rewards/core/database/database_contribution_info_publishers.h b/components/brave_rewards/core/database/database_contribution_info_publishers.h index 934363c640e..cb8e4b1e7a5 100644 --- a/components/brave_rewards/core/database/database_contribution_info_publishers.h +++ b/components/brave_rewards/core/database/database_contribution_info_publishers.h @@ -16,7 +16,7 @@ namespace database { class DatabaseContributionInfoPublishers : public DatabaseTable { public: - explicit DatabaseContributionInfoPublishers(RewardsEngineImpl& engine); + explicit DatabaseContributionInfoPublishers(RewardsEngine& engine); ~DatabaseContributionInfoPublishers() override; void InsertOrUpdate(mojom::DBTransaction* transaction, diff --git a/components/brave_rewards/core/database/database_contribution_queue.cc b/components/brave_rewards/core/database/database_contribution_queue.cc index b9c7049c5bf..3fb716fe264 100644 --- a/components/brave_rewards/core/database/database_contribution_queue.cc +++ b/components/brave_rewards/core/database/database_contribution_queue.cc @@ -11,7 +11,7 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database_contribution_queue.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace database { @@ -22,7 +22,7 @@ const char kTableName[] = "contribution_queue"; } // namespace -DatabaseContributionQueue::DatabaseContributionQueue(RewardsEngineImpl& engine) +DatabaseContributionQueue::DatabaseContributionQueue(RewardsEngine& engine) : DatabaseTable(engine), publishers_(engine) {} DatabaseContributionQueue::~DatabaseContributionQueue() = default; diff --git a/components/brave_rewards/core/database/database_contribution_queue.h b/components/brave_rewards/core/database/database_contribution_queue.h index b6bc3f4b80d..81339e2ba45 100644 --- a/components/brave_rewards/core/database/database_contribution_queue.h +++ b/components/brave_rewards/core/database/database_contribution_queue.h @@ -21,7 +21,7 @@ using GetFirstContributionQueueCallback = class DatabaseContributionQueue : public DatabaseTable { public: - explicit DatabaseContributionQueue(RewardsEngineImpl& engine); + explicit DatabaseContributionQueue(RewardsEngine& engine); ~DatabaseContributionQueue() override; void InsertOrUpdate(mojom::ContributionQueuePtr info, diff --git a/components/brave_rewards/core/database/database_contribution_queue_publishers.cc b/components/brave_rewards/core/database/database_contribution_queue_publishers.cc index 5727af4874f..34a8fffc75a 100644 --- a/components/brave_rewards/core/database/database_contribution_queue_publishers.cc +++ b/components/brave_rewards/core/database/database_contribution_queue_publishers.cc @@ -10,7 +10,7 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database_contribution_queue_publishers.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace database { @@ -22,7 +22,7 @@ const char kTableName[] = "contribution_queue_publishers"; } // namespace DatabaseContributionQueuePublishers::DatabaseContributionQueuePublishers( - RewardsEngineImpl& engine) + RewardsEngine& engine) : DatabaseTable(engine) {} DatabaseContributionQueuePublishers::~DatabaseContributionQueuePublishers() = diff --git a/components/brave_rewards/core/database/database_contribution_queue_publishers.h b/components/brave_rewards/core/database/database_contribution_queue_publishers.h index 30f8950ed19..f71e6398637 100644 --- a/components/brave_rewards/core/database/database_contribution_queue_publishers.h +++ b/components/brave_rewards/core/database/database_contribution_queue_publishers.h @@ -16,7 +16,7 @@ namespace database { class DatabaseContributionQueuePublishers : public DatabaseTable { public: - explicit DatabaseContributionQueuePublishers(RewardsEngineImpl& engine); + explicit DatabaseContributionQueuePublishers(RewardsEngine& engine); ~DatabaseContributionQueuePublishers() override; void InsertOrUpdate(const std::string& id, diff --git a/components/brave_rewards/core/database/database_creds_batch.cc b/components/brave_rewards/core/database/database_creds_batch.cc index f8df1001d6a..9032e256063 100644 --- a/components/brave_rewards/core/database/database_creds_batch.cc +++ b/components/brave_rewards/core/database/database_creds_batch.cc @@ -8,7 +8,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_creds_batch.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace database { @@ -19,7 +19,7 @@ const char kTableName[] = "creds_batch"; } // namespace -DatabaseCredsBatch::DatabaseCredsBatch(RewardsEngineImpl& engine) +DatabaseCredsBatch::DatabaseCredsBatch(RewardsEngine& engine) : DatabaseTable(engine) {} DatabaseCredsBatch::~DatabaseCredsBatch() = default; diff --git a/components/brave_rewards/core/database/database_creds_batch.h b/components/brave_rewards/core/database/database_creds_batch.h index cb6a4c7e23e..b02ba58930b 100644 --- a/components/brave_rewards/core/database/database_creds_batch.h +++ b/components/brave_rewards/core/database/database_creds_batch.h @@ -20,7 +20,7 @@ using GetCredsBatchListCallback = class DatabaseCredsBatch : public DatabaseTable { public: - explicit DatabaseCredsBatch(RewardsEngineImpl& engine); + explicit DatabaseCredsBatch(RewardsEngine& engine); ~DatabaseCredsBatch() override; void InsertOrUpdate(mojom::CredsBatchPtr creds, ResultCallback callback); diff --git a/components/brave_rewards/core/database/database_event_log.cc b/components/brave_rewards/core/database/database_event_log.cc index b6fbbd5f74c..9dc5cfa450a 100644 --- a/components/brave_rewards/core/database/database_event_log.cc +++ b/components/brave_rewards/core/database/database_event_log.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database_event_log.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace database { @@ -23,7 +23,7 @@ const char kTableName[] = "event_log"; } // namespace -DatabaseEventLog::DatabaseEventLog(RewardsEngineImpl& engine) +DatabaseEventLog::DatabaseEventLog(RewardsEngine& engine) : DatabaseTable(engine) {} DatabaseEventLog::~DatabaseEventLog() = default; diff --git a/components/brave_rewards/core/database/database_event_log.h b/components/brave_rewards/core/database/database_event_log.h index 402bf56ce46..2bfe2fbba3d 100644 --- a/components/brave_rewards/core/database/database_event_log.h +++ b/components/brave_rewards/core/database/database_event_log.h @@ -16,7 +16,7 @@ namespace database { class DatabaseEventLog : public DatabaseTable { public: - explicit DatabaseEventLog(RewardsEngineImpl& engine); + explicit DatabaseEventLog(RewardsEngine& engine); ~DatabaseEventLog() override; void Insert(const std::string& key, const std::string& value); diff --git a/components/brave_rewards/core/database/database_external_transactions.cc b/components/brave_rewards/core/database/database_external_transactions.cc index 753136be517..a9045ac8758 100644 --- a/components/brave_rewards/core/database/database_external_transactions.cc +++ b/components/brave_rewards/core/database/database_external_transactions.cc @@ -9,14 +9,14 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_external_transactions.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal::database { constexpr char kTableName[] = "external_transactions"; DatabaseExternalTransactions::DatabaseExternalTransactions( - RewardsEngineImpl& engine) + RewardsEngine& engine) : DatabaseTable(engine) {} DatabaseExternalTransactions::~DatabaseExternalTransactions() = default; diff --git a/components/brave_rewards/core/database/database_external_transactions.h b/components/brave_rewards/core/database/database_external_transactions.h index d21f9a46c62..f75c7a0a4e7 100644 --- a/components/brave_rewards/core/database/database_external_transactions.h +++ b/components/brave_rewards/core/database/database_external_transactions.h @@ -21,7 +21,7 @@ using GetExternalTransactionCallback = class DatabaseExternalTransactions : public DatabaseTable { public: - explicit DatabaseExternalTransactions(RewardsEngineImpl& engine); + explicit DatabaseExternalTransactions(RewardsEngine& engine); ~DatabaseExternalTransactions() override; void Insert(mojom::ExternalTransactionPtr, ResultCallback); diff --git a/components/brave_rewards/core/database/database_initialize.cc b/components/brave_rewards/core/database/database_initialize.cc index 2e49b3ca197..e5d8242e1a9 100644 --- a/components/brave_rewards/core/database/database_initialize.cc +++ b/components/brave_rewards/core/database/database_initialize.cc @@ -7,13 +7,13 @@ #include "brave/components/brave_rewards/core/database/database_initialize.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state_keys.h" namespace brave_rewards::internal { namespace database { -DatabaseInitialize::DatabaseInitialize(RewardsEngineImpl& engine) +DatabaseInitialize::DatabaseInitialize(RewardsEngine& engine) : engine_(engine), migration_(engine) {} DatabaseInitialize::~DatabaseInitialize() = default; diff --git a/components/brave_rewards/core/database/database_initialize.h b/components/brave_rewards/core/database/database_initialize.h index 1edda659e64..29f4f1b11bb 100644 --- a/components/brave_rewards/core/database/database_initialize.h +++ b/components/brave_rewards/core/database/database_initialize.h @@ -11,13 +11,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace database { class DatabaseInitialize { public: - explicit DatabaseInitialize(RewardsEngineImpl& engine); + explicit DatabaseInitialize(RewardsEngine& engine); ~DatabaseInitialize(); void Start(ResultCallback callback); @@ -26,7 +26,7 @@ class DatabaseInitialize { void OnInitialize(ResultCallback callback, mojom::DBCommandResponsePtr response); - const raw_ref engine_; + const raw_ref engine_; DatabaseMigration migration_; }; diff --git a/components/brave_rewards/core/database/database_media_publisher_info.cc b/components/brave_rewards/core/database/database_media_publisher_info.cc index 027bea690b1..b816209b21d 100644 --- a/components/brave_rewards/core/database/database_media_publisher_info.cc +++ b/components/brave_rewards/core/database/database_media_publisher_info.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_media_publisher_info.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace database { @@ -20,8 +20,7 @@ const char kTableName[] = "media_publisher_info"; } // namespace -DatabaseMediaPublisherInfo::DatabaseMediaPublisherInfo( - RewardsEngineImpl& engine) +DatabaseMediaPublisherInfo::DatabaseMediaPublisherInfo(RewardsEngine& engine) : DatabaseTable(engine) {} DatabaseMediaPublisherInfo::~DatabaseMediaPublisherInfo() = default; diff --git a/components/brave_rewards/core/database/database_media_publisher_info.h b/components/brave_rewards/core/database/database_media_publisher_info.h index 7b62279420b..d298b977800 100644 --- a/components/brave_rewards/core/database/database_media_publisher_info.h +++ b/components/brave_rewards/core/database/database_media_publisher_info.h @@ -15,7 +15,7 @@ namespace database { class DatabaseMediaPublisherInfo : public DatabaseTable { public: - explicit DatabaseMediaPublisherInfo(RewardsEngineImpl& engine); + explicit DatabaseMediaPublisherInfo(RewardsEngine& engine); ~DatabaseMediaPublisherInfo() override; void InsertOrUpdate(const std::string& media_key, diff --git a/components/brave_rewards/core/database/database_migration.cc b/components/brave_rewards/core/database/database_migration.cc index 0716b7a0f7c..7afd459c66c 100644 --- a/components/brave_rewards/core/database/database_migration.cc +++ b/components/brave_rewards/core/database/database_migration.cc @@ -52,7 +52,7 @@ #include "brave/components/brave_rewards/core/database/migration/migration_v8.h" #include "brave/components/brave_rewards/core/database/migration/migration_v9.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "third_party/re2/src/re2/re2.h" // NOTICE!! @@ -66,8 +66,7 @@ namespace database { uint32_t DatabaseMigration::test_target_version_ = 0; -DatabaseMigration::DatabaseMigration(RewardsEngineImpl& engine) - : engine_(engine) {} +DatabaseMigration::DatabaseMigration(RewardsEngine& engine) : engine_(engine) {} DatabaseMigration::~DatabaseMigration() = default; diff --git a/components/brave_rewards/core/database/database_migration.h b/components/brave_rewards/core/database/database_migration.h index 5edf2be63ab..49920756dca 100644 --- a/components/brave_rewards/core/database/database_migration.h +++ b/components/brave_rewards/core/database/database_migration.h @@ -12,13 +12,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace database { class DatabaseMigration { public: - explicit DatabaseMigration(RewardsEngineImpl& engine); + explicit DatabaseMigration(RewardsEngine& engine); ~DatabaseMigration(); void Start(uint32_t table_version, ResultCallback callback); @@ -34,7 +34,7 @@ class DatabaseMigration { int migrated_version, mojom::DBCommandResponsePtr response); - const raw_ref engine_; + const raw_ref engine_; static uint32_t test_target_version_; }; diff --git a/components/brave_rewards/core/database/database_migration_unittest.cc b/components/brave_rewards/core/database/database_migration_unittest.cc index ac895a41ebf..dd558986920 100644 --- a/components/brave_rewards/core/database/database_migration_unittest.cc +++ b/components/brave_rewards/core/database/database_migration_unittest.cc @@ -16,7 +16,7 @@ #include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom-test-utils.h" #include "brave/components/brave_rewards/core/database/database_migration.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/test/rewards_engine_test.h" #include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" diff --git a/components/brave_rewards/core/database/database_mock.cc b/components/brave_rewards/core/database/database_mock.cc index e163ca9ff94..decc92ff216 100644 --- a/components/brave_rewards/core/database/database_mock.cc +++ b/components/brave_rewards/core/database/database_mock.cc @@ -8,7 +8,7 @@ namespace brave_rewards::internal { namespace database { -MockDatabase::MockDatabase(RewardsEngineImpl& engine) : Database(engine) {} +MockDatabase::MockDatabase(RewardsEngine& engine) : Database(engine) {} MockDatabase::~MockDatabase() = default; diff --git a/components/brave_rewards/core/database/database_mock.h b/components/brave_rewards/core/database/database_mock.h index 42550172e66..5311ff14a13 100644 --- a/components/brave_rewards/core/database/database_mock.h +++ b/components/brave_rewards/core/database/database_mock.h @@ -18,7 +18,7 @@ namespace database { class MockDatabase : public Database { public: - explicit MockDatabase(RewardsEngineImpl& engine); + explicit MockDatabase(RewardsEngine& engine); ~MockDatabase() override; diff --git a/components/brave_rewards/core/database/database_publisher_info.cc b/components/brave_rewards/core/database/database_publisher_info.cc index 1c3f78bc219..f40721ceacf 100644 --- a/components/brave_rewards/core/database/database_publisher_info.cc +++ b/components/brave_rewards/core/database/database_publisher_info.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/database/database_util.h" #include "brave/components/brave_rewards/core/global_constants.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace { @@ -24,7 +24,7 @@ const char kTableName[] = "publisher_info"; namespace brave_rewards::internal { namespace database { -DatabasePublisherInfo::DatabasePublisherInfo(RewardsEngineImpl& engine) +DatabasePublisherInfo::DatabasePublisherInfo(RewardsEngine& engine) : DatabaseTable(engine) {} DatabasePublisherInfo::~DatabasePublisherInfo() = default; diff --git a/components/brave_rewards/core/database/database_publisher_info.h b/components/brave_rewards/core/database/database_publisher_info.h index 03196c53d50..5c8b460c0a7 100644 --- a/components/brave_rewards/core/database/database_publisher_info.h +++ b/components/brave_rewards/core/database/database_publisher_info.h @@ -15,7 +15,7 @@ namespace database { class DatabasePublisherInfo : public DatabaseTable { public: - explicit DatabasePublisherInfo(RewardsEngineImpl& engine); + explicit DatabasePublisherInfo(RewardsEngine& engine); ~DatabasePublisherInfo() override; void InsertOrUpdate(mojom::PublisherInfoPtr info, ResultCallback callback); diff --git a/components/brave_rewards/core/database/database_publisher_prefix_list.cc b/components/brave_rewards/core/database/database_publisher_prefix_list.cc index 219b0f5fd6a..5dcb0956a7e 100644 --- a/components/brave_rewards/core/database/database_publisher_prefix_list.cc +++ b/components/brave_rewards/core/database/database_publisher_prefix_list.cc @@ -13,7 +13,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_util.h" #include "brave/components/brave_rewards/core/publisher/prefix_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { @@ -49,8 +49,7 @@ std::tuple GetPrefixInsertList( namespace database { -DatabasePublisherPrefixList::DatabasePublisherPrefixList( - RewardsEngineImpl& engine) +DatabasePublisherPrefixList::DatabasePublisherPrefixList(RewardsEngine& engine) : DatabaseTable(engine) {} DatabasePublisherPrefixList::~DatabasePublisherPrefixList() = default; diff --git a/components/brave_rewards/core/database/database_publisher_prefix_list.h b/components/brave_rewards/core/database/database_publisher_prefix_list.h index bca9477a49b..8a213f7f5f0 100644 --- a/components/brave_rewards/core/database/database_publisher_prefix_list.h +++ b/components/brave_rewards/core/database/database_publisher_prefix_list.h @@ -19,7 +19,7 @@ using SearchPublisherPrefixListCallback = base::OnceCallback; class DatabasePublisherPrefixList : public DatabaseTable { public: - explicit DatabasePublisherPrefixList(RewardsEngineImpl& engine); + explicit DatabasePublisherPrefixList(RewardsEngine& engine); ~DatabasePublisherPrefixList() override; void Reset(publisher::PrefixListReader reader, ResultCallback callback); diff --git a/components/brave_rewards/core/database/database_publisher_prefix_list_unittest.cc b/components/brave_rewards/core/database/database_publisher_prefix_list_unittest.cc index f4a7f35b008..19789ac29e0 100644 --- a/components/brave_rewards/core/database/database_publisher_prefix_list_unittest.cc +++ b/components/brave_rewards/core/database/database_publisher_prefix_list_unittest.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/database/database_publisher_prefix_list.h" #include "brave/components/brave_rewards/core/publisher/protos/publisher_prefix_list.pb.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" // npm run test -- brave_unit_tests --filter=DatabasePublisherPrefixListTest.* @@ -50,7 +50,7 @@ class DatabasePublisherPrefixListTest : public ::testing::Test { } base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; DatabasePublisherPrefixList database_prefix_list_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/database/database_recurring_tip.cc b/components/brave_rewards/core/database/database_recurring_tip.cc index bd80ab9c410..17759dbee4c 100644 --- a/components/brave_rewards/core/database/database_recurring_tip.cc +++ b/components/brave_rewards/core/database/database_recurring_tip.cc @@ -14,7 +14,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/constants.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state.h" namespace brave_rewards::internal { @@ -35,7 +35,7 @@ void MapDatabaseResultToSuccess(base::OnceCallback callback, } // namespace -DatabaseRecurringTip::DatabaseRecurringTip(RewardsEngineImpl& engine) +DatabaseRecurringTip::DatabaseRecurringTip(RewardsEngine& engine) : DatabaseTable(engine) {} DatabaseRecurringTip::~DatabaseRecurringTip() = default; diff --git a/components/brave_rewards/core/database/database_recurring_tip.h b/components/brave_rewards/core/database/database_recurring_tip.h index d1020b2cefb..33bba16b6ff 100644 --- a/components/brave_rewards/core/database/database_recurring_tip.h +++ b/components/brave_rewards/core/database/database_recurring_tip.h @@ -19,7 +19,7 @@ namespace database { class DatabaseRecurringTip : public DatabaseTable { public: - explicit DatabaseRecurringTip(RewardsEngineImpl& engine); + explicit DatabaseRecurringTip(RewardsEngine& engine); ~DatabaseRecurringTip() override; // DEPRECATED diff --git a/components/brave_rewards/core/database/database_server_publisher_banner.cc b/components/brave_rewards/core/database/database_server_publisher_banner.cc index 395dd1a8341..95bb98ec881 100644 --- a/components/brave_rewards/core/database/database_server_publisher_banner.cc +++ b/components/brave_rewards/core/database/database_server_publisher_banner.cc @@ -8,7 +8,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_server_publisher_banner.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace { @@ -20,7 +20,7 @@ namespace brave_rewards::internal { namespace database { DatabaseServerPublisherBanner::DatabaseServerPublisherBanner( - RewardsEngineImpl& engine) + RewardsEngine& engine) : DatabaseTable(engine), links_(engine) {} DatabaseServerPublisherBanner::~DatabaseServerPublisherBanner() = default; diff --git a/components/brave_rewards/core/database/database_server_publisher_banner.h b/components/brave_rewards/core/database/database_server_publisher_banner.h index bfbf1816eb4..d08f36856ac 100644 --- a/components/brave_rewards/core/database/database_server_publisher_banner.h +++ b/components/brave_rewards/core/database/database_server_publisher_banner.h @@ -19,7 +19,7 @@ namespace database { class DatabaseServerPublisherBanner : public DatabaseTable { public: - explicit DatabaseServerPublisherBanner(RewardsEngineImpl& engine); + explicit DatabaseServerPublisherBanner(RewardsEngine& engine); ~DatabaseServerPublisherBanner() override; void InsertOrUpdate(mojom::DBTransaction* transaction, diff --git a/components/brave_rewards/core/database/database_server_publisher_info.cc b/components/brave_rewards/core/database/database_server_publisher_info.cc index a433e63f759..a7c1c10304b 100644 --- a/components/brave_rewards/core/database/database_server_publisher_info.cc +++ b/components/brave_rewards/core/database/database_server_publisher_info.cc @@ -9,7 +9,7 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database_server_publisher_info.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace { @@ -21,8 +21,7 @@ namespace brave_rewards::internal { namespace database { -DatabaseServerPublisherInfo::DatabaseServerPublisherInfo( - RewardsEngineImpl& engine) +DatabaseServerPublisherInfo::DatabaseServerPublisherInfo(RewardsEngine& engine) : DatabaseTable(engine), banner_(engine) {} DatabaseServerPublisherInfo::~DatabaseServerPublisherInfo() = default; diff --git a/components/brave_rewards/core/database/database_server_publisher_info.h b/components/brave_rewards/core/database/database_server_publisher_info.h index c74992f0ad7..e5b2b240cb6 100644 --- a/components/brave_rewards/core/database/database_server_publisher_info.h +++ b/components/brave_rewards/core/database/database_server_publisher_info.h @@ -18,7 +18,7 @@ namespace database { class DatabaseServerPublisherInfo : public DatabaseTable { public: - explicit DatabaseServerPublisherInfo(RewardsEngineImpl& engine); + explicit DatabaseServerPublisherInfo(RewardsEngine& engine); ~DatabaseServerPublisherInfo() override; void InsertOrUpdate(const mojom::ServerPublisherInfo& server_info, diff --git a/components/brave_rewards/core/database/database_server_publisher_links.cc b/components/brave_rewards/core/database/database_server_publisher_links.cc index a0be25333e7..62fb66915b3 100644 --- a/components/brave_rewards/core/database/database_server_publisher_links.cc +++ b/components/brave_rewards/core/database/database_server_publisher_links.cc @@ -8,7 +8,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_server_publisher_links.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace { @@ -20,7 +20,7 @@ namespace brave_rewards::internal { namespace database { DatabaseServerPublisherLinks::DatabaseServerPublisherLinks( - RewardsEngineImpl& engine) + RewardsEngine& engine) : DatabaseTable(engine) {} DatabaseServerPublisherLinks::~DatabaseServerPublisherLinks() = default; diff --git a/components/brave_rewards/core/database/database_server_publisher_links.h b/components/brave_rewards/core/database/database_server_publisher_links.h index 33eb1bc41b3..86b2496d2bb 100644 --- a/components/brave_rewards/core/database/database_server_publisher_links.h +++ b/components/brave_rewards/core/database/database_server_publisher_links.h @@ -17,7 +17,7 @@ namespace database { class DatabaseServerPublisherLinks : public DatabaseTable { public: - explicit DatabaseServerPublisherLinks(RewardsEngineImpl& engine); + explicit DatabaseServerPublisherLinks(RewardsEngine& engine); ~DatabaseServerPublisherLinks() override; void InsertOrUpdate(mojom::DBTransaction* transaction, diff --git a/components/brave_rewards/core/database/database_sku_order.cc b/components/brave_rewards/core/database/database_sku_order.cc index c6642439c8b..70d62b6b6c6 100644 --- a/components/brave_rewards/core/database/database_sku_order.cc +++ b/components/brave_rewards/core/database/database_sku_order.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_sku_order.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace database { @@ -20,7 +20,7 @@ const char kTableName[] = "sku_order"; } // namespace -DatabaseSKUOrder::DatabaseSKUOrder(RewardsEngineImpl& engine) +DatabaseSKUOrder::DatabaseSKUOrder(RewardsEngine& engine) : DatabaseTable(engine), items_(engine) {} DatabaseSKUOrder::~DatabaseSKUOrder() = default; diff --git a/components/brave_rewards/core/database/database_sku_order.h b/components/brave_rewards/core/database/database_sku_order.h index 7637709fc9e..39d46b1326e 100644 --- a/components/brave_rewards/core/database/database_sku_order.h +++ b/components/brave_rewards/core/database/database_sku_order.h @@ -21,7 +21,7 @@ using GetSKUOrderCallback = base::OnceCallback; class DatabaseSKUOrder : public DatabaseTable { public: - explicit DatabaseSKUOrder(RewardsEngineImpl& engine); + explicit DatabaseSKUOrder(RewardsEngine& engine); ~DatabaseSKUOrder() override; void InsertOrUpdate(mojom::SKUOrderPtr info, ResultCallback callback); diff --git a/components/brave_rewards/core/database/database_sku_order_items.cc b/components/brave_rewards/core/database/database_sku_order_items.cc index 7765887506d..1486a139bd5 100644 --- a/components/brave_rewards/core/database/database_sku_order_items.cc +++ b/components/brave_rewards/core/database/database_sku_order_items.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_sku_order_items.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace database { @@ -20,7 +20,7 @@ const char kTableName[] = "sku_order_items"; } // namespace -DatabaseSKUOrderItems::DatabaseSKUOrderItems(RewardsEngineImpl& engine) +DatabaseSKUOrderItems::DatabaseSKUOrderItems(RewardsEngine& engine) : DatabaseTable(engine) {} DatabaseSKUOrderItems::~DatabaseSKUOrderItems() = default; diff --git a/components/brave_rewards/core/database/database_sku_order_items.h b/components/brave_rewards/core/database/database_sku_order_items.h index 7bbc8a6c911..9e44ceadf6d 100644 --- a/components/brave_rewards/core/database/database_sku_order_items.h +++ b/components/brave_rewards/core/database/database_sku_order_items.h @@ -20,7 +20,7 @@ using GetSKUOrderItemsCallback = class DatabaseSKUOrderItems : public DatabaseTable { public: - explicit DatabaseSKUOrderItems(RewardsEngineImpl& engine); + explicit DatabaseSKUOrderItems(RewardsEngine& engine); ~DatabaseSKUOrderItems() override; void InsertOrUpdateList(mojom::DBTransaction* transaction, diff --git a/components/brave_rewards/core/database/database_sku_transaction.cc b/components/brave_rewards/core/database/database_sku_transaction.cc index be39aed13db..0c6f06671d1 100644 --- a/components/brave_rewards/core/database/database_sku_transaction.cc +++ b/components/brave_rewards/core/database/database_sku_transaction.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/database/database_sku_transaction.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace database { @@ -20,7 +20,7 @@ const char kTableName[] = "sku_transaction"; } // namespace -DatabaseSKUTransaction::DatabaseSKUTransaction(RewardsEngineImpl& engine) +DatabaseSKUTransaction::DatabaseSKUTransaction(RewardsEngine& engine) : DatabaseTable(engine) {} DatabaseSKUTransaction::~DatabaseSKUTransaction() = default; diff --git a/components/brave_rewards/core/database/database_sku_transaction.h b/components/brave_rewards/core/database/database_sku_transaction.h index 854e2dddce8..a62db30789e 100644 --- a/components/brave_rewards/core/database/database_sku_transaction.h +++ b/components/brave_rewards/core/database/database_sku_transaction.h @@ -21,7 +21,7 @@ using GetSKUTransactionCallback = base::OnceCallback engine_; + const raw_ref engine_; }; } // namespace database diff --git a/components/brave_rewards/core/database/database_unblinded_token.cc b/components/brave_rewards/core/database/database_unblinded_token.cc index 8e99168e76f..e1c083a8899 100644 --- a/components/brave_rewards/core/database/database_unblinded_token.cc +++ b/components/brave_rewards/core/database/database_unblinded_token.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database_unblinded_token.h" #include "brave/components/brave_rewards/core/database/database_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace database { @@ -24,7 +24,7 @@ const char kTableName[] = "unblinded_tokens"; } // namespace -DatabaseUnblindedToken::DatabaseUnblindedToken(RewardsEngineImpl& engine) +DatabaseUnblindedToken::DatabaseUnblindedToken(RewardsEngine& engine) : DatabaseTable(engine) {} DatabaseUnblindedToken::~DatabaseUnblindedToken() = default; diff --git a/components/brave_rewards/core/database/database_unblinded_token.h b/components/brave_rewards/core/database/database_unblinded_token.h index 1886dc20e88..4613db39fa5 100644 --- a/components/brave_rewards/core/database/database_unblinded_token.h +++ b/components/brave_rewards/core/database/database_unblinded_token.h @@ -19,7 +19,7 @@ using GetUnblindedTokenListCallback = class DatabaseUnblindedToken : public DatabaseTable { public: - explicit DatabaseUnblindedToken(RewardsEngineImpl& engine); + explicit DatabaseUnblindedToken(RewardsEngine& engine); ~DatabaseUnblindedToken() override; void InsertOrUpdateList(std::vector list, diff --git a/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.cc b/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.cc index 6ccbc2f6fa3..e7406b2eb87 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.cc +++ b/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.cc @@ -5,12 +5,12 @@ #include "brave/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace endpoint { -BitflyerServer::BitflyerServer(RewardsEngineImpl& engine) +BitflyerServer::BitflyerServer(RewardsEngine& engine) : get_balance_(engine), post_oauth_(engine) {} BitflyerServer::~BitflyerServer() = default; diff --git a/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.h b/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.h index 9caa037c5aa..ea119812e5d 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.h +++ b/components/brave_rewards/core/endpoint/bitflyer/bitflyer_server.h @@ -10,13 +10,13 @@ #include "brave/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { class BitflyerServer { public: - explicit BitflyerServer(RewardsEngineImpl& engine); + explicit BitflyerServer(RewardsEngine& engine); ~BitflyerServer(); bitflyer::GetBalance& get_balance() { return get_balance_; } diff --git a/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.cc b/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.cc index 10317a19726..a9fc8f4beb8 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.cc +++ b/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.cc @@ -12,14 +12,14 @@ #include "base/strings/string_number_conversions.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace bitflyer { -GetBalance::GetBalance(RewardsEngineImpl& engine) : engine_(engine) {} +GetBalance::GetBalance(RewardsEngine& engine) : engine_(engine) {} GetBalance::~GetBalance() = default; diff --git a/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.h b/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.h index 7880a94cb3f..3bd6d310c9c 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.h +++ b/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.h @@ -43,7 +43,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { namespace bitflyer { @@ -53,7 +53,7 @@ using GetBalanceCallback = base::OnceCallback engine_; + const raw_ref engine_; }; } // namespace bitflyer diff --git a/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer_unittest.cc b/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer_unittest.cc index 746f1429e30..122b44005c8 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer_unittest.cc +++ b/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer_unittest.cc @@ -11,7 +11,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/bitflyer/get_balance/get_balance_bitflyer.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ namespace bitflyer { class GetBalanceTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; GetBalance balance_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.cc b/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.cc index 648770c1b28..503263df725 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.cc +++ b/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.cc @@ -15,12 +15,12 @@ #include "base/uuid.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoint::bitflyer { -PostOauth::PostOauth(RewardsEngineImpl& engine) : engine_(engine) {} +PostOauth::PostOauth(RewardsEngine& engine) : engine_(engine) {} PostOauth::~PostOauth() = default; diff --git a/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.h b/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.h index bebb84dd503..6b390290501 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.h +++ b/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.h @@ -44,7 +44,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint::bitflyer { @@ -55,7 +55,7 @@ using PostOauthCallback = base::OnceCallback engine_; + const raw_ref engine_; }; } // namespace endpoint::bitflyer diff --git a/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer_unittest.cc b/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer_unittest.cc index 6dfa378c2f6..ae45c409db3 100644 --- a/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer_unittest.cc +++ b/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer_unittest.cc @@ -12,7 +12,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/bitflyer/post_oauth/post_oauth_bitflyer.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,7 +27,7 @@ namespace bitflyer { class BitflyerPostOauthTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; PostOauth oauth_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/gemini/gemini_server.cc b/components/brave_rewards/core/endpoint/gemini/gemini_server.cc index 1b591076eda..d495ffca1bb 100644 --- a/components/brave_rewards/core/endpoint/gemini/gemini_server.cc +++ b/components/brave_rewards/core/endpoint/gemini/gemini_server.cc @@ -5,12 +5,12 @@ #include "brave/components/brave_rewards/core/endpoint/gemini/gemini_server.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace endpoint { -GeminiServer::GeminiServer(RewardsEngineImpl& engine) +GeminiServer::GeminiServer(RewardsEngine& engine) : post_account_(engine), post_balance_(engine), post_oauth_(engine), diff --git a/components/brave_rewards/core/endpoint/gemini/gemini_server.h b/components/brave_rewards/core/endpoint/gemini/gemini_server.h index 483baf5e041..763b909746e 100644 --- a/components/brave_rewards/core/endpoint/gemini/gemini_server.h +++ b/components/brave_rewards/core/endpoint/gemini/gemini_server.h @@ -12,13 +12,13 @@ #include "brave/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { class GeminiServer { public: - explicit GeminiServer(RewardsEngineImpl& engine); + explicit GeminiServer(RewardsEngine& engine); ~GeminiServer(); gemini::PostAccount& post_account() { return post_account_; } diff --git a/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.cc b/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.cc index 6d7258d4d89..6ac1bcb7052 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.cc @@ -12,12 +12,12 @@ #include "base/strings/string_number_conversions.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoint::gemini { -PostAccount::PostAccount(RewardsEngineImpl& engine) : engine_(engine) {} +PostAccount::PostAccount(RewardsEngine& engine) : engine_(engine) {} PostAccount::~PostAccount() = default; diff --git a/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.h b/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.h index a0a462f9b8c..157032c56d9 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.h +++ b/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.h @@ -39,7 +39,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint::gemini { @@ -50,7 +50,7 @@ using PostAccountCallback = base::OnceCallback engine_; + const raw_ref engine_; }; } // namespace endpoint::gemini diff --git a/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini_unittest.cc b/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini_unittest.cc index 0c1041b9c37..63c56ace5a6 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini_unittest.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini_unittest.cc @@ -11,7 +11,7 @@ #include "brave/components/brave_rewards/core/endpoint/gemini/post_account/post_account_gemini.h" #include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ namespace gemini { class GeminiPostAccountTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; PostAccount post_account_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.cc b/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.cc index 3216ea551b8..a4d6fe57f55 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.cc @@ -13,14 +13,14 @@ #include "base/strings/string_number_conversions.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace gemini { -PostBalance::PostBalance(RewardsEngineImpl& engine) : engine_(engine) {} +PostBalance::PostBalance(RewardsEngine& engine) : engine_(engine) {} PostBalance::~PostBalance() = default; diff --git a/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.h b/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.h index e85150e6173..36b29bb5cff 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.h +++ b/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.h @@ -43,7 +43,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { namespace gemini { @@ -53,7 +53,7 @@ using PostBalanceCallback = base::OnceCallback engine_; + const raw_ref engine_; }; } // namespace gemini diff --git a/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini_unittest.cc b/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini_unittest.cc index 4b7ee11fcb9..e861c2a4254 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini_unittest.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini_unittest.cc @@ -11,7 +11,7 @@ #include "brave/components/brave_rewards/core/endpoint/gemini/post_balance/post_balance_gemini.h" #include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ namespace gemini { class GeminiPostBalanceTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; PostBalance balance_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.cc b/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.cc index a5b4c47ff13..68bf120704e 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.cc @@ -13,12 +13,12 @@ #include "base/uuid.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoint::gemini { -PostOauth::PostOauth(RewardsEngineImpl& engine) : engine_(engine) {} +PostOauth::PostOauth(RewardsEngine& engine) : engine_(engine) {} PostOauth::~PostOauth() = default; diff --git a/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.h b/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.h index 1ffdf483138..d859eaa3185 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.h +++ b/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.h @@ -39,7 +39,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint::gemini { @@ -48,7 +48,7 @@ using PostOauthCallback = class PostOauth { public: - explicit PostOauth(RewardsEngineImpl& engine); + explicit PostOauth(RewardsEngine& engine); ~PostOauth(); void Request(const std::string& external_account_id, @@ -65,7 +65,7 @@ class PostOauth { void OnRequest(PostOauthCallback, mojom::UrlResponsePtr); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace endpoint::gemini diff --git a/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini_unittest.cc b/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini_unittest.cc index c8cfa192f0c..56e445277f3 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini_unittest.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini_unittest.cc @@ -11,7 +11,7 @@ #include "brave/components/brave_rewards/core/endpoint/gemini/post_oauth/post_oauth_gemini.h" #include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ namespace gemini { class GeminiPostOauthTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; PostOauth oauth_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.cc b/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.cc index dfbc0dd0107..25aa1911f83 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.cc @@ -14,12 +14,12 @@ #include "base/uuid.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoint::gemini { -PostRecipientId::PostRecipientId(RewardsEngineImpl& engine) : engine_(engine) {} +PostRecipientId::PostRecipientId(RewardsEngine& engine) : engine_(engine) {} PostRecipientId::~PostRecipientId() = default; diff --git a/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.h b/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.h index 6e3927538b8..d234c50da36 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.h +++ b/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.h @@ -39,7 +39,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint::gemini { @@ -50,7 +50,7 @@ class PostRecipientId { public: static inline const std::string kRecipientLabel = "Brave Browser"; - explicit PostRecipientId(RewardsEngineImpl& engine); + explicit PostRecipientId(RewardsEngine& engine); ~PostRecipientId(); void Request(const std::string& token, PostRecipientIdCallback); @@ -63,7 +63,7 @@ class PostRecipientId { void OnRequest(PostRecipientIdCallback, mojom::UrlResponsePtr); std::string GeneratePayload(); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace endpoint::gemini diff --git a/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini_unittest.cc b/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini_unittest.cc index 51da7a1ccb9..2bbb6826ba2 100644 --- a/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini_unittest.cc +++ b/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini_unittest.cc @@ -10,7 +10,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -25,7 +25,7 @@ namespace gemini { class GeminiPostRecipientIdTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; PostRecipientId post_recipient_id_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.cc b/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.cc index 6df9ef99916..1e84f957e61 100644 --- a/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.cc +++ b/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.cc @@ -13,14 +13,14 @@ #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_helpers.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace payment { -GetCredentials::GetCredentials(RewardsEngineImpl& engine) : engine_(engine) {} +GetCredentials::GetCredentials(RewardsEngine& engine) : engine_(engine) {} GetCredentials::~GetCredentials() = default; diff --git a/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.h b/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.h index 29f9a225c67..dac8ff57b80 100644 --- a/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.h +++ b/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.h @@ -46,7 +46,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { namespace payment { @@ -56,7 +56,7 @@ using GetCredentialsCallback = class GetCredentials { public: - explicit GetCredentials(RewardsEngineImpl& engine); + explicit GetCredentials(RewardsEngine& engine); ~GetCredentials(); void Request(const std::string& order_id, @@ -73,7 +73,7 @@ class GetCredentials { void OnRequest(GetCredentialsCallback callback, mojom::UrlResponsePtr response); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace payment diff --git a/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials_unittest.cc b/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials_unittest.cc index 47b09bec097..61e07cf5cd6 100644 --- a/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials_unittest.cc +++ b/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials_unittest.cc @@ -11,7 +11,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/payment/get_credentials/get_credentials.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ namespace payment { class GetCredentialsTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; GetCredentials creds_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/payment/payment_server.cc b/components/brave_rewards/core/endpoint/payment/payment_server.cc index 96693e1b7a0..37694c53e32 100644 --- a/components/brave_rewards/core/endpoint/payment/payment_server.cc +++ b/components/brave_rewards/core/endpoint/payment/payment_server.cc @@ -5,12 +5,12 @@ #include "brave/components/brave_rewards/core/endpoint/payment/payment_server.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace endpoint { -PaymentServer::PaymentServer(RewardsEngineImpl& engine) +PaymentServer::PaymentServer(RewardsEngine& engine) : post_order_(engine), post_credentials_(engine), get_credentials_(engine), diff --git a/components/brave_rewards/core/endpoint/payment/payment_server.h b/components/brave_rewards/core/endpoint/payment/payment_server.h index db5cb42aa2e..ae7fa75d350 100644 --- a/components/brave_rewards/core/endpoint/payment/payment_server.h +++ b/components/brave_rewards/core/endpoint/payment/payment_server.h @@ -14,13 +14,13 @@ #include "brave/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { class PaymentServer { public: - explicit PaymentServer(RewardsEngineImpl& engine); + explicit PaymentServer(RewardsEngine& engine); ~PaymentServer(); payment::PostOrder& post_order() { return post_order_; } diff --git a/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.cc b/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.cc index 49278c608db..5496fccbb24 100644 --- a/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.cc +++ b/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.cc @@ -11,14 +11,14 @@ #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_helpers.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace payment { -PostCredentials::PostCredentials(RewardsEngineImpl& engine) : engine_(engine) {} +PostCredentials::PostCredentials(RewardsEngine& engine) : engine_(engine) {} PostCredentials::~PostCredentials() = default; diff --git a/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.h b/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.h index 78c9f9f508c..9bbb000d830 100644 --- a/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.h +++ b/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.h @@ -37,7 +37,7 @@ // {Empty} namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { namespace payment { @@ -46,7 +46,7 @@ using PostCredentialsCallback = base::OnceCallback; class PostCredentials { public: - explicit PostCredentials(RewardsEngineImpl& engine); + explicit PostCredentials(RewardsEngine& engine); ~PostCredentials(); void Request(const std::string& order_id, @@ -67,7 +67,7 @@ class PostCredentials { void OnRequest(PostCredentialsCallback callback, mojom::UrlResponsePtr response); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace payment diff --git a/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials_unittest.cc b/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials_unittest.cc index 21257bb6140..5e9a97913b0 100644 --- a/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials_unittest.cc +++ b/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials_unittest.cc @@ -11,7 +11,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/payment/post_credentials/post_credentials.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ namespace payment { class PostCredentialsTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; PostCredentials creds_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/payment/post_order/post_order.cc b/components/brave_rewards/core/endpoint/payment/post_order/post_order.cc index 08744ca557a..128a1b592e1 100644 --- a/components/brave_rewards/core/endpoint/payment/post_order/post_order.cc +++ b/components/brave_rewards/core/endpoint/payment/post_order/post_order.cc @@ -13,14 +13,14 @@ #include "base/strings/string_number_conversions.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace payment { -PostOrder::PostOrder(RewardsEngineImpl& engine) : engine_(engine) {} +PostOrder::PostOrder(RewardsEngine& engine) : engine_(engine) {} PostOrder::~PostOrder() = default; diff --git a/components/brave_rewards/core/endpoint/payment/post_order/post_order.h b/components/brave_rewards/core/endpoint/payment/post_order/post_order.h index ad3e39435e3..cb9a62a3d72 100644 --- a/components/brave_rewards/core/endpoint/payment/post_order/post_order.h +++ b/components/brave_rewards/core/endpoint/payment/post_order/post_order.h @@ -59,7 +59,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { namespace payment { @@ -69,7 +69,7 @@ using PostOrderCallback = base::OnceCallback& items, @@ -90,7 +90,7 @@ class PostOrder { PostOrderCallback callback, mojom::UrlResponsePtr response); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace payment diff --git a/components/brave_rewards/core/endpoint/payment/post_order/post_order_unittest.cc b/components/brave_rewards/core/endpoint/payment/post_order/post_order_unittest.cc index a6844c1ef2f..50feb075596 100644 --- a/components/brave_rewards/core/endpoint/payment/post_order/post_order_unittest.cc +++ b/components/brave_rewards/core/endpoint/payment/post_order/post_order_unittest.cc @@ -11,7 +11,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/payment/post_order/post_order.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,7 +27,7 @@ namespace payment { class PostOrderTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; PostOrder order_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.cc b/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.cc index 7ba339de63e..7b0c07f761c 100644 --- a/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.cc +++ b/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.cc @@ -11,14 +11,14 @@ #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_helpers.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace payment { -PostTransactionGemini::PostTransactionGemini(RewardsEngineImpl& engine) +PostTransactionGemini::PostTransactionGemini(RewardsEngine& engine) : engine_(engine) {} PostTransactionGemini::~PostTransactionGemini() = default; diff --git a/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.h b/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.h index 21e7be55223..5b04be18fd2 100644 --- a/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.h +++ b/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.h @@ -43,7 +43,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { namespace payment { @@ -53,7 +53,7 @@ using PostTransactionGeminiCallback = class PostTransactionGemini { public: - explicit PostTransactionGemini(RewardsEngineImpl& engine); + explicit PostTransactionGemini(RewardsEngine& engine); ~PostTransactionGemini(); void Request(const mojom::SKUTransaction& transaction, @@ -69,7 +69,7 @@ class PostTransactionGemini { void OnRequest(PostTransactionGeminiCallback callback, mojom::UrlResponsePtr response); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace payment diff --git a/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini_unittest.cc b/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini_unittest.cc index 3ef84149657..1ea9dc818fe 100644 --- a/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini_unittest.cc +++ b/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini_unittest.cc @@ -11,7 +11,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/payment/post_transaction_gemini/post_transaction_sku_gemini.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ namespace payment { class PostTransactionGeminiTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; PostTransactionGemini order_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.cc b/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.cc index f5e404167f6..b11e972ec48 100644 --- a/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.cc +++ b/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.cc @@ -11,14 +11,14 @@ #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_helpers.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace payment { -PostTransactionUphold::PostTransactionUphold(RewardsEngineImpl& engine) +PostTransactionUphold::PostTransactionUphold(RewardsEngine& engine) : engine_(engine) {} PostTransactionUphold::~PostTransactionUphold() = default; diff --git a/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.h b/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.h index 68e273e8d39..d0415d16871 100644 --- a/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.h +++ b/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.h @@ -43,7 +43,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { namespace payment { @@ -53,7 +53,7 @@ using PostTransactionUpholdCallback = class PostTransactionUphold { public: - explicit PostTransactionUphold(RewardsEngineImpl& engine); + explicit PostTransactionUphold(RewardsEngine& engine); ~PostTransactionUphold(); void Request(const mojom::SKUTransaction& transaction, @@ -69,7 +69,7 @@ class PostTransactionUphold { void OnRequest(PostTransactionUpholdCallback callback, mojom::UrlResponsePtr response); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace payment diff --git a/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold_unittest.cc b/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold_unittest.cc index fcc208f382c..140d174841d 100644 --- a/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold_unittest.cc +++ b/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold_unittest.cc @@ -11,7 +11,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/payment/post_transaction_uphold/post_transaction_uphold.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ namespace payment { class PostTransactionUpholdTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; PostTransactionUphold order_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.cc b/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.cc index a9d351df013..79e555cd060 100644 --- a/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.cc +++ b/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.cc @@ -12,14 +12,14 @@ #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_loader.h" #include "brave/components/brave_rewards/core/credentials/credentials_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace payment { -PostVotes::PostVotes(RewardsEngineImpl& engine) : engine_(engine) {} +PostVotes::PostVotes(RewardsEngine& engine) : engine_(engine) {} PostVotes::~PostVotes() = default; diff --git a/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.h b/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.h index d2581baaf94..b76902154e9 100644 --- a/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.h +++ b/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.h @@ -37,7 +37,7 @@ // {Empty} namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { namespace payment { @@ -46,7 +46,7 @@ using PostVotesCallback = base::OnceCallback; class PostVotes { public: - explicit PostVotes(RewardsEngineImpl& engine); + explicit PostVotes(RewardsEngine& engine); ~PostVotes(); void Request(const credential::CredentialsRedeem& redeem, @@ -61,7 +61,7 @@ class PostVotes { void OnRequest(PostVotesCallback callback, mojom::UrlResponsePtr response); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace payment diff --git a/components/brave_rewards/core/endpoint/payment/post_votes/post_votes_unittest.cc b/components/brave_rewards/core/endpoint/payment/post_votes/post_votes_unittest.cc index 2ecb99b4bfb..d800b021884 100644 --- a/components/brave_rewards/core/endpoint/payment/post_votes/post_votes_unittest.cc +++ b/components/brave_rewards/core/endpoint/payment/post_votes/post_votes_unittest.cc @@ -11,7 +11,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/payment/post_votes/post_votes.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ namespace payment { class PostVotesTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; PostVotes votes_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.cc b/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.cc index ee74c37faf3..c6ab70f78a6 100644 --- a/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.cc +++ b/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.cc @@ -15,7 +15,7 @@ #include "brave/components/brave_rewards/core/common/url_helpers.h" #include "brave/components/brave_rewards/core/common/url_loader.h" #include "brave/components/brave_rewards/core/publisher/protos/channel_response.pb.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/base/load_flags.h" #include "net/http/http_status_code.h" @@ -149,7 +149,7 @@ bool DecompressMessage(std::string_view payload, std::string* output) { namespace endpoint { namespace private_cdn { -GetPublisher::GetPublisher(RewardsEngineImpl& engine) : engine_(engine) {} +GetPublisher::GetPublisher(RewardsEngine& engine) : engine_(engine) {} GetPublisher::~GetPublisher() = default; diff --git a/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.h b/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.h index 61ba4b29eeb..c9272d13338 100644 --- a/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.h +++ b/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.h @@ -24,7 +24,7 @@ // https://github.com/brave/brave-core/blob/master/components/brave_rewards/core/publisher/protos/channel_response.proto namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { namespace private_cdn { @@ -35,7 +35,7 @@ using GetPublisherCallback = class GetPublisher { public: - explicit GetPublisher(RewardsEngineImpl& engine); + explicit GetPublisher(RewardsEngine& engine); ~GetPublisher(); void Request(const std::string& publisher_key, @@ -55,7 +55,7 @@ class GetPublisher { GetPublisherCallback callback, mojom::UrlResponsePtr response); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace private_cdn diff --git a/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.cc b/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.cc index 7a89c65bcbb..97323fb52fb 100644 --- a/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.cc +++ b/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.cc @@ -4,12 +4,12 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace endpoint { -PrivateCDNServer::PrivateCDNServer(RewardsEngineImpl& engine) +PrivateCDNServer::PrivateCDNServer(RewardsEngine& engine) : get_publisher_(engine) {} PrivateCDNServer::~PrivateCDNServer() = default; diff --git a/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.h b/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.h index a46ff9bb062..d6e9f0cef31 100644 --- a/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.h +++ b/components/brave_rewards/core/endpoint/private_cdn/private_cdn_server.h @@ -9,13 +9,13 @@ #include "brave/components/brave_rewards/core/endpoint/private_cdn/get_publisher/get_publisher.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { class PrivateCDNServer { public: - explicit PrivateCDNServer(RewardsEngineImpl& engine); + explicit PrivateCDNServer(RewardsEngine& engine); ~PrivateCDNServer(); private_cdn::GetPublisher& get_publisher() { return get_publisher_; } diff --git a/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.cc b/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.cc index 2fcdea1d33a..5c09e6ce2fa 100644 --- a/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.cc +++ b/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.cc @@ -9,14 +9,14 @@ #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace rewards { -GetPrefixList::GetPrefixList(RewardsEngineImpl& engine) : engine_(engine) {} +GetPrefixList::GetPrefixList(RewardsEngine& engine) : engine_(engine) {} GetPrefixList::~GetPrefixList() = default; diff --git a/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.h b/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.h index 709263bcccb..016a6f06925 100644 --- a/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.h +++ b/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.h @@ -20,7 +20,7 @@ // blob namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { namespace rewards { @@ -31,7 +31,7 @@ using GetPrefixListCallback = class GetPrefixList { public: - explicit GetPrefixList(RewardsEngineImpl& engine); + explicit GetPrefixList(RewardsEngine& engine); ~GetPrefixList(); void Request(GetPrefixListCallback callback); @@ -44,7 +44,7 @@ class GetPrefixList { void OnRequest(GetPrefixListCallback callback, mojom::UrlResponsePtr response); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace rewards diff --git a/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list_unittest.cc b/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list_unittest.cc index 577afe095fa..fcd140d4a2e 100644 --- a/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list_unittest.cc +++ b/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list_unittest.cc @@ -11,7 +11,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ namespace rewards { class GetPrefixListTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; GetPrefixList list_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/rewards/rewards_server.cc b/components/brave_rewards/core/endpoint/rewards/rewards_server.cc index 368966398f9..2abd5e00f9d 100644 --- a/components/brave_rewards/core/endpoint/rewards/rewards_server.cc +++ b/components/brave_rewards/core/endpoint/rewards/rewards_server.cc @@ -4,12 +4,12 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "brave/components/brave_rewards/core/endpoint/rewards/rewards_server.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace endpoint { -RewardsServer::RewardsServer(RewardsEngineImpl& engine) +RewardsServer::RewardsServer(RewardsEngine& engine) : get_prefix_list_(engine) {} RewardsServer::~RewardsServer() = default; diff --git a/components/brave_rewards/core/endpoint/rewards/rewards_server.h b/components/brave_rewards/core/endpoint/rewards/rewards_server.h index 65fbd8ff9aa..e075f7063e2 100644 --- a/components/brave_rewards/core/endpoint/rewards/rewards_server.h +++ b/components/brave_rewards/core/endpoint/rewards/rewards_server.h @@ -9,13 +9,13 @@ #include "brave/components/brave_rewards/core/endpoint/rewards/get_prefix_list/get_prefix_list.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { class RewardsServer { public: - explicit RewardsServer(RewardsEngineImpl& engine); + explicit RewardsServer(RewardsEngine& engine); ~RewardsServer(); rewards::GetPrefixList& get_prefix_list() { return get_prefix_list_; } diff --git a/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.cc b/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.cc index bb0cdb179f2..c72d5d78109 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.cc @@ -10,7 +10,7 @@ #include "base/json/json_reader.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { @@ -20,7 +20,7 @@ using uphold::Capabilities; namespace endpoint { namespace uphold { -GetCapabilities::GetCapabilities(RewardsEngineImpl& engine) : engine_(engine) {} +GetCapabilities::GetCapabilities(RewardsEngine& engine) : engine_(engine) {} GetCapabilities::~GetCapabilities() = default; diff --git a/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.h b/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.h index ddc4c92b729..832e17f1332 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.h +++ b/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities.h @@ -167,7 +167,7 @@ // ] namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { namespace uphold { @@ -177,7 +177,7 @@ using GetCapabilitiesCallback = class GetCapabilities { public: - explicit GetCapabilities(RewardsEngineImpl& engine); + explicit GetCapabilities(RewardsEngine& engine); ~GetCapabilities(); void Request(const std::string& token, @@ -199,7 +199,7 @@ class GetCapabilities { CapabilityMap ParseBody(const std::string& body) const; - const raw_ref engine_; + const raw_ref engine_; }; } // namespace uphold diff --git a/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities_unittest.cc b/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities_unittest.cc index 1ab313d8223..d2198a3b582 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities_unittest.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_capabilities/get_capabilities_unittest.cc @@ -13,7 +13,7 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "brave/components/brave_rewards/core/uphold/uphold_capabilities.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -31,7 +31,7 @@ namespace uphold { class GetCapabilitiesTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; GetCapabilities get_capabilities_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/uphold/get_card/get_card.cc b/components/brave_rewards/core/endpoint/uphold/get_card/get_card.cc index e01c7b113e9..efe5d9b57c7 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_card/get_card.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_card/get_card.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_helpers.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/uphold/uphold_card.h" #include "net/http/http_status_code.h" @@ -21,7 +21,7 @@ namespace brave_rewards::internal { namespace endpoint { namespace uphold { -GetCard::GetCard(RewardsEngineImpl& engine) : engine_(engine) {} +GetCard::GetCard(RewardsEngine& engine) : engine_(engine) {} GetCard::~GetCard() = default; diff --git a/components/brave_rewards/core/endpoint/uphold/get_card/get_card.h b/components/brave_rewards/core/endpoint/uphold/get_card/get_card.h index 36ce8081eb6..fec1a2b023b 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_card/get_card.h +++ b/components/brave_rewards/core/endpoint/uphold/get_card/get_card.h @@ -73,7 +73,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { namespace uphold { @@ -83,7 +83,7 @@ using GetCardCallback = base::OnceCallback engine_; + const raw_ref engine_; }; } // namespace uphold diff --git a/components/brave_rewards/core/endpoint/uphold/get_card/get_card_unittest.cc b/components/brave_rewards/core/endpoint/uphold/get_card/get_card_unittest.cc index 09d49bb22ee..6566e9edffb 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_card/get_card_unittest.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_card/get_card_unittest.cc @@ -11,7 +11,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/uphold/get_card/get_card.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ namespace uphold { class GetCardTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; GetCard card_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.cc b/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.cc index 2c0e3ce7881..96a1cb62320 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.cc @@ -11,13 +11,13 @@ #include "base/json/json_reader.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/uphold/uphold_card.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoint::uphold { -GetCards::GetCards(RewardsEngineImpl& engine) : engine_(engine) {} +GetCards::GetCards(RewardsEngine& engine) : engine_(engine) {} GetCards::~GetCards() = default; diff --git a/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.h b/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.h index c8625c983b9..fca4fa24f0a 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.h +++ b/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.h @@ -74,7 +74,7 @@ // ] namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint::uphold { @@ -83,7 +83,7 @@ using GetCardsCallback = class GetCards { public: - explicit GetCards(RewardsEngineImpl& engine); + explicit GetCards(RewardsEngine& engine); ~GetCards(); void Request(const std::string& token, GetCardsCallback) const; @@ -97,7 +97,7 @@ class GetCards { void OnRequest(GetCardsCallback, mojom::UrlResponsePtr) const; - const raw_ref engine_; + const raw_ref engine_; }; } // namespace endpoint::uphold diff --git a/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards_unittest.cc b/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards_unittest.cc index a8f3cef5a66..856048d8bba 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards_unittest.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards_unittest.cc @@ -12,7 +12,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/uphold/get_cards/get_cards.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,7 +27,7 @@ namespace uphold { class GetCardsTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; GetCards card_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/uphold/get_me/get_me.cc b/components/brave_rewards/core/endpoint/uphold/get_me/get_me.cc index 53a39ca06f1..24fa3327b76 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_me/get_me.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_me/get_me.cc @@ -12,14 +12,14 @@ #include "base/json/json_reader.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { namespace endpoint { namespace uphold { -GetMe::GetMe(RewardsEngineImpl& engine) : engine_(engine) {} +GetMe::GetMe(RewardsEngine& engine) : engine_(engine) {} GetMe::~GetMe() = default; diff --git a/components/brave_rewards/core/endpoint/uphold/get_me/get_me.h b/components/brave_rewards/core/endpoint/uphold/get_me/get_me.h index a558e5268f7..a57adb5e28c 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_me/get_me.h +++ b/components/brave_rewards/core/endpoint/uphold/get_me/get_me.h @@ -111,7 +111,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { namespace uphold { @@ -122,7 +122,7 @@ using GetMeCallback = class GetMe { public: - explicit GetMe(RewardsEngineImpl& engine); + explicit GetMe(RewardsEngine& engine); ~GetMe(); void Request(const std::string& token, GetMeCallback callback); @@ -137,7 +137,7 @@ class GetMe { void OnRequest(GetMeCallback callback, mojom::UrlResponsePtr response); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace uphold diff --git a/components/brave_rewards/core/endpoint/uphold/get_me/get_me_unittest.cc b/components/brave_rewards/core/endpoint/uphold/get_me/get_me_unittest.cc index e121a99e926..931714d56bf 100644 --- a/components/brave_rewards/core/endpoint/uphold/get_me/get_me_unittest.cc +++ b/components/brave_rewards/core/endpoint/uphold/get_me/get_me_unittest.cc @@ -11,7 +11,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/uphold/get_me/get_me.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ namespace uphold { class GetMeTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; GetMe me_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.cc b/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.cc index dba1ecdb10d..de7d82c1701 100644 --- a/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.cc +++ b/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.cc @@ -11,12 +11,12 @@ #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_helpers.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoint::uphold { -PatchCard::PatchCard(RewardsEngineImpl& engine) : engine_(engine) {} +PatchCard::PatchCard(RewardsEngine& engine) : engine_(engine) {} PatchCard::~PatchCard() = default; diff --git a/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.h b/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.h index 13c83ac7fb4..97387b3a0f0 100644 --- a/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.h +++ b/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.h @@ -81,7 +81,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint::uphold { @@ -89,7 +89,7 @@ using PatchCardCallback = base::OnceCallback; class PatchCard { public: - explicit PatchCard(RewardsEngineImpl& engine); + explicit PatchCard(RewardsEngine& engine); ~PatchCard(); void Request(const std::string& token, @@ -105,7 +105,7 @@ class PatchCard { void OnRequest(PatchCardCallback, mojom::UrlResponsePtr) const; - const raw_ref engine_; + const raw_ref engine_; }; } // namespace endpoint::uphold diff --git a/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card_unittest.cc b/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card_unittest.cc index 8225fbb8a81..4e0c8ac8f7f 100644 --- a/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card_unittest.cc +++ b/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card_unittest.cc @@ -11,7 +11,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/uphold/patch_card/patch_card.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ namespace uphold { class PatchCardTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; PatchCard card_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.cc b/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.cc index b9808550966..0836f393196 100644 --- a/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.cc +++ b/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.cc @@ -12,13 +12,13 @@ #include "base/json/json_writer.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/uphold/uphold_card.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoint::uphold { -PostCards::PostCards(RewardsEngineImpl& engine) : engine_(engine) {} +PostCards::PostCards(RewardsEngine& engine) : engine_(engine) {} PostCards::~PostCards() = default; diff --git a/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.h b/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.h index cafae01ba9c..d7a21f7b4c2 100644 --- a/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.h +++ b/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.h @@ -78,7 +78,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint::uphold { @@ -87,7 +87,7 @@ using PostCardsCallback = class PostCards { public: - explicit PostCards(RewardsEngineImpl& engine); + explicit PostCards(RewardsEngine& engine); ~PostCards(); void Request(const std::string& token, PostCardsCallback) const; @@ -103,7 +103,7 @@ class PostCards { void OnRequest(PostCardsCallback, mojom::UrlResponsePtr) const; - const raw_ref engine_; + const raw_ref engine_; }; } // namespace endpoint::uphold diff --git a/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards_unittest.cc b/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards_unittest.cc index 7158e322a49..56083a04bb8 100644 --- a/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards_unittest.cc +++ b/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards_unittest.cc @@ -11,7 +11,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ namespace uphold { class PostCardsTest : public testing::Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; PostCards card_{mock_engine_impl_}; }; diff --git a/components/brave_rewards/core/endpoint/uphold/uphold_server.cc b/components/brave_rewards/core/endpoint/uphold/uphold_server.cc index 55453f8a301..0ced4be28ac 100644 --- a/components/brave_rewards/core/endpoint/uphold/uphold_server.cc +++ b/components/brave_rewards/core/endpoint/uphold/uphold_server.cc @@ -5,12 +5,12 @@ #include "brave/components/brave_rewards/core/endpoint/uphold/uphold_server.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace endpoint { -UpholdServer::UpholdServer(RewardsEngineImpl& engine) +UpholdServer::UpholdServer(RewardsEngine& engine) : get_capabilities_(engine), get_cards_(engine), get_card_(engine), diff --git a/components/brave_rewards/core/endpoint/uphold/uphold_server.h b/components/brave_rewards/core/endpoint/uphold/uphold_server.h index ccd12966a22..72b68460443 100644 --- a/components/brave_rewards/core/endpoint/uphold/uphold_server.h +++ b/components/brave_rewards/core/endpoint/uphold/uphold_server.h @@ -14,13 +14,13 @@ #include "brave/components/brave_rewards/core/endpoint/uphold/post_cards/post_cards.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoint { class UpholdServer { public: - explicit UpholdServer(RewardsEngineImpl& engine); + explicit UpholdServer(RewardsEngine& engine); ~UpholdServer(); const uphold::GetCapabilities& get_capabilities() const { diff --git a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.cc b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.cc index 4cbc04d0f7f..675efa30fd9 100644 --- a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.cc +++ b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.cc @@ -11,7 +11,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "brave/components/brave_rewards/core/common/environment_config.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoints { @@ -20,7 +20,7 @@ using Result = PostCommitTransactionBitFlyer::Result; namespace { -Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { +Result ParseBody(RewardsEngine& engine, const std::string& body) { const auto value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -42,7 +42,7 @@ Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { // static Result PostCommitTransactionBitFlyer::ProcessResponse( - RewardsEngineImpl& engine, + RewardsEngine& engine, const mojom::UrlResponse& response) { switch (response.status_code) { case net::HTTP_OK: // HTTP 200 diff --git a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.h b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.h index 74dcc0099da..185ebecad4f 100644 --- a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.h +++ b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.h @@ -51,7 +51,7 @@ class PostCommitTransactionBitFlyer final public: using PostCommitTransaction::PostCommitTransaction; - static Result ProcessResponse(RewardsEngineImpl& engine, + static Result ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse&); private: diff --git a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer_unittest.cc b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer_unittest.cc index 5755cfe69bb..603420e63a7 100644 --- a/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer_unittest.cc +++ b/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/endpoints/bitflyer/post_commit_transaction_bitflyer.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,7 +39,7 @@ class PostCommitTransactionBitFlyer : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(PostCommitTransactionBitFlyer, Paths) { diff --git a/components/brave_rewards/core/endpoints/brave/get_parameters.cc b/components/brave_rewards/core/endpoints/brave/get_parameters.cc index c1018c9e61f..52518143c07 100644 --- a/components/brave_rewards/core/endpoints/brave/get_parameters.cc +++ b/components/brave_rewards/core/endpoints/brave/get_parameters.cc @@ -11,7 +11,7 @@ #include "base/json/json_reader.h" #include "brave/components/brave_rewards/core/common/environment_config.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoints { @@ -20,7 +20,7 @@ using Result = GetParameters::Result; namespace { -Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { +Result ParseBody(RewardsEngine& engine, const std::string& body) { const auto value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -133,7 +133,7 @@ Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { } // namespace // static -Result GetParameters::ProcessResponse(RewardsEngineImpl& engine, +Result GetParameters::ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse& response) { switch (response.status_code) { case net::HTTP_OK: // HTTP 200 @@ -148,8 +148,7 @@ Result GetParameters::ProcessResponse(RewardsEngineImpl& engine, } } -GetParameters::GetParameters(RewardsEngineImpl& engine) - : RequestBuilder(engine) {} +GetParameters::GetParameters(RewardsEngine& engine) : RequestBuilder(engine) {} GetParameters::~GetParameters() = default; diff --git a/components/brave_rewards/core/endpoints/brave/get_parameters.h b/components/brave_rewards/core/endpoints/brave/get_parameters.h index 9ff6482ab3f..8dd735f9eb7 100644 --- a/components/brave_rewards/core/endpoints/brave/get_parameters.h +++ b/components/brave_rewards/core/endpoints/brave/get_parameters.h @@ -59,7 +59,7 @@ // clang-format on namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { @@ -74,10 +74,10 @@ struct ResultFor { class GetParameters final : public RequestBuilder, public ResponseHandler { public: - static Result ProcessResponse(RewardsEngineImpl& engine, + static Result ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse&); - explicit GetParameters(RewardsEngineImpl& engine); + explicit GetParameters(RewardsEngine& engine); ~GetParameters() override; using ProviderRegionsMap = base::flat_map; diff --git a/components/brave_rewards/core/endpoints/brave/get_parameters_unittest.cc b/components/brave_rewards/core/endpoints/brave/get_parameters_unittest.cc index 80079fa7ff1..72d61f2af2c 100644 --- a/components/brave_rewards/core/endpoints/brave/get_parameters_unittest.cc +++ b/components/brave_rewards/core/endpoints/brave/get_parameters_unittest.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/endpoints/brave/get_parameters.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,7 +39,7 @@ using GetParametersParamType = class GetParameters : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_; }; TEST_P(GetParameters, Paths) { @@ -47,7 +47,7 @@ TEST_P(GetParameters, Paths) { Result expected_result = make_result.Run(); - EXPECT_CALL(*mock_engine_impl_.mock_client(), LoadURL(_, _)) + EXPECT_CALL(*mock_engine_.mock_client(), LoadURL(_, _)) .Times(1) .WillOnce([&](mojom::UrlRequestPtr, auto callback) { auto response = mojom::UrlResponse::New(); @@ -67,7 +67,7 @@ TEST_P(GetParameters, Paths) { } }); - RequestFor(mock_engine_impl_).Send(callback.Get()); + RequestFor(mock_engine_).Send(callback.Get()); task_environment_.RunUntilIdle(); } diff --git a/components/brave_rewards/core/endpoints/brave/get_wallet.cc b/components/brave_rewards/core/endpoints/brave/get_wallet.cc index fe0f5f52ec8..72324075c8d 100644 --- a/components/brave_rewards/core/endpoints/brave/get_wallet.cc +++ b/components/brave_rewards/core/endpoints/brave/get_wallet.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/request_signer.h" #include "brave/components/brave_rewards/core/common/url_helpers.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -23,7 +23,7 @@ using Result = GetWallet::Result; namespace { -Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { +Result ParseBody(RewardsEngine& engine, const std::string& body) { auto value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -67,7 +67,7 @@ GetWalletValue::GetWalletValue(GetWalletValue&&) = default; GetWalletValue& GetWalletValue::operator=(GetWalletValue&&) = default; // static -Result GetWallet::ProcessResponse(RewardsEngineImpl& engine, +Result GetWallet::ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse& response) { switch (response.status_code) { case net::HTTP_OK: // HTTP 200 @@ -88,7 +88,7 @@ Result GetWallet::ProcessResponse(RewardsEngineImpl& engine, } } -GetWallet::GetWallet(RewardsEngineImpl& engine) : RequestBuilder(engine) {} +GetWallet::GetWallet(RewardsEngine& engine) : RequestBuilder(engine) {} GetWallet::~GetWallet() = default; diff --git a/components/brave_rewards/core/endpoints/brave/get_wallet.h b/components/brave_rewards/core/endpoints/brave/get_wallet.h index bdc3c48c5d2..5263cac9572 100644 --- a/components/brave_rewards/core/endpoints/brave/get_wallet.h +++ b/components/brave_rewards/core/endpoints/brave/get_wallet.h @@ -41,7 +41,7 @@ // clang-format on namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { @@ -72,10 +72,10 @@ struct ResultFor { class GetWallet final : public RequestBuilder, public ResponseHandler { public: - static Result ProcessResponse(RewardsEngineImpl& engine, + static Result ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse& response); - explicit GetWallet(RewardsEngineImpl& engine); + explicit GetWallet(RewardsEngine& engine); ~GetWallet() override; private: diff --git a/components/brave_rewards/core/endpoints/brave/patch_wallets.cc b/components/brave_rewards/core/endpoints/brave/patch_wallets.cc index 912486eb1bf..8059592b438 100644 --- a/components/brave_rewards/core/endpoints/brave/patch_wallets.cc +++ b/components/brave_rewards/core/endpoints/brave/patch_wallets.cc @@ -13,7 +13,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/request_signer.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -23,7 +23,7 @@ using Result = PatchWallets::Result; namespace { -Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { +Result ParseBody(RewardsEngine& engine, const std::string& body) { const auto value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -56,7 +56,7 @@ Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { } // namespace // static -Result PatchWallets::ProcessResponse(RewardsEngineImpl& engine, +Result PatchWallets::ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse& response) { switch (response.status_code) { case net::HTTP_OK: // HTTP 200 @@ -82,7 +82,7 @@ Result PatchWallets::ProcessResponse(RewardsEngineImpl& engine, } } -PatchWallets::PatchWallets(RewardsEngineImpl& engine, std::string&& geo_country) +PatchWallets::PatchWallets(RewardsEngine& engine, std::string&& geo_country) : RequestBuilder(engine), geo_country_(std::move(geo_country)) {} PatchWallets::~PatchWallets() = default; diff --git a/components/brave_rewards/core/endpoints/brave/patch_wallets.h b/components/brave_rewards/core/endpoints/brave/patch_wallets.h index f9b286c2906..8cc592a798c 100644 --- a/components/brave_rewards/core/endpoints/brave/patch_wallets.h +++ b/components/brave_rewards/core/endpoints/brave/patch_wallets.h @@ -26,7 +26,7 @@ // Response body: - namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { @@ -41,10 +41,10 @@ struct ResultFor { class PatchWallets final : public RequestBuilder, public ResponseHandler { public: - static Result ProcessResponse(RewardsEngineImpl& engine, + static Result ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse&); - PatchWallets(RewardsEngineImpl& engine, std::string&& geo_country); + PatchWallets(RewardsEngine& engine, std::string&& geo_country); ~PatchWallets() override; private: diff --git a/components/brave_rewards/core/endpoints/brave/patch_wallets_unittest.cc b/components/brave_rewards/core/endpoints/brave/patch_wallets_unittest.cc index e08c57771b1..67ce7a0600e 100644 --- a/components/brave_rewards/core/endpoints/brave/patch_wallets_unittest.cc +++ b/components/brave_rewards/core/endpoints/brave/patch_wallets_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/endpoints/brave/patch_wallets.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -54,7 +54,7 @@ class PatchWallets : public TestWithParam { } base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(PatchWallets, Paths) { diff --git a/components/brave_rewards/core/endpoints/brave/post_challenges.cc b/components/brave_rewards/core/endpoints/brave/post_challenges.cc index 3c087df4972..3747313a155 100644 --- a/components/brave_rewards/core/endpoints/brave/post_challenges.cc +++ b/components/brave_rewards/core/endpoints/brave/post_challenges.cc @@ -18,7 +18,7 @@ namespace brave_rewards::internal::endpoints { -PostChallenges::PostChallenges(RewardsEngineImpl& engine) +PostChallenges::PostChallenges(RewardsEngine& engine) : RewardsEngineHelper(engine) {} PostChallenges::~PostChallenges() = default; diff --git a/components/brave_rewards/core/endpoints/brave/post_challenges.h b/components/brave_rewards/core/endpoints/brave/post_challenges.h index 0fd7a389a89..a858d6c0a52 100644 --- a/components/brave_rewards/core/endpoints/brave/post_challenges.h +++ b/components/brave_rewards/core/endpoints/brave/post_challenges.h @@ -32,7 +32,7 @@ namespace brave_rewards::internal::endpoints { class PostChallenges : public RewardsEngineHelper, public WithHelperKey { public: - explicit PostChallenges(RewardsEngineImpl& engine); + explicit PostChallenges(RewardsEngine& engine); ~PostChallenges() override; enum class Error { diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.cc b/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.cc index 4e1ea3ec133..fd4207ea440 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.cc +++ b/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.cc @@ -9,11 +9,11 @@ #include #include "base/json/json_writer.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal::endpoints { -PostConnectBitflyer::PostConnectBitflyer(RewardsEngineImpl& engine, +PostConnectBitflyer::PostConnectBitflyer(RewardsEngine& engine, std::string&& linking_info) : PostConnect(engine), linking_info_(std::move(linking_info)) {} diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.h b/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.h index 0ada48062b4..b256ece434f 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.h +++ b/components/brave_rewards/core/endpoints/brave/post_connect_bitflyer.h @@ -26,13 +26,13 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { class PostConnectBitflyer final : public PostConnect { public: - PostConnectBitflyer(RewardsEngineImpl& engine, std::string&& linking_info); + PostConnectBitflyer(RewardsEngine& engine, std::string&& linking_info); ~PostConnectBitflyer() override; private: diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_gemini.cc b/components/brave_rewards/core/endpoints/brave/post_connect_gemini.cc index f6aa65bfd48..59b3c151d3c 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_gemini.cc +++ b/components/brave_rewards/core/endpoints/brave/post_connect_gemini.cc @@ -9,11 +9,11 @@ #include #include "base/json/json_writer.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal::endpoints { -PostConnectGemini::PostConnectGemini(RewardsEngineImpl& engine, +PostConnectGemini::PostConnectGemini(RewardsEngine& engine, std::string&& linking_info, std::string&& recipient_id) : PostConnect(engine), diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_gemini.h b/components/brave_rewards/core/endpoints/brave/post_connect_gemini.h index d2926eb3ed0..8e5b8d442ed 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_gemini.h +++ b/components/brave_rewards/core/endpoints/brave/post_connect_gemini.h @@ -27,13 +27,13 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { class PostConnectGemini final : public PostConnect { public: - PostConnectGemini(RewardsEngineImpl& engine, + PostConnectGemini(RewardsEngine& engine, std::string&& linking_info, std::string&& recipient_id); ~PostConnectGemini() override; diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_uphold.cc b/components/brave_rewards/core/endpoints/brave/post_connect_uphold.cc index 1e858e648d4..a0a98622478 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_uphold.cc +++ b/components/brave_rewards/core/endpoints/brave/post_connect_uphold.cc @@ -11,12 +11,12 @@ #include "base/base64.h" #include "base/json/json_writer.h" #include "brave/components/brave_rewards/core/common/request_signer.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" namespace brave_rewards::internal::endpoints { -PostConnectUphold::PostConnectUphold(RewardsEngineImpl& engine, +PostConnectUphold::PostConnectUphold(RewardsEngine& engine, std::string&& address) : PostConnect(engine), address_(std::move(address)) {} diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_uphold.h b/components/brave_rewards/core/endpoints/brave/post_connect_uphold.h index a108a7b15b9..265105afd6d 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_uphold.h +++ b/components/brave_rewards/core/endpoints/brave/post_connect_uphold.h @@ -44,13 +44,13 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { class PostConnectUphold final : public PostConnect { public: - PostConnectUphold(RewardsEngineImpl& engine, std::string&& address); + PostConnectUphold(RewardsEngine& engine, std::string&& address); ~PostConnectUphold() override; private: diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.cc b/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.cc index c7d5599cc69..235beb97a80 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.cc +++ b/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.cc @@ -9,11 +9,11 @@ #include #include "base/json/json_writer.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal::endpoints { -PostConnectZebPay::PostConnectZebPay(RewardsEngineImpl& engine, +PostConnectZebPay::PostConnectZebPay(RewardsEngine& engine, std::string&& linking_info) : PostConnect(engine), linking_info_(std::move(linking_info)) {} diff --git a/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.h b/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.h index 39d45167f98..becd998359b 100644 --- a/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.h +++ b/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.h @@ -26,13 +26,13 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { class PostConnectZebPay final : public PostConnect { public: - PostConnectZebPay(RewardsEngineImpl& engine, std::string&& linking_info); + PostConnectZebPay(RewardsEngine& engine, std::string&& linking_info); ~PostConnectZebPay() override; private: diff --git a/components/brave_rewards/core/endpoints/brave/post_wallets.cc b/components/brave_rewards/core/endpoints/brave/post_wallets.cc index 10ba2e3ec5b..e3d25510e53 100644 --- a/components/brave_rewards/core/endpoints/brave/post_wallets.cc +++ b/components/brave_rewards/core/endpoints/brave/post_wallets.cc @@ -13,7 +13,7 @@ #include "base/strings/string_number_conversions.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/request_signer.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -23,7 +23,7 @@ using Result = PostWallets::Result; namespace { -Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { +Result ParseBody(RewardsEngine& engine, const std::string& body) { const auto value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -42,7 +42,7 @@ Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { } // namespace // static -Result PostWallets::ProcessResponse(RewardsEngineImpl& engine, +Result PostWallets::ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse& response) { switch (response.status_code) { case net::HTTP_CREATED: // HTTP 201 @@ -69,7 +69,7 @@ Result PostWallets::ProcessResponse(RewardsEngineImpl& engine, } } -PostWallets::PostWallets(RewardsEngineImpl& engine, +PostWallets::PostWallets(RewardsEngine& engine, std::optional&& geo_country) : RequestBuilder(engine), geo_country_(std::move(geo_country)) {} diff --git a/components/brave_rewards/core/endpoints/brave/post_wallets.h b/components/brave_rewards/core/endpoints/brave/post_wallets.h index 63adf7e9a91..b11cb822990 100644 --- a/components/brave_rewards/core/endpoints/brave/post_wallets.h +++ b/components/brave_rewards/core/endpoints/brave/post_wallets.h @@ -31,7 +31,7 @@ // clang-format on namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { @@ -46,11 +46,10 @@ struct ResultFor { class PostWallets final : public RequestBuilder, public ResponseHandler { public: - static Result ProcessResponse(RewardsEngineImpl& engine, + static Result ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse&); - PostWallets(RewardsEngineImpl& engine, - std::optional&& geo_country); + PostWallets(RewardsEngine& engine, std::optional&& geo_country); ~PostWallets() override; private: diff --git a/components/brave_rewards/core/endpoints/brave/post_wallets_unittest.cc b/components/brave_rewards/core/endpoints/brave/post_wallets_unittest.cc index a7b26bd918d..5b8a7a61eb8 100644 --- a/components/brave_rewards/core/endpoints/brave/post_wallets_unittest.cc +++ b/components/brave_rewards/core/endpoints/brave/post_wallets_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/endpoints/brave/post_wallets.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -54,7 +54,7 @@ class PostWallets : public TestWithParam { } base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(PostWallets, Paths) { diff --git a/components/brave_rewards/core/endpoints/common/get_transaction_status.cc b/components/brave_rewards/core/endpoints/common/get_transaction_status.cc index 8983ab81989..6eea97cdb89 100644 --- a/components/brave_rewards/core/endpoints/common/get_transaction_status.cc +++ b/components/brave_rewards/core/endpoints/common/get_transaction_status.cc @@ -9,7 +9,7 @@ namespace brave_rewards::internal::endpoints { -GetTransactionStatus::GetTransactionStatus(RewardsEngineImpl& engine, +GetTransactionStatus::GetTransactionStatus(RewardsEngine& engine, std::string&& token, std::string&& transaction_id) : RequestBuilder(engine), diff --git a/components/brave_rewards/core/endpoints/common/get_transaction_status.h b/components/brave_rewards/core/endpoints/common/get_transaction_status.h index a00df67b215..299833320ed 100644 --- a/components/brave_rewards/core/endpoints/common/get_transaction_status.h +++ b/components/brave_rewards/core/endpoints/common/get_transaction_status.h @@ -11,13 +11,13 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { class GetTransactionStatus : public RequestBuilder { public: - GetTransactionStatus(RewardsEngineImpl& engine, + GetTransactionStatus(RewardsEngine& engine, std::string&& token, std::string&& transaction_id); ~GetTransactionStatus() override; diff --git a/components/brave_rewards/core/endpoints/common/post_commit_transaction.cc b/components/brave_rewards/core/endpoints/common/post_commit_transaction.cc index 69bc2c4235a..d393b4db50c 100644 --- a/components/brave_rewards/core/endpoints/common/post_commit_transaction.cc +++ b/components/brave_rewards/core/endpoints/common/post_commit_transaction.cc @@ -9,7 +9,7 @@ namespace brave_rewards::internal::endpoints { PostCommitTransaction::PostCommitTransaction( - RewardsEngineImpl& engine, + RewardsEngine& engine, std::string&& token, std::string&& address, mojom::ExternalTransactionPtr transaction) diff --git a/components/brave_rewards/core/endpoints/common/post_commit_transaction.h b/components/brave_rewards/core/endpoints/common/post_commit_transaction.h index d6247ba50cd..5bb1c5f7995 100644 --- a/components/brave_rewards/core/endpoints/common/post_commit_transaction.h +++ b/components/brave_rewards/core/endpoints/common/post_commit_transaction.h @@ -12,13 +12,13 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { class PostCommitTransaction : public RequestBuilder { public: - PostCommitTransaction(RewardsEngineImpl& engine, + PostCommitTransaction(RewardsEngine& engine, std::string&& token, std::string&& address, mojom::ExternalTransactionPtr); diff --git a/components/brave_rewards/core/endpoints/common/post_connect.cc b/components/brave_rewards/core/endpoints/common/post_connect.cc index d5679b42a5c..a6fb4df3b20 100644 --- a/components/brave_rewards/core/endpoints/common/post_connect.cc +++ b/components/brave_rewards/core/endpoints/common/post_connect.cc @@ -12,7 +12,7 @@ #include "base/strings/stringprintf.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/request_signer.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "net/http/http_status_code.h" @@ -23,7 +23,7 @@ using mojom::ConnectExternalWalletResult; namespace { -Result ParseGeoCountry(RewardsEngineImpl& engine, const std::string& body) { +Result ParseGeoCountry(RewardsEngine& engine, const std::string& body) { const auto value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -40,7 +40,7 @@ Result ParseGeoCountry(RewardsEngineImpl& engine, const std::string& body) { return *geo_country; } -Result ParseErrorMessage(RewardsEngineImpl& engine, const std::string& body) { +Result ParseErrorMessage(RewardsEngine& engine, const std::string& body) { const auto value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -101,7 +101,7 @@ Result ParseErrorMessage(RewardsEngineImpl& engine, const std::string& body) { } // namespace // static -Result PostConnect::ProcessResponse(RewardsEngineImpl& engine, +Result PostConnect::ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse& response) { switch (response.status_code) { case net::HTTP_OK: // HTTP 200 @@ -167,7 +167,7 @@ ConnectExternalWalletResult PostConnect::ToConnectExternalWalletResult( return ConnectExternalWalletResult::kSuccess; } -PostConnect::PostConnect(RewardsEngineImpl& engine) : RequestBuilder(engine) {} +PostConnect::PostConnect(RewardsEngine& engine) : RequestBuilder(engine) {} PostConnect::~PostConnect() = default; diff --git a/components/brave_rewards/core/endpoints/common/post_connect.h b/components/brave_rewards/core/endpoints/common/post_connect.h index 46ae39ce2a0..5af7598b759 100644 --- a/components/brave_rewards/core/endpoints/common/post_connect.h +++ b/components/brave_rewards/core/endpoints/common/post_connect.h @@ -17,7 +17,7 @@ #include "brave/components/brave_rewards/core/endpoints/result_for.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { @@ -31,12 +31,12 @@ struct ResultFor { class PostConnect : public RequestBuilder, public ResponseHandler { public: - static Result ProcessResponse(RewardsEngineImpl& engine, + static Result ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse&); static mojom::ConnectExternalWalletResult ToConnectExternalWalletResult( const Result&); - explicit PostConnect(RewardsEngineImpl& engine); + explicit PostConnect(RewardsEngine& engine); ~PostConnect() override; protected: diff --git a/components/brave_rewards/core/endpoints/common/post_connect_unittest.cc b/components/brave_rewards/core/endpoints/common/post_connect_unittest.cc index f735053e357..4d7394428bb 100644 --- a/components/brave_rewards/core/endpoints/common/post_connect_unittest.cc +++ b/components/brave_rewards/core/endpoints/common/post_connect_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/endpoints/common/post_connect.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -30,7 +30,7 @@ using Result = PostConnect::Result; class PostConnectMock final : public PostConnect { public: - explicit PostConnectMock(RewardsEngineImpl& engine) : PostConnect(engine) {} + explicit PostConnectMock(RewardsEngine& engine) : PostConnect(engine) {} ~PostConnectMock() override = default; private: @@ -62,7 +62,7 @@ class PostConnect : public TestWithParam { } base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(PostConnect, Paths) { diff --git a/components/brave_rewards/core/endpoints/common/post_create_transaction.cc b/components/brave_rewards/core/endpoints/common/post_create_transaction.cc index 913d564ba57..9368a9ca094 100644 --- a/components/brave_rewards/core/endpoints/common/post_create_transaction.cc +++ b/components/brave_rewards/core/endpoints/common/post_create_transaction.cc @@ -9,7 +9,7 @@ namespace brave_rewards::internal::endpoints { PostCreateTransaction::PostCreateTransaction( - RewardsEngineImpl& engine, + RewardsEngine& engine, std::string&& token, std::string&& address, mojom::ExternalTransactionPtr transaction) diff --git a/components/brave_rewards/core/endpoints/common/post_create_transaction.h b/components/brave_rewards/core/endpoints/common/post_create_transaction.h index 10c59f60d71..89ee6349074 100644 --- a/components/brave_rewards/core/endpoints/common/post_create_transaction.h +++ b/components/brave_rewards/core/endpoints/common/post_create_transaction.h @@ -12,13 +12,13 @@ #include "brave/components/brave_rewards/core/endpoints/request_builder.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { class PostCreateTransaction : public RequestBuilder { public: - PostCreateTransaction(RewardsEngineImpl& engine, + PostCreateTransaction(RewardsEngine& engine, std::string&& token, std::string&& address, mojom::ExternalTransactionPtr); diff --git a/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.cc b/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.cc index 2901a78fd72..a11145376ec 100644 --- a/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.cc +++ b/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.cc @@ -11,7 +11,7 @@ #include "base/json/json_reader.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/endpoint/gemini/post_recipient_id/post_recipient_id_gemini.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" #include "url/gurl.h" @@ -21,7 +21,7 @@ using Result = GetRecipientIDGemini::Result; namespace { -Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { +Result ParseBody(RewardsEngine& engine, const std::string& body) { auto value = base::JSONReader::Read(body); if (!value || !value->is_list()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -55,7 +55,7 @@ Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { // static Result GetRecipientIDGemini::ProcessResponse( - RewardsEngineImpl& engine, + RewardsEngine& engine, const mojom::UrlResponse& response) { switch (response.status_code) { case net::HTTP_OK: // HTTP 200 @@ -67,7 +67,7 @@ Result GetRecipientIDGemini::ProcessResponse( } } -GetRecipientIDGemini::GetRecipientIDGemini(RewardsEngineImpl& engine, +GetRecipientIDGemini::GetRecipientIDGemini(RewardsEngine& engine, std::string&& token) : RequestBuilder(engine), token_(std::move(token)) {} diff --git a/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.h b/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.h index aeef78b36d8..7aa5eef8c9c 100644 --- a/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.h +++ b/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.h @@ -35,7 +35,7 @@ // ] namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { @@ -51,10 +51,10 @@ class GetRecipientIDGemini final : public RequestBuilder, public ResponseHandler { public: - static Result ProcessResponse(RewardsEngineImpl& engine, + static Result ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse&); - GetRecipientIDGemini(RewardsEngineImpl& engine, std::string&& token); + GetRecipientIDGemini(RewardsEngine& engine, std::string&& token); ~GetRecipientIDGemini() override; private: diff --git a/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini_unittest.cc b/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini_unittest.cc index 68baea686ac..40fca22267d 100644 --- a/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini_unittest.cc +++ b/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/endpoints/gemini/get_recipient_id_gemini.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -40,7 +40,7 @@ class GetRecipientIDGemini : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(GetRecipientIDGemini, Paths) { diff --git a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.cc b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.cc index ebd0cf8b5c6..32aa371ec94 100644 --- a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.cc +++ b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.cc @@ -12,7 +12,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "brave/components/brave_rewards/core/common/environment_config.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" #include "url/gurl.h" @@ -22,7 +22,7 @@ using Result = PostCommitTransactionGemini::Result; namespace { -Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { +Result ParseBody(RewardsEngine& engine, const std::string& body) { const auto value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -50,7 +50,7 @@ Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { // static Result PostCommitTransactionGemini::ProcessResponse( - RewardsEngineImpl& engine, + RewardsEngine& engine, const mojom::UrlResponse& response) { switch (response.status_code) { case net::HTTP_OK: // HTTP 200 diff --git a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.h b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.h index 5fd941d7744..8f081545c87 100644 --- a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.h +++ b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.h @@ -45,7 +45,7 @@ class PostCommitTransactionGemini final public: using PostCommitTransaction::PostCommitTransaction; - static Result ProcessResponse(RewardsEngineImpl& engine, + static Result ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse&); private: diff --git a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini_unittest.cc b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini_unittest.cc index 4908374d38f..33418434145 100644 --- a/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini_unittest.cc +++ b/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/endpoints/gemini/post_commit_transaction_gemini.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,7 +39,7 @@ class PostCommitTransactionGemini : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(PostCommitTransactionGemini, Paths) { diff --git a/components/brave_rewards/core/endpoints/request_builder.cc b/components/brave_rewards/core/endpoints/request_builder.cc index e07f56ac480..da59d65113f 100644 --- a/components/brave_rewards/core/endpoints/request_builder.cc +++ b/components/brave_rewards/core/endpoints/request_builder.cc @@ -32,7 +32,7 @@ std::optional RequestBuilder::Request() const { ContentType(), SkipLog(), LoadFlags()); } -RequestBuilder::RequestBuilder(RewardsEngineImpl& engine) : engine_(engine) {} +RequestBuilder::RequestBuilder(RewardsEngine& engine) : engine_(engine) {} mojom::UrlMethod RequestBuilder::Method() const { return mojom::UrlMethod::POST; diff --git a/components/brave_rewards/core/endpoints/request_builder.h b/components/brave_rewards/core/endpoints/request_builder.h index 7faa95ce594..ccf58ec91f6 100644 --- a/components/brave_rewards/core/endpoints/request_builder.h +++ b/components/brave_rewards/core/endpoints/request_builder.h @@ -14,7 +14,7 @@ #include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { @@ -27,7 +27,7 @@ class RequestBuilder { std::optional Request() const; protected: - explicit RequestBuilder(RewardsEngineImpl& engine); + explicit RequestBuilder(RewardsEngine& engine); virtual std::optional Url() const = 0; @@ -44,7 +44,7 @@ class RequestBuilder { virtual uint32_t LoadFlags() const; - const raw_ref engine_; + const raw_ref engine_; }; } // namespace endpoints diff --git a/components/brave_rewards/core/endpoints/request_for.h b/components/brave_rewards/core/endpoints/request_for.h index 8a612965b74..72a185e845a 100644 --- a/components/brave_rewards/core/endpoints/request_for.h +++ b/components/brave_rewards/core/endpoints/request_for.h @@ -16,7 +16,7 @@ #include "brave/components/brave_rewards/core/common/callback_helpers.h" #include "brave/components/brave_rewards/core/common/url_loader.h" #include "brave/components/brave_rewards/core/endpoints/request_builder.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal::endpoints { @@ -32,7 +32,7 @@ template class RequestFor { public: template - RequestFor(RewardsEngineImpl& engine, Ts&&... ts) + RequestFor(RewardsEngine& engine, Ts&&... ts) : engine_(engine), request_(Endpoint(engine, std::forward(ts)...).Request()) { static_assert(std::is_base_of_v, @@ -63,7 +63,7 @@ class RequestFor { : URLLoader::LogLevel::kDetailed; auto on_response = - [](base::WeakPtr engine, + [](base::WeakPtr engine, base::OnceCallback callback, mojom::UrlResponsePtr response) { if (engine) { @@ -79,7 +79,7 @@ class RequestFor { } private: - const raw_ref engine_; + const raw_ref engine_; std::optional request_; }; diff --git a/components/brave_rewards/core/endpoints/response_handler.h b/components/brave_rewards/core/endpoints/response_handler.h index ecb34686748..cca0b7a1f7e 100644 --- a/components/brave_rewards/core/endpoints/response_handler.h +++ b/components/brave_rewards/core/endpoints/response_handler.h @@ -12,7 +12,7 @@ #include "base/types/expected.h" #include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" #include "brave/components/brave_rewards/core/endpoints/result_for.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal::endpoints { @@ -24,7 +24,7 @@ class ResponseHandler { using Result = base::expected; private: - static void OnResponse(RewardsEngineImpl& engine, + static void OnResponse(RewardsEngine& engine, base::OnceCallback callback, mojom::UrlResponsePtr response) { DCHECK(response); diff --git a/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.cc b/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.cc index a34aaea8069..b2a39e6de10 100644 --- a/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.cc +++ b/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.cc @@ -20,7 +20,7 @@ using Result = GetTransactionStatusUphold::Result; namespace { -Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { +Result ParseBody(RewardsEngine& engine, const std::string& body) { const auto value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -48,7 +48,7 @@ Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { // static Result GetTransactionStatusUphold::ProcessResponse( - RewardsEngineImpl& engine, + RewardsEngine& engine, const mojom::UrlResponse& response) { if (URLLoader::IsSuccessCode(response.status_code)) { return ParseBody(engine, response.body); diff --git a/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.h b/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.h index a0adf857d0b..974eb0fba2a 100644 --- a/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.h +++ b/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.h @@ -116,7 +116,7 @@ class GetTransactionStatusUphold final public: using GetTransactionStatus::GetTransactionStatus; - static Result ProcessResponse(RewardsEngineImpl& engine, + static Result ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse&); private: diff --git a/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold_unittest.cc b/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold_unittest.cc index 5af84e7f071..fa5cba88576 100644 --- a/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold_unittest.cc +++ b/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/endpoints/uphold/get_transaction_status_uphold.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,7 +39,7 @@ class GetTransactionStatusUphold : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(GetTransactionStatusUphold, Paths) { diff --git a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.cc b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.cc index dcfcfb2c496..0f824916aa7 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_helpers.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoints { @@ -21,7 +21,7 @@ using Result = PostCommitTransactionUphold::Result; namespace { -Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { +Result ParseBody(RewardsEngine& engine, const std::string& body) { const auto value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -49,7 +49,7 @@ Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { // static Result PostCommitTransactionUphold::ProcessResponse( - RewardsEngineImpl& engine, + RewardsEngine& engine, const mojom::UrlResponse& response) { if (URLLoader::IsSuccessCode(response.status_code)) { return ParseBody(engine, response.body); diff --git a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.h b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.h index 5c39329ef10..7b3937c29b8 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.h +++ b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.h @@ -116,7 +116,7 @@ class PostCommitTransactionUphold final public: using PostCommitTransaction::PostCommitTransaction; - static Result ProcessResponse(RewardsEngineImpl& engine, + static Result ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse&); private: diff --git a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold_unittest.cc b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold_unittest.cc index e4d95d64111..d67eb518d99 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold_unittest.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/endpoints/uphold/post_commit_transaction_uphold.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,7 +39,7 @@ class PostCommitTransactionUphold : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(PostCommitTransactionUphold, Paths) { diff --git a/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.cc b/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.cc index 39c3a217ca0..07d5d19fc4c 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_helpers.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoints { @@ -22,7 +22,7 @@ using Result = PostCreateTransactionUphold::Result; namespace { -Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { +Result ParseBody(RewardsEngine& engine, const std::string& body) { auto value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -42,7 +42,7 @@ Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { // static Result PostCreateTransactionUphold::ProcessResponse( - RewardsEngineImpl& engine, + RewardsEngine& engine, const mojom::UrlResponse& response) { if (URLLoader::IsSuccessCode(response.status_code)) { return ParseBody(engine, response.body); diff --git a/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.h b/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.h index f54c6fe0b98..f382609a95e 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.h +++ b/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.h @@ -116,7 +116,7 @@ class PostCreateTransactionUphold final public: using PostCreateTransaction::PostCreateTransaction; - static Result ProcessResponse(RewardsEngineImpl& engine, + static Result ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse&); private: diff --git a/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold_unittest.cc b/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold_unittest.cc index 74f6290b1e4..560efbd3f2f 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold_unittest.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/endpoints/uphold/post_create_transaction_uphold.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,7 +39,7 @@ class PostCreateTransactionUphold : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(PostCreateTransactionUphold, Paths) { diff --git a/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.cc b/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.cc index 5ce214962b3..8673e90c93d 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.cc @@ -12,7 +12,7 @@ #include "base/json/json_reader.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_loader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoints { @@ -21,7 +21,7 @@ using Result = PostOAuthUphold::Result; namespace { -Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { +Result ParseBody(RewardsEngine& engine, const std::string& body) { auto value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -40,7 +40,7 @@ Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { } // namespace // static -Result PostOAuthUphold::ProcessResponse(RewardsEngineImpl& engine, +Result PostOAuthUphold::ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse& response) { if (URLLoader::IsSuccessCode(response.status_code)) { return ParseBody(engine, response.body); @@ -50,8 +50,7 @@ Result PostOAuthUphold::ProcessResponse(RewardsEngineImpl& engine, return base::unexpected(Error::kUnexpectedStatusCode); } -PostOAuthUphold::PostOAuthUphold(RewardsEngineImpl& engine, - const std::string& code) +PostOAuthUphold::PostOAuthUphold(RewardsEngine& engine, const std::string& code) : RequestBuilder(engine), code_(code) {} PostOAuthUphold::~PostOAuthUphold() = default; diff --git a/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.h b/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.h index 60d704894fa..fe3c557158c 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.h +++ b/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.h @@ -31,7 +31,7 @@ // clang-format on namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { @@ -46,10 +46,10 @@ struct ResultFor { class PostOAuthUphold final : public RequestBuilder, public ResponseHandler { public: - static Result ProcessResponse(RewardsEngineImpl& engine, + static Result ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse&); - PostOAuthUphold(RewardsEngineImpl& engine, const std::string& code); + PostOAuthUphold(RewardsEngine& engine, const std::string& code); ~PostOAuthUphold() override; private: diff --git a/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold_unittest.cc b/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold_unittest.cc index d60ef5dd5b2..4dd6ff9671f 100644 --- a/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold_unittest.cc +++ b/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/endpoints/uphold/post_oauth_uphold.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,7 +39,7 @@ using PostOAuthUpholdParamType = std::tuple< class PostOAuthUphold : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(PostOAuthUphold, Paths) { diff --git a/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.cc b/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.cc index 0071a8b9606..b570021ebaa 100644 --- a/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.cc +++ b/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.cc @@ -10,7 +10,7 @@ #include "base/json/json_reader.h" #include "brave/components/brave_rewards/core/common/environment_config.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoints { @@ -19,7 +19,7 @@ using Result = GetBalanceZebPay::Result; namespace { -Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { +Result ParseBody(RewardsEngine& engine, const std::string& body) { const auto value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -38,7 +38,7 @@ Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { } // namespace // static -Result GetBalanceZebPay::ProcessResponse(RewardsEngineImpl& engine, +Result GetBalanceZebPay::ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse& response) { switch (response.status_code) { case net::HTTP_OK: // HTTP 200 @@ -53,8 +53,7 @@ Result GetBalanceZebPay::ProcessResponse(RewardsEngineImpl& engine, } } -GetBalanceZebPay::GetBalanceZebPay(RewardsEngineImpl& engine, - std::string&& token) +GetBalanceZebPay::GetBalanceZebPay(RewardsEngine& engine, std::string&& token) : RequestBuilder(engine), token_(std::move(token)) {} GetBalanceZebPay::~GetBalanceZebPay() = default; diff --git a/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.h b/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.h index 421f6a215fb..a8d072a09a1 100644 --- a/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.h +++ b/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.h @@ -26,7 +26,7 @@ // } namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { @@ -41,10 +41,10 @@ struct ResultFor { class GetBalanceZebPay final : public RequestBuilder, public ResponseHandler { public: - static Result ProcessResponse(RewardsEngineImpl& engine, + static Result ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse& response); - GetBalanceZebPay(RewardsEngineImpl& engine, std::string&& token); + GetBalanceZebPay(RewardsEngine& engine, std::string&& token); ~GetBalanceZebPay() override; private: diff --git a/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay_unittest.cc b/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay_unittest.cc index d5345ec12ab..fae56098285 100644 --- a/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay_unittest.cc +++ b/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/endpoints/zebpay/get_balance_zebpay.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,7 +39,7 @@ using GetBalanceZebPayParamType = std::tuple< class GetBalanceZebPay : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(GetBalanceZebPay, Paths) { diff --git a/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.cc b/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.cc index 7cdf7cbee2a..5090521d8a0 100644 --- a/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.cc +++ b/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.cc @@ -13,7 +13,7 @@ #include "base/strings/strcat.h" #include "base/types/expected.h" #include "brave/components/brave_rewards/core/common/environment_config.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal::endpoints { @@ -23,8 +23,7 @@ using Result = PostOAuthZebPay::Result; namespace { base::expected, Error> -GetAccessTokenAndLinkingInfo(RewardsEngineImpl& engine, - const std::string& body) { +GetAccessTokenAndLinkingInfo(RewardsEngine& engine, const std::string& body) { auto value = base::JSONReader::Read(body); if (!value || !value->is_dict()) { engine.LogError(FROM_HERE) << "Failed to parse body"; @@ -46,7 +45,7 @@ GetAccessTokenAndLinkingInfo(RewardsEngineImpl& engine, return std::pair{std::move(*access_token), std::move(*linking_info)}; } -Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { +Result ParseBody(RewardsEngine& engine, const std::string& body) { auto access_token_linking_info = GetAccessTokenAndLinkingInfo(engine, body); if (!access_token_linking_info.has_value()) { return base::unexpected(access_token_linking_info.error()); @@ -93,7 +92,7 @@ Result ParseBody(RewardsEngineImpl& engine, const std::string& body) { } // namespace // static -Result PostOAuthZebPay::ProcessResponse(RewardsEngineImpl& engine, +Result PostOAuthZebPay::ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse& response) { switch (response.status_code) { case net::HTTP_OK: // HTTP 200 @@ -105,8 +104,7 @@ Result PostOAuthZebPay::ProcessResponse(RewardsEngineImpl& engine, } } -PostOAuthZebPay::PostOAuthZebPay(RewardsEngineImpl& engine, - const std::string& code) +PostOAuthZebPay::PostOAuthZebPay(RewardsEngine& engine, const std::string& code) : RequestBuilder(engine), code_(code) {} PostOAuthZebPay::~PostOAuthZebPay() = default; diff --git a/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.h b/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.h index 2ca824058d3..a1eb9a667a2 100644 --- a/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.h +++ b/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.h @@ -35,7 +35,7 @@ // clang-format on namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace endpoints { @@ -53,10 +53,10 @@ struct ResultFor { class PostOAuthZebPay final : public RequestBuilder, public ResponseHandler { public: - static Result ProcessResponse(RewardsEngineImpl& engine, + static Result ProcessResponse(RewardsEngine& engine, const mojom::UrlResponse&); - PostOAuthZebPay(RewardsEngineImpl& engine, const std::string& code); + PostOAuthZebPay(RewardsEngine& engine, const std::string& code); ~PostOAuthZebPay() override; private: diff --git a/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay_unittest.cc b/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay_unittest.cc index 1aaf4cc3a68..fa07e704e10 100644 --- a/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay_unittest.cc +++ b/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/endpoints/zebpay/post_oauth_zebpay.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "net/http/http_status_code.h" #include "testing/gtest/include/gtest/gtest.h" @@ -39,7 +39,7 @@ using PostOAuthZebPayParamType = std::tuple< class PostOAuthZebPay : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(PostOAuthZebPay, Paths) { diff --git a/components/brave_rewards/core/gemini/gemini.cc b/components/brave_rewards/core/gemini/gemini.cc index 8ef51481d7c..50a66c4f06d 100644 --- a/components/brave_rewards/core/gemini/gemini.cc +++ b/components/brave_rewards/core/gemini/gemini.cc @@ -11,13 +11,13 @@ #include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.h" #include "brave/components/brave_rewards/core/wallet_provider/gemini/gemini_transfer.h" namespace brave_rewards::internal::gemini { -Gemini::Gemini(RewardsEngineImpl& engine) +Gemini::Gemini(RewardsEngine& engine) : WalletProvider(engine), server_(engine) { connect_wallet_ = std::make_unique(engine); transfer_ = std::make_unique(engine); diff --git a/components/brave_rewards/core/gemini/gemini.h b/components/brave_rewards/core/gemini/gemini.h index 416d72ce4e1..d9f465a2a1a 100644 --- a/components/brave_rewards/core/gemini/gemini.h +++ b/components/brave_rewards/core/gemini/gemini.h @@ -15,13 +15,13 @@ #include "brave/components/brave_rewards/core/wallet_provider/wallet_provider.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace gemini { class Gemini final : public wallet_provider::WalletProvider { public: - explicit Gemini(RewardsEngineImpl& engine); + explicit Gemini(RewardsEngine& engine); const char* WalletType() const override; diff --git a/components/brave_rewards/core/initialization_manager.cc b/components/brave_rewards/core/initialization_manager.cc index 6daad04d18b..e9182ebec06 100644 --- a/components/brave_rewards/core/initialization_manager.cc +++ b/components/brave_rewards/core/initialization_manager.cc @@ -17,7 +17,7 @@ namespace brave_rewards::internal { -InitializationManager::InitializationManager(RewardsEngineImpl& engine) +InitializationManager::InitializationManager(RewardsEngine& engine) : RewardsEngineHelper(engine) {} InitializationManager::~InitializationManager() = default; diff --git a/components/brave_rewards/core/initialization_manager.h b/components/brave_rewards/core/initialization_manager.h index f5cf30a014a..acba9d54d0a 100644 --- a/components/brave_rewards/core/initialization_manager.h +++ b/components/brave_rewards/core/initialization_manager.h @@ -20,7 +20,7 @@ class InitializationManager : public RewardsEngineHelper, public: enum class State { kUninitialized, kInitializing, kReady, kShuttingDown }; - explicit InitializationManager(RewardsEngineImpl& engine); + explicit InitializationManager(RewardsEngine& engine); ~InitializationManager() override; using InitializeCallback = base::OnceCallback; diff --git a/components/brave_rewards/core/legacy/bat_state.cc b/components/brave_rewards/core/legacy/bat_state.cc index bfa1700fe8e..a24ff9d5683 100644 --- a/components/brave_rewards/core/legacy/bat_state.cc +++ b/components/brave_rewards/core/legacy/bat_state.cc @@ -9,11 +9,11 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/legacy/bat_state.h" #include "brave/components/brave_rewards/core/legacy/client_properties.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { -LegacyBatState::LegacyBatState(RewardsEngineImpl& engine) : engine_(engine) {} +LegacyBatState::LegacyBatState(RewardsEngine& engine) : engine_(engine) {} LegacyBatState::~LegacyBatState() = default; diff --git a/components/brave_rewards/core/legacy/bat_state.h b/components/brave_rewards/core/legacy/bat_state.h index 58cb8f5820e..043b91316ef 100644 --- a/components/brave_rewards/core/legacy/bat_state.h +++ b/components/brave_rewards/core/legacy/bat_state.h @@ -17,11 +17,11 @@ namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; class LegacyBatState { public: - explicit LegacyBatState(RewardsEngineImpl& engine); + explicit LegacyBatState(RewardsEngine& engine); ~LegacyBatState(); void Load(ResultCallback callback); @@ -49,7 +49,7 @@ class LegacyBatState { mojom::Result result, const std::string& data); - const raw_ref engine_; + const raw_ref engine_; ClientProperties state_; }; diff --git a/components/brave_rewards/core/legacy/media/github.cc b/components/brave_rewards/core/legacy/media/github.cc index f1e3f365976..b433cedaceb 100644 --- a/components/brave_rewards/core/legacy/media/github.cc +++ b/components/brave_rewards/core/legacy/media/github.cc @@ -21,13 +21,13 @@ #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/legacy/static_values.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state.h" #include "net/http/http_status_code.h" namespace brave_rewards::internal { -GitHub::GitHub(RewardsEngineImpl& engine) : engine_(engine) {} +GitHub::GitHub(RewardsEngine& engine) : engine_(engine) {} GitHub::~GitHub() = default; diff --git a/components/brave_rewards/core/legacy/media/github.h b/components/brave_rewards/core/legacy/media/github.h index 262e9f261eb..ad469a3707c 100644 --- a/components/brave_rewards/core/legacy/media/github.h +++ b/components/brave_rewards/core/legacy/media/github.h @@ -20,11 +20,11 @@ namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; class GitHub { public: - explicit GitHub(RewardsEngineImpl& engine); + explicit GitHub(RewardsEngine& engine); static std::string GetLinkType(const std::string& url); @@ -128,7 +128,7 @@ class GitHub { FRIEND_TEST_ALL_PREFIXES(MediaGitHubTest, GetJSONStringValue); FRIEND_TEST_ALL_PREFIXES(MediaGitHubTest, GetJSONIntValue); - const raw_ref engine_; + const raw_ref engine_; base::WeakPtrFactory weak_factory_{this}; }; } // namespace brave_rewards::internal diff --git a/components/brave_rewards/core/legacy/media/media.cc b/components/brave_rewards/core/legacy/media/media.cc index 1b216e872bd..866b6b3d9b4 100644 --- a/components/brave_rewards/core/legacy/media/media.cc +++ b/components/brave_rewards/core/legacy/media/media.cc @@ -9,12 +9,12 @@ #include "brave/components/brave_rewards/core/legacy/media/media.h" #include "brave/components/brave_rewards/core/legacy/static_values.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "build/build_config.h" namespace brave_rewards::internal { -Media::Media(RewardsEngineImpl& engine) +Media::Media(RewardsEngine& engine) : engine_(engine), media_youtube_(engine), media_github_(engine) {} Media::~Media() = default; diff --git a/components/brave_rewards/core/legacy/media/media.h b/components/brave_rewards/core/legacy/media/media.h index 8ba1dd108fe..85bff506e92 100644 --- a/components/brave_rewards/core/legacy/media/media.h +++ b/components/brave_rewards/core/legacy/media/media.h @@ -16,11 +16,11 @@ namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; class Media { public: - explicit Media(RewardsEngineImpl& engine); + explicit Media(RewardsEngine& engine); ~Media(); @@ -50,7 +50,7 @@ class Media { const std::string& type, uint64_t windowId); - const raw_ref engine_; + const raw_ref engine_; YouTube media_youtube_; GitHub media_github_; }; diff --git a/components/brave_rewards/core/legacy/media/youtube.cc b/components/brave_rewards/core/legacy/media/youtube.cc index 012c3b15807..01e71fa9564 100644 --- a/components/brave_rewards/core/legacy/media/youtube.cc +++ b/components/brave_rewards/core/legacy/media/youtube.cc @@ -17,7 +17,7 @@ #include "brave/components/brave_rewards/core/legacy/media/youtube.h" #include "brave/components/brave_rewards/core/legacy/static_values.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state.h" #include "net/http/http_status_code.h" @@ -45,7 +45,7 @@ bool getJSONValue(const std::string& field_name, } // namespace -YouTube::YouTube(RewardsEngineImpl& engine) : engine_(engine) {} +YouTube::YouTube(RewardsEngine& engine) : engine_(engine) {} YouTube::~YouTube() = default; diff --git a/components/brave_rewards/core/legacy/media/youtube.h b/components/brave_rewards/core/legacy/media/youtube.h index 076648f1b56..04d3372552b 100644 --- a/components/brave_rewards/core/legacy/media/youtube.h +++ b/components/brave_rewards/core/legacy/media/youtube.h @@ -18,11 +18,11 @@ namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; class YouTube { public: - explicit YouTube(RewardsEngineImpl& engine); + explicit YouTube(RewardsEngine& engine); ~YouTube(); @@ -146,7 +146,7 @@ class YouTube { const std::string& media_key, mojom::UrlResponsePtr response); - const raw_ref engine_; + const raw_ref engine_; base::WeakPtrFactory weak_factory_{this}; // For testing purposes diff --git a/components/brave_rewards/core/legacy/publisher_state.cc b/components/brave_rewards/core/legacy/publisher_state.cc index 666db597249..b9d439ef272 100644 --- a/components/brave_rewards/core/legacy/publisher_state.cc +++ b/components/brave_rewards/core/legacy/publisher_state.cc @@ -7,12 +7,12 @@ #include "brave/components/brave_rewards/core/legacy/publisher_settings_properties.h" #include "brave/components/brave_rewards/core/legacy/publisher_state.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace publisher { -LegacyPublisherState::LegacyPublisherState(RewardsEngineImpl& engine) +LegacyPublisherState::LegacyPublisherState(RewardsEngine& engine) : engine_(engine) {} LegacyPublisherState::~LegacyPublisherState() = default; diff --git a/components/brave_rewards/core/legacy/publisher_state.h b/components/brave_rewards/core/legacy/publisher_state.h index 17d64d4848f..82a2e37b5ef 100644 --- a/components/brave_rewards/core/legacy/publisher_state.h +++ b/components/brave_rewards/core/legacy/publisher_state.h @@ -15,7 +15,7 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; } namespace brave_rewards::internal { @@ -23,7 +23,7 @@ namespace publisher { class LegacyPublisherState { public: - explicit LegacyPublisherState(RewardsEngineImpl& engine); + explicit LegacyPublisherState(RewardsEngine& engine); ~LegacyPublisherState(); @@ -44,7 +44,7 @@ class LegacyPublisherState { mojom::Result result, const std::string& data); - const raw_ref engine_; + const raw_ref engine_; PublisherSettingsProperties state_; }; diff --git a/components/brave_rewards/core/parameters/rewards_parameters_provider.cc b/components/brave_rewards/core/parameters/rewards_parameters_provider.cc index 5e8c056b3cd..e5abbb95d84 100644 --- a/components/brave_rewards/core/parameters/rewards_parameters_provider.cc +++ b/components/brave_rewards/core/parameters/rewards_parameters_provider.cc @@ -52,7 +52,7 @@ base::Value::Dict MapToDict(const T& map) { } // namespace -RewardsParametersProvider::RewardsParametersProvider(RewardsEngineImpl& engine) +RewardsParametersProvider::RewardsParametersProvider(RewardsEngine& engine) : RewardsEngineHelper(engine) {} RewardsParametersProvider::~RewardsParametersProvider() = default; diff --git a/components/brave_rewards/core/parameters/rewards_parameters_provider.h b/components/brave_rewards/core/parameters/rewards_parameters_provider.h index adcce5f7be6..44d1f95940f 100644 --- a/components/brave_rewards/core/parameters/rewards_parameters_provider.h +++ b/components/brave_rewards/core/parameters/rewards_parameters_provider.h @@ -24,7 +24,7 @@ class RewardsParametersProvider : public RewardsEngineHelper, public WithHelperKey { public: - explicit RewardsParametersProvider(RewardsEngineImpl& engine); + explicit RewardsParametersProvider(RewardsEngine& engine); ~RewardsParametersProvider() override; // Begins updating the locally-cached parameters data in the background. diff --git a/components/brave_rewards/core/publisher/publisher.cc b/components/brave_rewards/core/publisher/publisher.cc index b69c165f35f..b4bb778fad3 100644 --- a/components/brave_rewards/core/publisher/publisher.cc +++ b/components/brave_rewards/core/publisher/publisher.cc @@ -23,13 +23,13 @@ #include "brave/components/brave_rewards/core/publisher/publisher.h" #include "brave/components/brave_rewards/core/publisher/publisher_prefix_list_updater.h" #include "brave/components/brave_rewards/core/publisher/server_publisher_fetcher.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state.h" namespace brave_rewards::internal { namespace publisher { -Publisher::Publisher(RewardsEngineImpl& engine) +Publisher::Publisher(RewardsEngine& engine) : engine_(engine), prefix_list_updater_(engine), server_publisher_fetcher_(engine) {} diff --git a/components/brave_rewards/core/publisher/publisher.h b/components/brave_rewards/core/publisher/publisher.h index 88741fec954..75ea2b6b964 100644 --- a/components/brave_rewards/core/publisher/publisher.h +++ b/components/brave_rewards/core/publisher/publisher.h @@ -19,13 +19,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace publisher { class Publisher { public: - explicit Publisher(RewardsEngineImpl& engine); + explicit Publisher(RewardsEngine& engine); ~Publisher(); @@ -209,7 +209,7 @@ class Publisher { GetServerPublisherInfoCallback callback, mojom::ServerPublisherInfoPtr server_info); - const raw_ref engine_; + const raw_ref engine_; PublisherPrefixListUpdater prefix_list_updater_; ServerPublisherFetcher server_publisher_fetcher_; base::WeakPtrFactory weak_factory_{this}; diff --git a/components/brave_rewards/core/publisher/publisher_prefix_list_updater.cc b/components/brave_rewards/core/publisher/publisher_prefix_list_updater.cc index 2420fee3d48..012d4340234 100644 --- a/components/brave_rewards/core/publisher/publisher_prefix_list_updater.cc +++ b/components/brave_rewards/core/publisher/publisher_prefix_list_updater.cc @@ -10,7 +10,7 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/publisher/prefix_list_reader.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state.h" #include "net/http/http_status_code.h" @@ -24,8 +24,7 @@ constexpr int64_t kMaxRetryAfterFailureDelay = 4 * base::Time::kSecondsPerHour; namespace brave_rewards::internal { namespace publisher { -PublisherPrefixListUpdater::PublisherPrefixListUpdater( - RewardsEngineImpl& engine) +PublisherPrefixListUpdater::PublisherPrefixListUpdater(RewardsEngine& engine) : engine_(engine), rewards_server_(engine) {} PublisherPrefixListUpdater::~PublisherPrefixListUpdater() = default; diff --git a/components/brave_rewards/core/publisher/publisher_prefix_list_updater.h b/components/brave_rewards/core/publisher/publisher_prefix_list_updater.h index 3579528d412..a5224543d0d 100644 --- a/components/brave_rewards/core/publisher/publisher_prefix_list_updater.h +++ b/components/brave_rewards/core/publisher/publisher_prefix_list_updater.h @@ -18,7 +18,7 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace publisher { @@ -26,7 +26,7 @@ namespace publisher { // intervals. class PublisherPrefixListUpdater { public: - explicit PublisherPrefixListUpdater(RewardsEngineImpl& engine); + explicit PublisherPrefixListUpdater(RewardsEngine& engine); PublisherPrefixListUpdater(const PublisherPrefixListUpdater&) = delete; PublisherPrefixListUpdater& operator=(const PublisherPrefixListUpdater&) = @@ -60,7 +60,7 @@ class PublisherPrefixListUpdater { base::TimeDelta GetAutoUpdateDelay(); base::TimeDelta GetRetryAfterFailureDelay(); - const raw_ref engine_; + const raw_ref engine_; base::OneShotTimer timer_; bool auto_update_ = false; int retry_count_ = 0; diff --git a/components/brave_rewards/core/publisher/publisher_status_helper.cc b/components/brave_rewards/core/publisher/publisher_status_helper.cc index 1e8a4141aaa..af60abba463 100644 --- a/components/brave_rewards/core/publisher/publisher_status_helper.cc +++ b/components/brave_rewards/core/publisher/publisher_status_helper.cc @@ -15,7 +15,7 @@ #include "base/time/time.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { @@ -29,7 +29,7 @@ struct PublisherStatusData { using PublisherStatusMap = std::map; struct RefreshTaskInfo { - RefreshTaskInfo(RewardsEngineImpl& engine, + RefreshTaskInfo(RewardsEngine& engine, PublisherStatusMap&& status_map, base::OnceCallback callback) : engine(engine.GetWeakPtr()), @@ -37,7 +37,7 @@ struct RefreshTaskInfo { current(map.begin()), callback(std::move(callback)) {} - base::WeakPtr engine; + base::WeakPtr engine; PublisherStatusMap map; PublisherStatusMap::iterator current; base::OnceCallback callback; @@ -95,7 +95,7 @@ void RefreshNext(std::unique_ptr task_info) { } void RefreshPublisherStatusMap( - RewardsEngineImpl& engine, + RewardsEngine& engine, PublisherStatusMap&& status_map, base::OnceCallback callback) { RefreshNext(std::make_unique(engine, std::move(status_map), @@ -106,7 +106,7 @@ void RefreshPublisherStatusMap( namespace publisher { -void RefreshPublisherStatus(RewardsEngineImpl& engine, +void RefreshPublisherStatus(RewardsEngine& engine, std::vector&& info_list, RefreshPublisherStatusCallback callback) { PublisherStatusMap map; diff --git a/components/brave_rewards/core/publisher/publisher_status_helper.h b/components/brave_rewards/core/publisher/publisher_status_helper.h index 03fdfe69e73..8301587db9c 100644 --- a/components/brave_rewards/core/publisher/publisher_status_helper.h +++ b/components/brave_rewards/core/publisher/publisher_status_helper.h @@ -11,7 +11,7 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace publisher { @@ -19,7 +19,7 @@ using RefreshPublisherStatusCallback = base::OnceCallback)>; // Refreshes the publisher status for each entry in the specified list -void RefreshPublisherStatus(RewardsEngineImpl& engine, +void RefreshPublisherStatus(RewardsEngine& engine, std::vector&& info_list, RefreshPublisherStatusCallback callback); diff --git a/components/brave_rewards/core/publisher/publisher_unittest.cc b/components/brave_rewards/core/publisher/publisher_unittest.cc index bca46a0924a..782cf536c29 100644 --- a/components/brave_rewards/core/publisher/publisher_unittest.cc +++ b/components/brave_rewards/core/publisher/publisher_unittest.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/publisher/publisher.h" #include "brave/components/brave_rewards/core/rewards_callbacks.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "testing/gtest/include/gtest/gtest.h" @@ -75,7 +75,7 @@ class PublisherTest : public testing::Test { } base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; Publisher publisher_{mock_engine_impl_}; double a_ = 0; diff --git a/components/brave_rewards/core/publisher/server_publisher_fetcher.cc b/components/brave_rewards/core/publisher/server_publisher_fetcher.cc index 923cb626fe2..40fb2785644 100644 --- a/components/brave_rewards/core/publisher/server_publisher_fetcher.cc +++ b/components/brave_rewards/core/publisher/server_publisher_fetcher.cc @@ -16,7 +16,7 @@ #include "brave/components/brave_rewards/core/publisher/prefix_util.h" #include "brave/components/brave_rewards/core/publisher/protos/channel_response.pb.h" #include "brave/components/brave_rewards/core/publisher/publisher_prefix_list_updater.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave_base/random.h" namespace brave_rewards::internal::publisher { @@ -34,7 +34,7 @@ int64_t GetCacheExpiryInSeconds() { } // namespace -ServerPublisherFetcher::ServerPublisherFetcher(RewardsEngineImpl& engine) +ServerPublisherFetcher::ServerPublisherFetcher(RewardsEngine& engine) : engine_(engine), private_cdn_server_(engine) {} ServerPublisherFetcher::~ServerPublisherFetcher() = default; diff --git a/components/brave_rewards/core/publisher/server_publisher_fetcher.h b/components/brave_rewards/core/publisher/server_publisher_fetcher.h index 142aec0020d..5a29ba0b4d9 100644 --- a/components/brave_rewards/core/publisher/server_publisher_fetcher.h +++ b/components/brave_rewards/core/publisher/server_publisher_fetcher.h @@ -17,7 +17,7 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace publisher { @@ -25,7 +25,7 @@ namespace publisher { // whether a server publisher info record is expired class ServerPublisherFetcher { public: - explicit ServerPublisherFetcher(RewardsEngineImpl& engine); + explicit ServerPublisherFetcher(RewardsEngine& engine); ServerPublisherFetcher(const ServerPublisherFetcher&) = delete; ServerPublisherFetcher& operator=(const ServerPublisherFetcher&) = delete; @@ -60,7 +60,7 @@ class ServerPublisherFetcher { void RunCallbacks(const std::string& publisher_key, mojom::ServerPublisherInfoPtr server_info); - const raw_ref engine_; + const raw_ref engine_; std::map callback_map_; endpoint::PrivateCDNServer private_cdn_server_; base::WeakPtrFactory weak_factory_{this}; diff --git a/components/brave_rewards/core/rewards_engine_impl.cc b/components/brave_rewards/core/rewards_engine.cc similarity index 80% rename from components/brave_rewards/core/rewards_engine_impl.cc rename to components/brave_rewards/core/rewards_engine.cc index 7f1c538cc4e..3107bcdd800 100644 --- a/components/brave_rewards/core/rewards_engine_impl.cc +++ b/components/brave_rewards/core/rewards_engine.cc @@ -3,10 +3,11 @@ * 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/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include +#include "base/strings/string_number_conversions.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "brave/components/brave_rewards/core/bitflyer/bitflyer.h" #include "brave/components/brave_rewards/core/common/environment_config.h" @@ -32,7 +33,7 @@ namespace brave_rewards::internal { -RewardsEngineImpl::RewardsEngineImpl( +RewardsEngine::RewardsEngine( mojo::PendingAssociatedRemote client_remote, const mojom::RewardsEngineOptions& options) : client_(std::move(client_remote)), @@ -50,21 +51,21 @@ RewardsEngineImpl::RewardsEngineImpl( DCHECK(base::ThreadPoolInstance::Get()); } -RewardsEngineImpl::~RewardsEngineImpl() = default; +RewardsEngine::~RewardsEngine() = default; // mojom::RewardsEngine implementation begin (in the order of appearance in // Mojom) -void RewardsEngineImpl::Initialize(InitializeCallback callback) { +void RewardsEngine::Initialize(InitializeCallback callback) { Get().Initialize( - base::BindOnce(&RewardsEngineImpl::OnInitializationComplete, GetWeakPtr(), + base::BindOnce(&RewardsEngine::OnInitializationComplete, GetWeakPtr(), std::move(callback))); } -void RewardsEngineImpl::GetEnvironment(GetEnvironmentCallback callback) { +void RewardsEngine::GetEnvironment(GetEnvironmentCallback callback) { std::move(callback).Run(Get().current_environment()); } -void RewardsEngineImpl::CreateRewardsWallet( +void RewardsEngine::CreateRewardsWallet( const std::string& country, CreateRewardsWalletCallback callback) { WhenReady([this, country, callback = std::move(callback)]() mutable { @@ -75,14 +76,14 @@ void RewardsEngineImpl::CreateRewardsWallet( }); } -void RewardsEngineImpl::GetRewardsParameters( +void RewardsEngine::GetRewardsParameters( GetRewardsParametersCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { Get().GetParameters(std::move(callback)); }); } -void RewardsEngineImpl::GetAutoContributeProperties( +void RewardsEngine::GetAutoContributeProperties( GetAutoContributePropertiesCallback callback) { if (!IsReady()) { return std::move(callback).Run(mojom::AutoContributeProperties::New()); @@ -97,7 +98,7 @@ void RewardsEngineImpl::GetAutoContributeProperties( std::move(callback).Run(std::move(props)); } -void RewardsEngineImpl::GetPublisherMinVisitTime( +void RewardsEngine::GetPublisherMinVisitTime( GetPublisherMinVisitTimeCallback callback) { if (!IsReady()) { return std::move(callback).Run(0); @@ -106,7 +107,7 @@ void RewardsEngineImpl::GetPublisherMinVisitTime( std::move(callback).Run(state()->GetPublisherMinVisitTime()); } -void RewardsEngineImpl::GetPublisherMinVisits( +void RewardsEngine::GetPublisherMinVisits( GetPublisherMinVisitsCallback callback) { if (!IsReady()) { return std::move(callback).Run(0); @@ -115,7 +116,7 @@ void RewardsEngineImpl::GetPublisherMinVisits( std::move(callback).Run(state()->GetPublisherMinVisits()); } -void RewardsEngineImpl::GetAutoContributeEnabled( +void RewardsEngine::GetAutoContributeEnabled( GetAutoContributeEnabledCallback callback) { if (!IsReady()) { return std::move(callback).Run(false); @@ -124,7 +125,7 @@ void RewardsEngineImpl::GetAutoContributeEnabled( std::move(callback).Run(state()->GetAutoContributeEnabled()); } -void RewardsEngineImpl::GetReconcileStamp(GetReconcileStampCallback callback) { +void RewardsEngine::GetReconcileStamp(GetReconcileStampCallback callback) { if (!IsReady()) { return std::move(callback).Run(0); } @@ -132,7 +133,7 @@ void RewardsEngineImpl::GetReconcileStamp(GetReconcileStampCallback callback) { std::move(callback).Run(state()->GetReconcileStamp()); } -void RewardsEngineImpl::OnLoad(mojom::VisitDataPtr visit_data, +void RewardsEngine::OnLoad(mojom::VisitDataPtr visit_data, uint64_t current_time) { if (!IsReady() || !visit_data || visit_data->domain.empty()) { return; @@ -151,7 +152,7 @@ void RewardsEngineImpl::OnLoad(mojom::VisitDataPtr visit_data, current_pages_[visit_data->tab_id] = *visit_data; } -void RewardsEngineImpl::OnUnload(uint32_t tab_id, uint64_t current_time) { +void RewardsEngine::OnUnload(uint32_t tab_id, uint64_t current_time) { if (!IsReady()) { return; } @@ -163,7 +164,7 @@ void RewardsEngineImpl::OnUnload(uint32_t tab_id, uint64_t current_time) { } } -void RewardsEngineImpl::OnShow(uint32_t tab_id, uint64_t current_time) { +void RewardsEngine::OnShow(uint32_t tab_id, uint64_t current_time) { if (!IsReady()) { return; } @@ -172,7 +173,7 @@ void RewardsEngineImpl::OnShow(uint32_t tab_id, uint64_t current_time) { last_shown_tab_id_ = tab_id; } -void RewardsEngineImpl::OnHide(uint32_t tab_id, uint64_t current_time) { +void RewardsEngine::OnHide(uint32_t tab_id, uint64_t current_time) { if (!IsReady()) { return; } @@ -192,7 +193,7 @@ void RewardsEngineImpl::OnHide(uint32_t tab_id, uint64_t current_time) { if (type == GITHUB_MEDIA_TYPE) { base::flat_map parts; - parts["duration"] = std::to_string(duration); + parts["duration"] = base::NumberToString(duration); media()->ProcessMedia(parts, type, iter->second.Clone()); return; } @@ -201,7 +202,7 @@ void RewardsEngineImpl::OnHide(uint32_t tab_id, uint64_t current_time) { base::DoNothing()); } -void RewardsEngineImpl::OnForeground(uint32_t tab_id, uint64_t current_time) { +void RewardsEngine::OnForeground(uint32_t tab_id, uint64_t current_time) { if (!IsReady()) { return; } @@ -220,7 +221,7 @@ void RewardsEngineImpl::OnForeground(uint32_t tab_id, uint64_t current_time) { OnShow(tab_id, current_time); } -void RewardsEngineImpl::OnBackground(uint32_t tab_id, uint64_t current_time) { +void RewardsEngine::OnBackground(uint32_t tab_id, uint64_t current_time) { if (!IsReady()) { return; } @@ -235,7 +236,7 @@ void RewardsEngineImpl::OnBackground(uint32_t tab_id, uint64_t current_time) { OnHide(tab_id, current_time); } -void RewardsEngineImpl::OnXHRLoad( +void RewardsEngine::OnXHRLoad( uint32_t tab_id, const std::string& url, const base::flat_map& parts, @@ -253,7 +254,7 @@ void RewardsEngineImpl::OnXHRLoad( media()->ProcessMedia(parts, type, std::move(visit_data)); } -void RewardsEngineImpl::SetPublisherExclude( +void RewardsEngine::SetPublisherExclude( const std::string& publisher_key, mojom::PublisherExclude exclude, SetPublisherExcludeCallback callback) { @@ -264,31 +265,31 @@ void RewardsEngineImpl::SetPublisherExclude( }); } -void RewardsEngineImpl::RestorePublishers(RestorePublishersCallback callback) { +void RewardsEngine::RestorePublishers(RestorePublishersCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { database()->RestorePublishers(std::move(callback)); }); } -void RewardsEngineImpl::SetPublisherMinVisitTime(int duration_in_seconds) { +void RewardsEngine::SetPublisherMinVisitTime(int duration_in_seconds) { WhenReady([this, duration_in_seconds]() { state()->SetPublisherMinVisitTime(duration_in_seconds); }); } -void RewardsEngineImpl::SetPublisherMinVisits(int visits) { +void RewardsEngine::SetPublisherMinVisits(int visits) { WhenReady([this, visits]() { state()->SetPublisherMinVisits(visits); }); } -void RewardsEngineImpl::SetAutoContributionAmount(double amount) { +void RewardsEngine::SetAutoContributionAmount(double amount) { WhenReady([this, amount]() { state()->SetAutoContributionAmount(amount); }); } -void RewardsEngineImpl::SetAutoContributeEnabled(bool enabled) { +void RewardsEngine::SetAutoContributeEnabled(bool enabled) { WhenReady([this, enabled]() { state()->SetAutoContributeEnabled(enabled); }); } -void RewardsEngineImpl::GetBalanceReport(mojom::ActivityMonth month, +void RewardsEngine::GetBalanceReport(mojom::ActivityMonth month, int32_t year, GetBalanceReportCallback callback) { WhenReady([this, month, year, callback = std::move(callback)]() mutable { @@ -296,7 +297,7 @@ void RewardsEngineImpl::GetBalanceReport(mojom::ActivityMonth month, }); } -void RewardsEngineImpl::GetPublisherActivityFromUrl( +void RewardsEngine::GetPublisherActivityFromUrl( uint64_t window_id, mojom::VisitDataPtr visit_data, const std::string& publisher_blob) { @@ -307,7 +308,7 @@ void RewardsEngineImpl::GetPublisherActivityFromUrl( }); } -void RewardsEngineImpl::GetAutoContributionAmount( +void RewardsEngine::GetAutoContributionAmount( GetAutoContributionAmountCallback callback) { if (!IsReady()) { return std::move(callback).Run(0); @@ -316,7 +317,7 @@ void RewardsEngineImpl::GetAutoContributionAmount( std::move(callback).Run(state()->GetAutoContributionAmount()); } -void RewardsEngineImpl::GetPublisherBanner( +void RewardsEngine::GetPublisherBanner( const std::string& publisher_id, GetPublisherBannerCallback callback) { WhenReady([this, publisher_id, callback = std::move(callback)]() mutable { @@ -324,7 +325,7 @@ void RewardsEngineImpl::GetPublisherBanner( }); } -void RewardsEngineImpl::OneTimeTip(const std::string& publisher_key, +void RewardsEngine::OneTimeTip(const std::string& publisher_key, double amount, OneTimeTipCallback callback) { WhenReady( @@ -333,7 +334,7 @@ void RewardsEngineImpl::OneTimeTip(const std::string& publisher_key, }); } -void RewardsEngineImpl::RemoveRecurringTip( +void RewardsEngine::RemoveRecurringTip( const std::string& publisher_key, RemoveRecurringTipCallback callback) { WhenReady([this, publisher_key, callback = std::move(callback)]() mutable { @@ -341,7 +342,7 @@ void RewardsEngineImpl::RemoveRecurringTip( }); } -void RewardsEngineImpl::GetCreationStamp(GetCreationStampCallback callback) { +void RewardsEngine::GetCreationStamp(GetCreationStampCallback callback) { if (!IsReady()) { return std::move(callback).Run(0); } @@ -349,7 +350,7 @@ void RewardsEngineImpl::GetCreationStamp(GetCreationStampCallback callback) { std::move(callback).Run(state()->GetCreationStamp()); } -void RewardsEngineImpl::GetRewardsInternalsInfo( +void RewardsEngine::GetRewardsInternalsInfo( GetRewardsInternalsInfoCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { auto info = mojom::RewardsInternalsInfo::New(); @@ -376,24 +377,24 @@ void RewardsEngineImpl::GetRewardsInternalsInfo( }); } -void RewardsEngineImpl::SaveRecurringTip(mojom::RecurringTipPtr info, +void RewardsEngine::SaveRecurringTip(mojom::RecurringTipPtr info, SaveRecurringTipCallback callback) { WhenReady( [this, info = std::move(info), callback = std::move(callback)]() mutable { database()->SaveRecurringTip( std::move(info), - base::BindOnce(&RewardsEngineImpl::OnRecurringTipSaved, + base::BindOnce(&RewardsEngine::OnRecurringTipSaved, weak_factory_.GetWeakPtr(), std::move(callback))); }); } -void RewardsEngineImpl::OnRecurringTipSaved(SaveRecurringTipCallback callback, +void RewardsEngine::OnRecurringTipSaved(SaveRecurringTipCallback callback, mojom::Result result) { contribution()->SetMonthlyContributionTimer(); std::move(callback).Run(result); } -void RewardsEngineImpl::SendContribution(const std::string& publisher_id, +void RewardsEngine::SendContribution(const std::string& publisher_id, double amount, bool set_monthly, SendContributionCallback callback) { @@ -404,20 +405,20 @@ void RewardsEngineImpl::SendContribution(const std::string& publisher_id, }); } -void RewardsEngineImpl::GetRecurringTips(GetRecurringTipsCallback callback) { +void RewardsEngine::GetRecurringTips(GetRecurringTipsCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { contribution()->GetRecurringTips(std::move(callback)); }); } -void RewardsEngineImpl::GetOneTimeTips(GetOneTimeTipsCallback callback) { +void RewardsEngine::GetOneTimeTips(GetOneTimeTipsCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { database()->GetOneTimeTips(util::GetCurrentMonth(), util::GetCurrentYear(), std::move(callback)); }); } -void RewardsEngineImpl::GetActivityInfoList( +void RewardsEngine::GetActivityInfoList( uint32_t start, uint32_t limit, mojom::ActivityInfoFilterPtr filter, @@ -429,33 +430,33 @@ void RewardsEngineImpl::GetActivityInfoList( }); } -void RewardsEngineImpl::GetPublishersVisitedCount( +void RewardsEngine::GetPublishersVisitedCount( GetPublishersVisitedCountCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { database()->GetPublishersVisitedCount(std::move(callback)); }); } -void RewardsEngineImpl::GetExcludedList(GetExcludedListCallback callback) { +void RewardsEngine::GetExcludedList(GetExcludedListCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { database()->GetExcludedList(std::move(callback)); }); } -void RewardsEngineImpl::RefreshPublisher(const std::string& publisher_key, +void RewardsEngine::RefreshPublisher(const std::string& publisher_key, RefreshPublisherCallback callback) { WhenReady([this, publisher_key, callback = std::move(callback)]() mutable { publisher()->RefreshPublisher(publisher_key, std::move(callback)); }); } -void RewardsEngineImpl::StartContributionsForTesting() { +void RewardsEngine::StartContributionsForTesting() { WhenReady([this]() { contribution()->StartContributionsForTesting(); // IN-TEST }); } -void RewardsEngineImpl::UpdateMediaDuration(uint64_t window_id, +void RewardsEngine::UpdateMediaDuration(uint64_t window_id, const std::string& publisher_key, uint64_t duration, bool first_visit) { @@ -465,7 +466,7 @@ void RewardsEngineImpl::UpdateMediaDuration(uint64_t window_id, }); } -void RewardsEngineImpl::IsPublisherRegistered( +void RewardsEngine::IsPublisherRegistered( const std::string& publisher_id, IsPublisherRegisteredCallback callback) { WhenReady([this, publisher_id, callback = std::move(callback)]() mutable { @@ -481,14 +482,14 @@ void RewardsEngineImpl::IsPublisherRegistered( }); } -void RewardsEngineImpl::GetPublisherInfo(const std::string& publisher_key, +void RewardsEngine::GetPublisherInfo(const std::string& publisher_key, GetPublisherInfoCallback callback) { WhenReady([this, publisher_key, callback = std::move(callback)]() mutable { database()->GetPublisherInfo(publisher_key, std::move(callback)); }); } -void RewardsEngineImpl::GetPublisherPanelInfo( +void RewardsEngine::GetPublisherPanelInfo( const std::string& publisher_key, GetPublisherPanelInfoCallback callback) { WhenReady([this, publisher_key, callback = std::move(callback)]() mutable { @@ -496,7 +497,7 @@ void RewardsEngineImpl::GetPublisherPanelInfo( }); } -void RewardsEngineImpl::SavePublisherInfo( +void RewardsEngine::SavePublisherInfo( uint64_t window_id, mojom::PublisherInfoPtr publisher_info, SavePublisherInfoCallback callback) { @@ -507,7 +508,7 @@ void RewardsEngineImpl::SavePublisherInfo( }); } -void RewardsEngineImpl::GetShareURL( +void RewardsEngine::GetShareURL( const base::flat_map& args, GetShareURLCallback callback) { if (!IsReady()) { @@ -517,13 +518,13 @@ void RewardsEngineImpl::GetShareURL( std::move(callback).Run(publisher()->GetShareURL(args)); } -void RewardsEngineImpl::FetchBalance(FetchBalanceCallback callback) { +void RewardsEngine::FetchBalance(FetchBalanceCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { wallet()->FetchBalance(std::move(callback)); }); } -void RewardsEngineImpl::GetExternalWallet(GetExternalWalletCallback callback) { +void RewardsEngine::GetExternalWallet(GetExternalWalletCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { mojom::ExternalWalletPtr wallet; auto wallet_type = GetState(state::kExternalWalletType); @@ -537,7 +538,7 @@ void RewardsEngineImpl::GetExternalWallet(GetExternalWalletCallback callback) { }); } -void RewardsEngineImpl::BeginExternalWalletLogin( +void RewardsEngine::BeginExternalWalletLogin( const std::string& wallet_type, BeginExternalWalletLoginCallback callback) { WhenReady([this, wallet_type, callback = std::move(callback)]() mutable { @@ -550,7 +551,7 @@ void RewardsEngineImpl::BeginExternalWalletLogin( }); } -void RewardsEngineImpl::ConnectExternalWallet( +void RewardsEngine::ConnectExternalWallet( const std::string& wallet_type, const base::flat_map& args, ConnectExternalWalletCallback callback) { @@ -565,26 +566,26 @@ void RewardsEngineImpl::ConnectExternalWallet( }); } -void RewardsEngineImpl::GetAllContributions( +void RewardsEngine::GetAllContributions( GetAllContributionsCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { database()->GetAllContributions(std::move(callback)); }); } -void RewardsEngineImpl::Shutdown(ShutdownCallback callback) { +void RewardsEngine::Shutdown(ShutdownCallback callback) { Get().Shutdown( - base::BindOnce(&RewardsEngineImpl::OnShutdownComplete, GetWeakPtr(), + base::BindOnce(&RewardsEngine::OnShutdownComplete, GetWeakPtr(), std::move(callback))); } -void RewardsEngineImpl::GetEventLogs(GetEventLogsCallback callback) { +void RewardsEngine::GetEventLogs(GetEventLogsCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { database()->GetLastEventLogs(std::move(callback)); }); } -void RewardsEngineImpl::GetRewardsWallet(GetRewardsWalletCallback callback) { +void RewardsEngine::GetRewardsWallet(GetRewardsWalletCallback callback) { WhenReady([this, callback = std::move(callback)]() mutable { auto rewards_wallet = wallet()->GetWallet(); if (rewards_wallet) { @@ -602,46 +603,46 @@ void RewardsEngineImpl::GetRewardsWallet(GetRewardsWalletCallback callback) { // mojom::RewardsEngineClient helpers begin (in the order of appearance in // Mojom) -std::string RewardsEngineImpl::GetClientCountryCode() { +std::string RewardsEngine::GetClientCountryCode() { std::string country_code; client_->GetClientCountryCode(&country_code); return country_code; } -bool RewardsEngineImpl::IsAutoContributeSupportedForClient() { +bool RewardsEngine::IsAutoContributeSupportedForClient() { bool value = false; client_->IsAutoContributeSupportedForClient(&value); return value; } -std::string RewardsEngineImpl::GetLegacyWallet() { +std::string RewardsEngine::GetLegacyWallet() { std::string wallet; client_->GetLegacyWallet(&wallet); return wallet; } -mojom::ClientInfoPtr RewardsEngineImpl::GetClientInfo() { +mojom::ClientInfoPtr RewardsEngine::GetClientInfo() { auto info = mojom::ClientInfo::New(); client_->GetClientInfo(&info); return info; } -RewardsLogStream RewardsEngineImpl::Log(base::Location location) { +RewardsLogStream RewardsEngine::Log(base::Location location) { return RewardsLogStream(*client_, location, 1); } -RewardsLogStream RewardsEngineImpl::LogError(base::Location location) { +RewardsLogStream RewardsEngine::LogError(base::Location location) { return RewardsLogStream(*client_, location, 0); } -std::optional RewardsEngineImpl::EncryptString( +std::optional RewardsEngine::EncryptString( const std::string& value) { std::optional result; client_->EncryptString(value, &result); return result; } -std::optional RewardsEngineImpl::DecryptString( +std::optional RewardsEngine::DecryptString( const std::string& value) { std::optional result; client_->DecryptString(value, &result); @@ -649,23 +650,23 @@ std::optional RewardsEngineImpl::DecryptString( } // mojom::RewardsEngineClient helpers end -base::WeakPtr RewardsEngineImpl::GetWeakPtr() { +base::WeakPtr RewardsEngine::GetWeakPtr() { return weak_factory_.GetWeakPtr(); } -base::WeakPtr RewardsEngineImpl::GetWeakPtr() const { +base::WeakPtr RewardsEngine::GetWeakPtr() const { return weak_factory_.GetWeakPtr(); } -mojom::RewardsEngineClient* RewardsEngineImpl::client() { +mojom::RewardsEngineClient* RewardsEngine::client() { return client_.get(); } -database::Database* RewardsEngineImpl::database() { +database::Database* RewardsEngine::database() { return database_.get(); } -wallet_provider::WalletProvider* RewardsEngineImpl::GetExternalWalletProvider( +wallet_provider::WalletProvider* RewardsEngine::GetExternalWalletProvider( const std::string& wallet_type) { if (wallet_type == constant::kWalletBitflyer) { return bitflyer_.get(); @@ -685,23 +686,23 @@ wallet_provider::WalletProvider* RewardsEngineImpl::GetExternalWalletProvider( return nullptr; } -bool RewardsEngineImpl::IsReady() { +bool RewardsEngine::IsReady() { return Get().is_ready(); } -void RewardsEngineImpl::OnInitializationComplete(InitializeCallback callback, +void RewardsEngine::OnInitializationComplete(InitializeCallback callback, bool success) { ready_event_.Signal(); std::move(callback).Run(success ? mojom::Result::OK : mojom::Result::FAILED); } -void RewardsEngineImpl::OnShutdownComplete(ShutdownCallback callback, +void RewardsEngine::OnShutdownComplete(ShutdownCallback callback, bool success) { std::move(callback).Run(success ? mojom::Result::OK : mojom::Result::FAILED); } template -void RewardsEngineImpl::WhenReady(T callback) { +void RewardsEngine::WhenReady(T callback) { switch (Get().state()) { case InitializationManager::State::kReady: callback(); diff --git a/components/brave_rewards/core/rewards_engine_impl.h b/components/brave_rewards/core/rewards_engine.h similarity index 95% rename from components/brave_rewards/core/rewards_engine_impl.h rename to components/brave_rewards/core/rewards_engine.h index 62d466a9f7b..4ff7923b2ae 100644 --- a/components/brave_rewards/core/rewards_engine_impl.h +++ b/components/brave_rewards/core/rewards_engine.h @@ -3,8 +3,8 @@ * 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/. */ -#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_IMPL_H_ -#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_IMPL_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_H_ +#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_H_ #include #include @@ -67,18 +67,18 @@ namespace wallet_provider { class WalletProvider; } -class RewardsEngineImpl : public mojom::RewardsEngine, - private base::SupportsUserData { +class RewardsEngine : public mojom::RewardsEngine, + private base::SupportsUserData { public: - RewardsEngineImpl( + RewardsEngine( mojo::PendingAssociatedRemote client_remote, const mojom::RewardsEngineOptions& options); - ~RewardsEngineImpl() override; + ~RewardsEngine() override; - RewardsEngineImpl(const RewardsEngineImpl&) = delete; + RewardsEngine(const RewardsEngine&) = delete; - RewardsEngineImpl& operator=(const RewardsEngineImpl&) = delete; + RewardsEngine& operator=(const RewardsEngine&) = delete; // mojom::RewardsEngine implementation begin (in the order of appearance in // Mojom) @@ -317,8 +317,8 @@ class RewardsEngineImpl : public mojom::RewardsEngine, std::optional DecryptString(const std::string& value); // mojom::RewardsEngineClient helpers end - base::WeakPtr GetWeakPtr(); - base::WeakPtr GetWeakPtr() const; + base::WeakPtr GetWeakPtr(); + base::WeakPtr GetWeakPtr() const; mojom::RewardsEngineClient* client(); @@ -399,9 +399,9 @@ class RewardsEngineImpl : public mojom::RewardsEngine, uint32_t last_shown_tab_id_ = -1; base::OneShotEvent ready_event_; - base::WeakPtrFactory weak_factory_{this}; + base::WeakPtrFactory weak_factory_{this}; }; } // namespace brave_rewards::internal -#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_IMPL_H_ +#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_H_ diff --git a/components/brave_rewards/core/rewards_engine_helper.cc b/components/brave_rewards/core/rewards_engine_helper.cc index afd482de29c..fddeab5a34e 100644 --- a/components/brave_rewards/core/rewards_engine_helper.cc +++ b/components/brave_rewards/core/rewards_engine_helper.cc @@ -9,7 +9,7 @@ namespace brave_rewards::internal { RewardsEngineHelper::~RewardsEngineHelper() = default; -RewardsEngineHelper::RewardsEngineHelper(RewardsEngineImpl& engine) +RewardsEngineHelper::RewardsEngineHelper(RewardsEngine& engine) : engine_(engine) {} mojom::RewardsEngineClient& RewardsEngineHelper::client() { diff --git a/components/brave_rewards/core/rewards_engine_helper.h b/components/brave_rewards/core/rewards_engine_helper.h index c1c3f82146e..bcc250930ea 100644 --- a/components/brave_rewards/core/rewards_engine_helper.h +++ b/components/brave_rewards/core/rewards_engine_helper.h @@ -9,7 +9,7 @@ #include "base/memory/raw_ref.h" #include "base/supports_user_data.h" #include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/rewards_log_stream.h" namespace brave_rewards::internal { @@ -21,13 +21,13 @@ class RewardsEngineHelper : public base::SupportsUserData::Data { ~RewardsEngineHelper() override; protected: - explicit RewardsEngineHelper(RewardsEngineImpl& engine); + explicit RewardsEngineHelper(RewardsEngine& engine); RewardsEngineHelper(const RewardsEngineHelper&) = delete; RewardsEngineHelper& operator=(const RewardsEngineHelper&) = delete; - RewardsEngineImpl& engine() { return engine_.get(); } - const RewardsEngineImpl& engine() const { return engine_.get(); } + RewardsEngine& engine() { return engine_.get(); } + const RewardsEngine& engine() const { return engine_.get(); } mojom::RewardsEngineClient& client(); @@ -40,7 +40,7 @@ class RewardsEngineHelper : public base::SupportsUserData::Data { } private: - const raw_ref engine_; + const raw_ref engine_; }; // A mixin for exposing a user data key for a `RewardsEngineHelper` class. diff --git a/components/brave_rewards/core/rewards_engine_impl_mock.cc b/components/brave_rewards/core/rewards_engine_mock.cc similarity index 69% rename from components/brave_rewards/core/rewards_engine_impl_mock.cc rename to components/brave_rewards/core/rewards_engine_mock.cc index e400a7fb3a6..0ae2b35f9d6 100644 --- a/components/brave_rewards/core/rewards_engine_impl_mock.cc +++ b/components/brave_rewards/core/rewards_engine_mock.cc @@ -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/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include @@ -15,20 +15,20 @@ AddMockRewardsClient::AddMockRewardsClient() = default; AddMockRewardsClient::~AddMockRewardsClient() = default; -MockRewardsEngineImpl::MockRewardsEngineImpl() - : RewardsEngineImpl( +MockRewardsEngine::MockRewardsEngine() + : RewardsEngine( mock_client_receiver_.BindNewEndpointAndPassDedicatedRemote(), mojom::RewardsEngineOptions()) { ON_CALL(*this, database()).WillByDefault(Return(&mock_database_)); } -MockRewardsEngineImpl::~MockRewardsEngineImpl() = default; +MockRewardsEngine::~MockRewardsEngine() = default; -MockRewardsEngineClient* MockRewardsEngineImpl::mock_client() { +MockRewardsEngineClient* MockRewardsEngine::mock_client() { return &mock_client_; } -database::MockDatabase* MockRewardsEngineImpl::mock_database() { +database::MockDatabase* MockRewardsEngine::mock_database() { return &mock_database_; } diff --git a/components/brave_rewards/core/rewards_engine_impl_mock.h b/components/brave_rewards/core/rewards_engine_mock.h similarity index 69% rename from components/brave_rewards/core/rewards_engine_impl_mock.h rename to components/brave_rewards/core/rewards_engine_mock.h index 5fcc2131711..af26610d545 100644 --- a/components/brave_rewards/core/rewards_engine_impl_mock.h +++ b/components/brave_rewards/core/rewards_engine_mock.h @@ -3,12 +3,12 @@ * 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/. */ -#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_IMPL_MOCK_H_ -#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_IMPL_MOCK_H_ +#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_MOCK_H_ +#define BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_MOCK_H_ #include "brave/components/brave_rewards/core/database/database_mock.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "mojo/public/cpp/bindings/associated_receiver.h" #include "testing/gmock/include/gmock/gmock.h" @@ -25,12 +25,12 @@ class AddMockRewardsClient { &mock_client_}; }; -class MockRewardsEngineImpl : private AddMockRewardsClient, - public RewardsEngineImpl { +class MockRewardsEngine : private AddMockRewardsClient, + public RewardsEngine { public: - MockRewardsEngineImpl(); + MockRewardsEngine(); - ~MockRewardsEngineImpl() override; + ~MockRewardsEngine() override; MockRewardsEngineClient* mock_client(); @@ -44,4 +44,4 @@ class MockRewardsEngineImpl : private AddMockRewardsClient, } // namespace brave_rewards::internal -#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_IMPL_MOCK_H_ +#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_CORE_REWARDS_ENGINE_MOCK_H_ diff --git a/components/brave_rewards/core/sku/sku.cc b/components/brave_rewards/core/sku/sku.cc index 034bee76565..87ef3d8c5aa 100644 --- a/components/brave_rewards/core/sku/sku.cc +++ b/components/brave_rewards/core/sku/sku.cc @@ -8,13 +8,13 @@ #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/sku/sku.h" namespace brave_rewards::internal { namespace sku { -SKU::SKU(RewardsEngineImpl& engine) : engine_(engine), common_(engine) {} +SKU::SKU(RewardsEngine& engine) : engine_(engine), common_(engine) {} SKU::~SKU() = default; diff --git a/components/brave_rewards/core/sku/sku.h b/components/brave_rewards/core/sku/sku.h index e35fe1fba11..bfe6166ca2c 100644 --- a/components/brave_rewards/core/sku/sku.h +++ b/components/brave_rewards/core/sku/sku.h @@ -15,13 +15,13 @@ #include "brave/components/brave_rewards/core/sku/sku_common.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace sku { class SKU { public: - explicit SKU(RewardsEngineImpl& engine); + explicit SKU(RewardsEngine& engine); ~SKU(); void Process(const std::vector& items, @@ -53,7 +53,7 @@ class SKU { SKUOrderCallback callback, mojom::SKUOrderPtr order); - const raw_ref engine_; + const raw_ref engine_; SKUCommon common_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_rewards/core/sku/sku_common.cc b/components/brave_rewards/core/sku/sku_common.cc index 1bdb76dab90..e5ee926d0d5 100644 --- a/components/brave_rewards/core/sku/sku_common.cc +++ b/components/brave_rewards/core/sku/sku_common.cc @@ -7,13 +7,13 @@ #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/sku/sku_common.h" namespace brave_rewards::internal { namespace sku { -SKUCommon::SKUCommon(RewardsEngineImpl& engine) +SKUCommon::SKUCommon(RewardsEngine& engine) : engine_(engine), order_(engine), transaction_(engine) {} SKUCommon::~SKUCommon() = default; diff --git a/components/brave_rewards/core/sku/sku_common.h b/components/brave_rewards/core/sku/sku_common.h index f195213c98d..306c3ad1bbe 100644 --- a/components/brave_rewards/core/sku/sku_common.h +++ b/components/brave_rewards/core/sku/sku_common.h @@ -18,13 +18,13 @@ #include "brave/components/brave_rewards/core/sku/sku_transaction.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace sku { class SKUCommon { public: - explicit SKUCommon(RewardsEngineImpl& engine); + explicit SKUCommon(RewardsEngine& engine); ~SKUCommon(); void CreateOrder(const std::vector& items, @@ -48,7 +48,7 @@ class SKUCommon { base::expected result); - const raw_ref engine_; + const raw_ref engine_; SKUOrder order_; SKUTransaction transaction_; base::WeakPtrFactory weak_factory_{this}; diff --git a/components/brave_rewards/core/sku/sku_order.cc b/components/brave_rewards/core/sku/sku_order.cc index 37f1c6ea025..78b3a260454 100644 --- a/components/brave_rewards/core/sku/sku_order.cc +++ b/components/brave_rewards/core/sku/sku_order.cc @@ -8,13 +8,13 @@ #include "base/json/json_writer.h" #include "base/values.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/sku/sku_order.h" namespace brave_rewards::internal { namespace sku { -SKUOrder::SKUOrder(RewardsEngineImpl& engine) +SKUOrder::SKUOrder(RewardsEngine& engine) : engine_(engine), payment_server_(engine) {} SKUOrder::~SKUOrder() = default; diff --git a/components/brave_rewards/core/sku/sku_order.h b/components/brave_rewards/core/sku/sku_order.h index 8bcc5206e35..c168e727e02 100644 --- a/components/brave_rewards/core/sku/sku_order.h +++ b/components/brave_rewards/core/sku/sku_order.h @@ -16,13 +16,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace sku { class SKUOrder { public: - explicit SKUOrder(RewardsEngineImpl& engine); + explicit SKUOrder(RewardsEngine& engine); ~SKUOrder(); void Create(const std::vector& items, @@ -37,7 +37,7 @@ class SKUOrder { SKUOrderCallback callback, mojom::Result result); - const raw_ref engine_; + const raw_ref engine_; endpoint::PaymentServer payment_server_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_rewards/core/sku/sku_transaction.cc b/components/brave_rewards/core/sku/sku_transaction.cc index 85bd15c82ff..eb6ce5ecf06 100644 --- a/components/brave_rewards/core/sku/sku_transaction.cc +++ b/components/brave_rewards/core/sku/sku_transaction.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/contribution/contribution.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/sku/sku_transaction.h" namespace brave_rewards::internal { @@ -41,7 +41,7 @@ mojom::SKUTransactionType GetTransactionTypeFromWalletType( namespace sku { -SKUTransaction::SKUTransaction(RewardsEngineImpl& engine) +SKUTransaction::SKUTransaction(RewardsEngine& engine) : engine_(engine), payment_server_(engine) {} SKUTransaction::~SKUTransaction() = default; diff --git a/components/brave_rewards/core/sku/sku_transaction.h b/components/brave_rewards/core/sku/sku_transaction.h index 2c2f5bc8850..4d17470d1b4 100644 --- a/components/brave_rewards/core/sku/sku_transaction.h +++ b/components/brave_rewards/core/sku/sku_transaction.h @@ -18,13 +18,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace sku { class SKUTransaction { public: - explicit SKUTransaction(RewardsEngineImpl& engine); + explicit SKUTransaction(RewardsEngine& engine); ~SKUTransaction(); void Run(mojom::SKUOrderPtr order, @@ -77,7 +77,7 @@ class SKUTransaction { void OnSendExternalTransaction(ResultCallback callback, mojom::Result result); - const raw_ref engine_; + const raw_ref engine_; endpoint::PaymentServer payment_server_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_rewards/core/state/state.cc b/components/brave_rewards/core/state/state.cc index fafd81e0475..d5465ffb7f4 100644 --- a/components/brave_rewards/core/state/state.cc +++ b/components/brave_rewards/core/state/state.cc @@ -15,13 +15,13 @@ #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/parameters/rewards_parameters_provider.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/state/state_migration.h" namespace brave_rewards::internal::state { -State::State(RewardsEngineImpl& engine) : engine_(engine), migration_(engine) {} +State::State(RewardsEngine& engine) : engine_(engine), migration_(engine) {} State::~State() = default; diff --git a/components/brave_rewards/core/state/state.h b/components/brave_rewards/core/state/state.h index 857bbdd2833..b35c26a6f95 100644 --- a/components/brave_rewards/core/state/state.h +++ b/components/brave_rewards/core/state/state.h @@ -15,13 +15,13 @@ #include "brave/components/brave_rewards/core/state/state_migration.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace state { class State { public: - explicit State(RewardsEngineImpl& engine); + explicit State(RewardsEngine& engine); ~State(); void Initialize(ResultCallback callback); @@ -69,7 +69,7 @@ class State { bool SetEncryptedString(const std::string& key, const std::string& value); private: - const raw_ref engine_; + const raw_ref engine_; StateMigration migration_; }; diff --git a/components/brave_rewards/core/state/state_migration.cc b/components/brave_rewards/core/state/state_migration.cc index 6d1c1a8fe61..7c03cc896db 100644 --- a/components/brave_rewards/core/state/state_migration.cc +++ b/components/brave_rewards/core/state/state_migration.cc @@ -5,7 +5,7 @@ #include -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/state/state_migration.h" @@ -18,7 +18,7 @@ const int kCurrentVersionNumber = 14; namespace brave_rewards::internal { namespace state { -StateMigration::StateMigration(RewardsEngineImpl& engine) +StateMigration::StateMigration(RewardsEngine& engine) : engine_(engine), v1_(engine), v2_(engine), diff --git a/components/brave_rewards/core/state/state_migration.h b/components/brave_rewards/core/state/state_migration.h index a677fe588ea..1c99018fcc0 100644 --- a/components/brave_rewards/core/state/state_migration.h +++ b/components/brave_rewards/core/state/state_migration.h @@ -24,13 +24,13 @@ #include "brave/components/brave_rewards/core/state/state_migration_v9.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace state { class StateMigration { public: - explicit StateMigration(RewardsEngineImpl& engine); + explicit StateMigration(RewardsEngine& engine); ~StateMigration(); void Start(ResultCallback callback); @@ -42,7 +42,7 @@ class StateMigration { void OnMigration(ResultCallback callback, int version, mojom::Result result); - const raw_ref engine_; + const raw_ref engine_; StateMigrationV1 v1_; StateMigrationV2 v2_; StateMigrationV3 v3_; diff --git a/components/brave_rewards/core/state/state_migration_v1.cc b/components/brave_rewards/core/state/state_migration_v1.cc index 64ec78f5124..0f97c71357f 100644 --- a/components/brave_rewards/core/state/state_migration_v1.cc +++ b/components/brave_rewards/core/state/state_migration_v1.cc @@ -7,15 +7,14 @@ #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/publisher/publisher.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/state/state_migration_v1.h" namespace brave_rewards::internal { namespace state { -StateMigrationV1::StateMigrationV1(RewardsEngineImpl& engine) - : engine_(engine) {} +StateMigrationV1::StateMigrationV1(RewardsEngine& engine) : engine_(engine) {} StateMigrationV1::~StateMigrationV1() = default; diff --git a/components/brave_rewards/core/state/state_migration_v1.h b/components/brave_rewards/core/state/state_migration_v1.h index 33e559ccd8c..eae3ec76a02 100644 --- a/components/brave_rewards/core/state/state_migration_v1.h +++ b/components/brave_rewards/core/state/state_migration_v1.h @@ -16,13 +16,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace state { class StateMigrationV1 { public: - explicit StateMigrationV1(RewardsEngineImpl& engine); + explicit StateMigrationV1(RewardsEngine& engine); ~StateMigrationV1(); void Migrate(ResultCallback callback); @@ -35,7 +35,7 @@ class StateMigrationV1 { void BalanceReportsSaved(ResultCallback callback, mojom::Result result); std::unique_ptr legacy_publisher_; - const raw_ref engine_; + const raw_ref engine_; bool legacy_data_migrated_ = false; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_rewards/core/state/state_migration_v10.cc b/components/brave_rewards/core/state/state_migration_v10.cc index 679ff301e00..063936d557e 100644 --- a/components/brave_rewards/core/state/state_migration_v10.cc +++ b/components/brave_rewards/core/state/state_migration_v10.cc @@ -10,7 +10,7 @@ #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/uphold/uphold.h" namespace brave_rewards::internal { @@ -19,8 +19,7 @@ using endpoints::RequestFor; namespace state { -StateMigrationV10::StateMigrationV10(RewardsEngineImpl& engine) - : engine_(engine) {} +StateMigrationV10::StateMigrationV10(RewardsEngine& engine) : engine_(engine) {} StateMigrationV10::~StateMigrationV10() = default; diff --git a/components/brave_rewards/core/state/state_migration_v10.h b/components/brave_rewards/core/state/state_migration_v10.h index 5aa200091fc..6bce660364a 100644 --- a/components/brave_rewards/core/state/state_migration_v10.h +++ b/components/brave_rewards/core/state/state_migration_v10.h @@ -12,13 +12,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace state { class StateMigrationV10 { public: - explicit StateMigrationV10(RewardsEngineImpl& engine); + explicit StateMigrationV10(RewardsEngine& engine); ~StateMigrationV10(); void Migrate(ResultCallback callback); @@ -27,7 +27,7 @@ class StateMigrationV10 { void OnGetWallet(ResultCallback callback, endpoints::GetWallet::Result&& result); - const raw_ref engine_; + const raw_ref engine_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_rewards/core/state/state_migration_v11.cc b/components/brave_rewards/core/state/state_migration_v11.cc index 9d29df1032e..542a19301e6 100644 --- a/components/brave_rewards/core/state/state_migration_v11.cc +++ b/components/brave_rewards/core/state/state_migration_v11.cc @@ -8,15 +8,14 @@ #include #include "base/check.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/state/state_keys.h" namespace brave_rewards::internal { namespace state { -StateMigrationV11::StateMigrationV11(RewardsEngineImpl& engine) - : engine_(engine) {} +StateMigrationV11::StateMigrationV11(RewardsEngine& engine) : engine_(engine) {} StateMigrationV11::~StateMigrationV11() = default; diff --git a/components/brave_rewards/core/state/state_migration_v11.h b/components/brave_rewards/core/state/state_migration_v11.h index 9186625487c..21d8d38d0b2 100644 --- a/components/brave_rewards/core/state/state_migration_v11.h +++ b/components/brave_rewards/core/state/state_migration_v11.h @@ -11,18 +11,18 @@ namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace state { class StateMigrationV11 { public: - explicit StateMigrationV11(RewardsEngineImpl& engine); + explicit StateMigrationV11(RewardsEngine& engine); ~StateMigrationV11(); void Migrate(ResultCallback callback); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v12.cc b/components/brave_rewards/core/state/state_migration_v12.cc index 875415a277c..e688e760836 100644 --- a/components/brave_rewards/core/state/state_migration_v12.cc +++ b/components/brave_rewards/core/state/state_migration_v12.cc @@ -10,13 +10,12 @@ #include "base/ranges/algorithm.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" namespace brave_rewards::internal::state { -StateMigrationV12::StateMigrationV12(RewardsEngineImpl& engine) - : engine_(engine) {} +StateMigrationV12::StateMigrationV12(RewardsEngine& engine) : engine_(engine) {} StateMigrationV12::~StateMigrationV12() = default; diff --git a/components/brave_rewards/core/state/state_migration_v12.h b/components/brave_rewards/core/state/state_migration_v12.h index 4707b981e8d..65e92d69d17 100644 --- a/components/brave_rewards/core/state/state_migration_v12.h +++ b/components/brave_rewards/core/state/state_migration_v12.h @@ -12,13 +12,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace state { class StateMigrationV12 { public: - explicit StateMigrationV12(RewardsEngineImpl& engine); + explicit StateMigrationV12(RewardsEngine& engine); ~StateMigrationV12(); void Migrate(ResultCallback); @@ -26,7 +26,7 @@ class StateMigrationV12 { private: bool MigrateExternalWallet(const std::string& wallet_type); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v13.cc b/components/brave_rewards/core/state/state_migration_v13.cc index 6d78f5116ed..3e7a532fa66 100644 --- a/components/brave_rewards/core/state/state_migration_v13.cc +++ b/components/brave_rewards/core/state/state_migration_v13.cc @@ -10,13 +10,12 @@ #include "base/ranges/algorithm.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" namespace brave_rewards::internal::state { -StateMigrationV13::StateMigrationV13(RewardsEngineImpl& engine) - : engine_(engine) {} +StateMigrationV13::StateMigrationV13(RewardsEngine& engine) : engine_(engine) {} StateMigrationV13::~StateMigrationV13() = default; diff --git a/components/brave_rewards/core/state/state_migration_v13.h b/components/brave_rewards/core/state/state_migration_v13.h index 8e0a5430a66..882a5cbaee0 100644 --- a/components/brave_rewards/core/state/state_migration_v13.h +++ b/components/brave_rewards/core/state/state_migration_v13.h @@ -12,13 +12,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace state { class StateMigrationV13 { public: - explicit StateMigrationV13(RewardsEngineImpl& engine); + explicit StateMigrationV13(RewardsEngine& engine); ~StateMigrationV13(); void Migrate(ResultCallback); @@ -26,7 +26,7 @@ class StateMigrationV13 { private: bool MigrateExternalWallet(const std::string& wallet_type); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v14.cc b/components/brave_rewards/core/state/state_migration_v14.cc index 9e2d68d1633..5f38acf02b8 100644 --- a/components/brave_rewards/core/state/state_migration_v14.cc +++ b/components/brave_rewards/core/state/state_migration_v14.cc @@ -10,14 +10,13 @@ #include "base/ranges/algorithm.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" namespace brave_rewards::internal::state { -StateMigrationV14::StateMigrationV14(RewardsEngineImpl& engine) - : engine_(engine) {} +StateMigrationV14::StateMigrationV14(RewardsEngine& engine) : engine_(engine) {} StateMigrationV14::~StateMigrationV14() = default; diff --git a/components/brave_rewards/core/state/state_migration_v14.h b/components/brave_rewards/core/state/state_migration_v14.h index be6ab4ad789..d33b36606d5 100644 --- a/components/brave_rewards/core/state/state_migration_v14.h +++ b/components/brave_rewards/core/state/state_migration_v14.h @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace state { @@ -21,7 +21,7 @@ namespace state { // `external_wallet_type` was introduced may be in this state. class StateMigrationV14 { public: - explicit StateMigrationV14(RewardsEngineImpl& engine); + explicit StateMigrationV14(RewardsEngine& engine); ~StateMigrationV14(); void Migrate(ResultCallback); @@ -29,7 +29,7 @@ class StateMigrationV14 { private: bool MigrateExternalWallet(const std::string& wallet_type); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v2.cc b/components/brave_rewards/core/state/state_migration_v2.cc index 514a40d40f9..49a07d008e4 100644 --- a/components/brave_rewards/core/state/state_migration_v2.cc +++ b/components/brave_rewards/core/state/state_migration_v2.cc @@ -6,15 +6,14 @@ #include #include "base/base64.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/state/state_migration_v2.h" namespace brave_rewards::internal { namespace state { -StateMigrationV2::StateMigrationV2(RewardsEngineImpl& engine) - : engine_(engine) {} +StateMigrationV2::StateMigrationV2(RewardsEngine& engine) : engine_(engine) {} StateMigrationV2::~StateMigrationV2() = default; diff --git a/components/brave_rewards/core/state/state_migration_v2.h b/components/brave_rewards/core/state/state_migration_v2.h index 9193c5ef5a4..d5e06f31983 100644 --- a/components/brave_rewards/core/state/state_migration_v2.h +++ b/components/brave_rewards/core/state/state_migration_v2.h @@ -15,13 +15,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace state { class StateMigrationV2 { public: - explicit StateMigrationV2(RewardsEngineImpl& engine); + explicit StateMigrationV2(RewardsEngine& engine); ~StateMigrationV2(); void Migrate(ResultCallback callback); @@ -30,7 +30,7 @@ class StateMigrationV2 { void OnLoadState(ResultCallback callback, mojom::Result result); std::unique_ptr legacy_state_; - const raw_ref engine_; + const raw_ref engine_; base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_rewards/core/state/state_migration_v4.cc b/components/brave_rewards/core/state/state_migration_v4.cc index e90c166e727..ea635828347 100644 --- a/components/brave_rewards/core/state/state_migration_v4.cc +++ b/components/brave_rewards/core/state/state_migration_v4.cc @@ -7,13 +7,12 @@ #include -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { namespace state { -StateMigrationV4::StateMigrationV4(RewardsEngineImpl& engine) - : engine_(engine) {} +StateMigrationV4::StateMigrationV4(RewardsEngine& engine) : engine_(engine) {} StateMigrationV4::~StateMigrationV4() = default; diff --git a/components/brave_rewards/core/state/state_migration_v4.h b/components/brave_rewards/core/state/state_migration_v4.h index 8b9ec8e2d6e..9617ec2ed0f 100644 --- a/components/brave_rewards/core/state/state_migration_v4.h +++ b/components/brave_rewards/core/state/state_migration_v4.h @@ -10,19 +10,19 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace state { class StateMigrationV4 { public: - explicit StateMigrationV4(RewardsEngineImpl& engine); + explicit StateMigrationV4(RewardsEngine& engine); ~StateMigrationV4(); void Migrate(ResultCallback callback); private: - const raw_ref engine_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v5.cc b/components/brave_rewards/core/state/state_migration_v5.cc index c9468c3d30e..f2b9fa25bbf 100644 --- a/components/brave_rewards/core/state/state_migration_v5.cc +++ b/components/brave_rewards/core/state/state_migration_v5.cc @@ -9,14 +9,13 @@ #include #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state_keys.h" namespace brave_rewards::internal { namespace state { -StateMigrationV5::StateMigrationV5(RewardsEngineImpl& engine) - : engine_(engine) {} +StateMigrationV5::StateMigrationV5(RewardsEngine& engine) : engine_(engine) {} StateMigrationV5::~StateMigrationV5() = default; diff --git a/components/brave_rewards/core/state/state_migration_v5.h b/components/brave_rewards/core/state/state_migration_v5.h index 67e6726edb5..4ad31d6f898 100644 --- a/components/brave_rewards/core/state/state_migration_v5.h +++ b/components/brave_rewards/core/state/state_migration_v5.h @@ -10,19 +10,19 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace state { class StateMigrationV5 { public: - explicit StateMigrationV5(RewardsEngineImpl& engine); + explicit StateMigrationV5(RewardsEngine& engine); ~StateMigrationV5(); void Migrate(ResultCallback callback); private: - const raw_ref engine_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v6.cc b/components/brave_rewards/core/state/state_migration_v6.cc index 322ebb17288..a4ddec943b8 100644 --- a/components/brave_rewards/core/state/state_migration_v6.cc +++ b/components/brave_rewards/core/state/state_migration_v6.cc @@ -10,14 +10,13 @@ #include #include "base/json/json_writer.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state_keys.h" namespace brave_rewards::internal { namespace state { -StateMigrationV6::StateMigrationV6(RewardsEngineImpl& engine) - : engine_(engine) {} +StateMigrationV6::StateMigrationV6(RewardsEngine& engine) : engine_(engine) {} StateMigrationV6::~StateMigrationV6() = default; diff --git a/components/brave_rewards/core/state/state_migration_v6.h b/components/brave_rewards/core/state/state_migration_v6.h index 2f7731ab29f..7d4be8234f0 100644 --- a/components/brave_rewards/core/state/state_migration_v6.h +++ b/components/brave_rewards/core/state/state_migration_v6.h @@ -10,19 +10,19 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace state { class StateMigrationV6 { public: - explicit StateMigrationV6(RewardsEngineImpl& engine); + explicit StateMigrationV6(RewardsEngine& engine); ~StateMigrationV6(); void Migrate(ResultCallback callback); private: - const raw_ref engine_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v7.cc b/components/brave_rewards/core/state/state_migration_v7.cc index 257233d6e67..9ff1772bde6 100644 --- a/components/brave_rewards/core/state/state_migration_v7.cc +++ b/components/brave_rewards/core/state/state_migration_v7.cc @@ -7,15 +7,14 @@ #include #include -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/state/state_keys.h" namespace brave_rewards::internal { namespace state { -StateMigrationV7::StateMigrationV7(RewardsEngineImpl& engine) - : engine_(engine) {} +StateMigrationV7::StateMigrationV7(RewardsEngine& engine) : engine_(engine) {} StateMigrationV7::~StateMigrationV7() = default; diff --git a/components/brave_rewards/core/state/state_migration_v7.h b/components/brave_rewards/core/state/state_migration_v7.h index d9151d52770..89714788813 100644 --- a/components/brave_rewards/core/state/state_migration_v7.h +++ b/components/brave_rewards/core/state/state_migration_v7.h @@ -10,19 +10,19 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace state { class StateMigrationV7 { public: - explicit StateMigrationV7(RewardsEngineImpl& engine); + explicit StateMigrationV7(RewardsEngine& engine); ~StateMigrationV7(); void Migrate(ResultCallback callback); private: - const raw_ref engine_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/state/state_migration_v8.cc b/components/brave_rewards/core/state/state_migration_v8.cc index f73843775bd..cd8f8f5d263 100644 --- a/components/brave_rewards/core/state/state_migration_v8.cc +++ b/components/brave_rewards/core/state/state_migration_v8.cc @@ -7,14 +7,13 @@ #include #include -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state_keys.h" namespace brave_rewards::internal { namespace state { -StateMigrationV8::StateMigrationV8(RewardsEngineImpl& engine) - : engine_(engine) {} +StateMigrationV8::StateMigrationV8(RewardsEngine& engine) : engine_(engine) {} StateMigrationV8::~StateMigrationV8() = default; diff --git a/components/brave_rewards/core/state/state_migration_v8.h b/components/brave_rewards/core/state/state_migration_v8.h index fb80e0d1d69..fdac99ac23a 100644 --- a/components/brave_rewards/core/state/state_migration_v8.h +++ b/components/brave_rewards/core/state/state_migration_v8.h @@ -10,19 +10,19 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace state { class StateMigrationV8 { public: - explicit StateMigrationV8(RewardsEngineImpl& engine); + explicit StateMigrationV8(RewardsEngine& engine); ~StateMigrationV8(); void Migrate(ResultCallback callback); private: - const raw_ref engine_; + const raw_ref engine_; }; } // namespace state diff --git a/components/brave_rewards/core/test/BUILD.gn b/components/brave_rewards/core/test/BUILD.gn index e2cd07d59ab..299a07c1f85 100644 --- a/components/brave_rewards/core/test/BUILD.gn +++ b/components/brave_rewards/core/test/BUILD.gn @@ -73,8 +73,8 @@ source_set("test") { "//brave/components/brave_rewards/core/publisher/publisher_unittest.cc", "//brave/components/brave_rewards/core/rewards_engine_client_mock.cc", "//brave/components/brave_rewards/core/rewards_engine_client_mock.h", - "//brave/components/brave_rewards/core/rewards_engine_impl_mock.cc", - "//brave/components/brave_rewards/core/rewards_engine_impl_mock.h", + "//brave/components/brave_rewards/core/rewards_engine_mock.cc", + "//brave/components/brave_rewards/core/rewards_engine_mock.h", "//brave/components/brave_rewards/core/test/rewards_engine_test.cc", "//brave/components/brave_rewards/core/test/rewards_engine_test.h", "//brave/components/brave_rewards/core/test/test_rewards_engine_client.cc", diff --git a/components/brave_rewards/core/test/rewards_engine_test.h b/components/brave_rewards/core/test/rewards_engine_test.h index 9199e557510..72ad175bf10 100644 --- a/components/brave_rewards/core/test/rewards_engine_test.h +++ b/components/brave_rewards/core/test/rewards_engine_test.h @@ -14,7 +14,7 @@ #include "base/test/bind.h" #include "base/test/task_environment.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" #include "mojo/public/cpp/bindings/associated_receiver.h" #include "testing/gtest/include/gtest/gtest.h" @@ -37,8 +37,8 @@ class RewardsEngineTest : public testing::Test { // Returns the |TestRewardsEngineClient| instance for this test. TestRewardsEngineClient& engine_client() { return client_; } - // Returns the |RewardsEngineImpl| instance for this test. - RewardsEngineImpl& engine() { return engine_; } + // Returns the |RewardsEngine| instance for this test. + RewardsEngine& engine() { return engine_; } // Adds a mock network response for the specified URL and HTTP method. void AddNetworkResultForTesting(const std::string& url, @@ -68,7 +68,7 @@ class RewardsEngineTest : public testing::Test { TestRewardsEngineClient client_; mojo::AssociatedReceiver client_receiver_{ &client_}; - RewardsEngineImpl engine_; + RewardsEngine engine_; }; } // namespace brave_rewards::internal diff --git a/components/brave_rewards/core/uphold/uphold.cc b/components/brave_rewards/core/uphold/uphold.cc index cc393c929e2..fbf6991abc0 100644 --- a/components/brave_rewards/core/uphold/uphold.cc +++ b/components/brave_rewards/core/uphold/uphold.cc @@ -12,13 +12,13 @@ #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/common/url_helpers.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.h" #include "brave/components/brave_rewards/core/wallet_provider/uphold/uphold_transfer.h" namespace brave_rewards::internal::uphold { -Uphold::Uphold(RewardsEngineImpl& engine) +Uphold::Uphold(RewardsEngine& engine) : WalletProvider(engine), server_(engine) { connect_wallet_ = std::make_unique(engine); transfer_ = std::make_unique(engine); diff --git a/components/brave_rewards/core/uphold/uphold.h b/components/brave_rewards/core/uphold/uphold.h index f9f1b8244ae..478f58c8226 100644 --- a/components/brave_rewards/core/uphold/uphold.h +++ b/components/brave_rewards/core/uphold/uphold.h @@ -15,13 +15,13 @@ #include "brave/components/brave_rewards/core/wallet_provider/wallet_provider.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace uphold { class Uphold final : public wallet_provider::WalletProvider { public: - explicit Uphold(RewardsEngineImpl& engine); + explicit Uphold(RewardsEngine& engine); const char* WalletType() const override; diff --git a/components/brave_rewards/core/uphold/uphold_card.cc b/components/brave_rewards/core/uphold/uphold_card.cc index 91784486642..954c5f47fac 100644 --- a/components/brave_rewards/core/uphold/uphold_card.cc +++ b/components/brave_rewards/core/uphold/uphold_card.cc @@ -8,11 +8,11 @@ #include #include "brave/components/brave_rewards/core/endpoint/uphold/uphold_server.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal::uphold { -UpholdCard::UpholdCard(RewardsEngineImpl& engine) +UpholdCard::UpholdCard(RewardsEngine& engine) : engine_(engine), uphold_server_(engine) {} UpholdCard::~UpholdCard() = default; diff --git a/components/brave_rewards/core/uphold/uphold_card.h b/components/brave_rewards/core/uphold/uphold_card.h index f0d0d15a0e8..bb72da3961f 100644 --- a/components/brave_rewards/core/uphold/uphold_card.h +++ b/components/brave_rewards/core/uphold/uphold_card.h @@ -14,7 +14,7 @@ #include "brave/components/brave_rewards/core/endpoint/uphold/uphold_server.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace uphold { @@ -25,7 +25,7 @@ using CreateCardCallback = class UpholdCard { public: - explicit UpholdCard(RewardsEngineImpl& engine); + explicit UpholdCard(RewardsEngine& engine); ~UpholdCard(); @@ -47,7 +47,7 @@ class UpholdCard { std::string&& id, mojom::Result) const; - const raw_ref engine_; + const raw_ref engine_; endpoint::UpholdServer uphold_server_; }; diff --git a/components/brave_rewards/core/wallet/wallet.cc b/components/brave_rewards/core/wallet/wallet.cc index 497b672d447..e9414f6e2a9 100644 --- a/components/brave_rewards/core/wallet/wallet.cc +++ b/components/brave_rewards/core/wallet/wallet.cc @@ -16,7 +16,7 @@ #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/global_constants.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" #include "wally_bip39.h" // NOLINT @@ -24,7 +24,7 @@ namespace brave_rewards::internal { namespace wallet { -Wallet::Wallet(RewardsEngineImpl& engine) +Wallet::Wallet(RewardsEngine& engine) : engine_(engine), create_(engine), balance_(engine) {} Wallet::~Wallet() = default; diff --git a/components/brave_rewards/core/wallet/wallet.h b/components/brave_rewards/core/wallet/wallet.h index 333beb2e5d3..407ffa1def7 100644 --- a/components/brave_rewards/core/wallet/wallet.h +++ b/components/brave_rewards/core/wallet/wallet.h @@ -18,13 +18,13 @@ #include "brave/components/brave_rewards/core/wallet/wallet_create.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace wallet { class Wallet { public: - explicit Wallet(RewardsEngineImpl& engine); + explicit Wallet(RewardsEngine& engine); ~Wallet(); void CreateWalletIfNecessary(std::optional&& geo_country, @@ -38,7 +38,7 @@ class Wallet { bool SetWallet(mojom::RewardsWalletPtr wallet); private: - const raw_ref engine_; + const raw_ref engine_; WalletCreate create_; WalletBalance balance_; }; diff --git a/components/brave_rewards/core/wallet/wallet_balance.cc b/components/brave_rewards/core/wallet/wallet_balance.cc index 1a0eb32c27a..b855fff6cb5 100644 --- a/components/brave_rewards/core/wallet/wallet_balance.cc +++ b/components/brave_rewards/core/wallet/wallet_balance.cc @@ -11,14 +11,14 @@ #include "brave/components/brave_rewards/core/constants.h" #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/wallet_provider/wallet_provider.h" namespace brave_rewards::internal::wallet { -WalletBalance::WalletBalance(RewardsEngineImpl& engine) : engine_(engine) {} +WalletBalance::WalletBalance(RewardsEngine& engine) : engine_(engine) {} WalletBalance::~WalletBalance() = default; diff --git a/components/brave_rewards/core/wallet/wallet_balance.h b/components/brave_rewards/core/wallet/wallet_balance.h index 51410653df0..bc7bfb69d0e 100644 --- a/components/brave_rewards/core/wallet/wallet_balance.h +++ b/components/brave_rewards/core/wallet/wallet_balance.h @@ -14,13 +14,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace wallet { class WalletBalance { public: - explicit WalletBalance(RewardsEngineImpl& engine); + explicit WalletBalance(RewardsEngine& engine); ~WalletBalance(); void Fetch(FetchBalanceCallback callback); @@ -32,7 +32,7 @@ class WalletBalance { mojom::Result result, double balance); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace wallet diff --git a/components/brave_rewards/core/wallet/wallet_create.cc b/components/brave_rewards/core/wallet/wallet_create.cc index ffd4ee04fd8..ed097231b68 100644 --- a/components/brave_rewards/core/wallet/wallet_create.cc +++ b/components/brave_rewards/core/wallet/wallet_create.cc @@ -15,7 +15,7 @@ #include "brave/components/brave_rewards/core/endpoints/brave/post_wallets.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "brave/components/brave_rewards/core/wallet_provider/linkage_checker.h" @@ -50,7 +50,7 @@ mojom::CreateRewardsWalletResult MapEndpointError(PatchWallets::Error error) { } // namespace -WalletCreate::WalletCreate(RewardsEngineImpl& engine) : engine_(engine) {} +WalletCreate::WalletCreate(RewardsEngine& engine) : engine_(engine) {} void WalletCreate::CreateWallet(std::optional&& geo_country, CreateRewardsWalletCallback callback) { diff --git a/components/brave_rewards/core/wallet/wallet_create.h b/components/brave_rewards/core/wallet/wallet_create.h index 0f8f54358c1..61e12739388 100644 --- a/components/brave_rewards/core/wallet/wallet_create.h +++ b/components/brave_rewards/core/wallet/wallet_create.h @@ -13,13 +13,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace wallet { class WalletCreate { public: - explicit WalletCreate(RewardsEngineImpl& engine); + explicit WalletCreate(RewardsEngine& engine); void CreateWallet(std::optional&& geo_country, CreateRewardsWalletCallback callback); @@ -30,7 +30,7 @@ class WalletCreate { std::optional&& geo_country, Result&&); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace wallet diff --git a/components/brave_rewards/core/wallet/wallet_unittest.cc b/components/brave_rewards/core/wallet/wallet_unittest.cc index 90a7bb012f6..296e2a80890 100644 --- a/components/brave_rewards/core/wallet/wallet_unittest.cc +++ b/components/brave_rewards/core/wallet/wallet_unittest.cc @@ -12,7 +12,7 @@ #include "base/test/bind.h" #include "brave/components/brave_rewards/common/mojom/rewards_engine.mojom-test-utils.h" #include "brave/components/brave_rewards/core/common/environment_config.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/test/rewards_engine_test.h" #include "net/http/http_status_code.h" diff --git a/components/brave_rewards/core/wallet/wallet_util.cc b/components/brave_rewards/core/wallet/wallet_util.cc index 47f9d2053c9..ed1a850398a 100644 --- a/components/brave_rewards/core/wallet/wallet_util.cc +++ b/components/brave_rewards/core/wallet/wallet_util.cc @@ -20,7 +20,7 @@ #include "brave/components/brave_rewards/core/initialization_manager.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" #include "brave/components/brave_rewards/core/notifications/notification_keys.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/wallet_provider/wallet_provider.h" @@ -48,7 +48,7 @@ std::string WalletTypeToState(const std::string& wallet_type) { } } -void OnWalletStatusChange(RewardsEngineImpl& engine, +void OnWalletStatusChange(RewardsEngine& engine, const std::string& wallet_type, std::optional from, mojom::WalletStatus to) { @@ -62,7 +62,7 @@ void OnWalletStatusChange(RewardsEngineImpl& engine, oss.str() + " (" + wallet_type + ')'); } -void MaybeAssignWalletLinks(RewardsEngineImpl& engine, +void MaybeAssignWalletLinks(RewardsEngine& engine, mojom::ExternalWallet& wallet) { if (wallet.status != mojom::WalletStatus::kNotConnected) { if (auto* provider = engine.GetExternalWalletProvider(wallet.type)) { @@ -73,7 +73,7 @@ void MaybeAssignWalletLinks(RewardsEngineImpl& engine, } // namespace -mojom::ExternalWalletPtr ExternalWalletPtrFromJSON(RewardsEngineImpl& engine, +mojom::ExternalWalletPtr ExternalWalletPtrFromJSON(RewardsEngine& engine, std::string wallet_string, std::string wallet_type) { std::optional value = base::JSONReader::Read(wallet_string); @@ -125,7 +125,7 @@ mojom::ExternalWalletPtr ExternalWalletPtrFromJSON(RewardsEngineImpl& engine, return wallet; } -mojom::ExternalWalletPtr GetWallet(RewardsEngineImpl& engine, +mojom::ExternalWalletPtr GetWallet(RewardsEngine& engine, const std::string& wallet_type) { const auto state = WalletTypeToState(wallet_type); if (state.empty()) { @@ -146,7 +146,7 @@ mojom::ExternalWalletPtr GetWallet(RewardsEngineImpl& engine, } mojom::ExternalWalletPtr GetWalletIf( - RewardsEngineImpl& engine, + RewardsEngine& engine, const std::string& wallet_type, const std::set& statuses) { if (statuses.empty()) { @@ -170,7 +170,7 @@ mojom::ExternalWalletPtr GetWalletIf( return wallet; } -bool SetWallet(RewardsEngineImpl& engine, mojom::ExternalWalletPtr wallet) { +bool SetWallet(RewardsEngine& engine, mojom::ExternalWalletPtr wallet) { if (!wallet || wallet->type.empty()) { return false; } @@ -203,7 +203,7 @@ bool SetWallet(RewardsEngineImpl& engine, mojom::ExternalWalletPtr wallet) { // // Invariants: // - kNotConnected: token and address are cleared -mojom::ExternalWalletPtr EnsureValidCreation(RewardsEngineImpl& engine, +mojom::ExternalWalletPtr EnsureValidCreation(RewardsEngine& engine, const std::string& wallet_type, mojom::WalletStatus to) { if (to != mojom::WalletStatus::kNotConnected) { @@ -238,7 +238,7 @@ mojom::ExternalWalletPtr EnsureValidCreation(RewardsEngineImpl& engine, // - kNotConnected: token and address are cleared // - kConnected: needs !token.empty() && !address.empty() // - kLoggedOut: token and address are cleared -mojom::ExternalWalletPtr EnsureValidTransition(RewardsEngineImpl& engine, +mojom::ExternalWalletPtr EnsureValidTransition(RewardsEngine& engine, mojom::ExternalWalletPtr wallet, mojom::WalletStatus to) { DCHECK(wallet); @@ -293,7 +293,7 @@ mojom::ExternalWalletPtr EnsureValidTransition(RewardsEngineImpl& engine, } mojom::ExternalWalletPtr TransitionWallet( - RewardsEngineImpl& engine, + RewardsEngine& engine, absl::variant wallet_info, mojom::WalletStatus to) { std::optional from; @@ -339,7 +339,7 @@ mojom::ExternalWalletPtr TransitionWallet( return wallet; } -mojom::ExternalWalletPtr MaybeCreateWallet(RewardsEngineImpl& engine, +mojom::ExternalWalletPtr MaybeCreateWallet(RewardsEngine& engine, const std::string& wallet_type) { auto wallet = GetWallet(engine, wallet_type); if (!wallet) { @@ -354,7 +354,7 @@ mojom::ExternalWalletPtr MaybeCreateWallet(RewardsEngineImpl& engine, return wallet; } -bool LogOutWallet(RewardsEngineImpl& engine, +bool LogOutWallet(RewardsEngine& engine, const std::string& wallet_type, const std::string& notification) { DCHECK(!wallet_type.empty()); diff --git a/components/brave_rewards/core/wallet/wallet_util.h b/components/brave_rewards/core/wallet/wallet_util.h index 0e10aade534..915c2d20ecf 100644 --- a/components/brave_rewards/core/wallet/wallet_util.h +++ b/components/brave_rewards/core/wallet/wallet_util.h @@ -13,28 +13,28 @@ #include "third_party/abseil-cpp/absl/types/variant.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace wallet { -mojom::ExternalWalletPtr GetWallet(RewardsEngineImpl& engine, +mojom::ExternalWalletPtr GetWallet(RewardsEngine& engine, const std::string& wallet_type); -mojom::ExternalWalletPtr GetWalletIf(RewardsEngineImpl& engine, +mojom::ExternalWalletPtr GetWalletIf(RewardsEngine& engine, const std::string& wallet_type, const std::set&); -bool SetWallet(RewardsEngineImpl& engine, mojom::ExternalWalletPtr); +bool SetWallet(RewardsEngine& engine, mojom::ExternalWalletPtr); mojom::ExternalWalletPtr TransitionWallet( - RewardsEngineImpl& engine, + RewardsEngine& engine, absl::variant wallet_info, mojom::WalletStatus to); -mojom::ExternalWalletPtr MaybeCreateWallet(RewardsEngineImpl& engine, +mojom::ExternalWalletPtr MaybeCreateWallet(RewardsEngine& engine, const std::string& wallet_type); -bool LogOutWallet(RewardsEngineImpl& engine, +bool LogOutWallet(RewardsEngine& engine, const std::string& wallet_type, const std::string& notification = ""); diff --git a/components/brave_rewards/core/wallet/wallet_utils_unittest.cc b/components/brave_rewards/core/wallet/wallet_utils_unittest.cc index 48d516b94f0..3933799baa2 100644 --- a/components/brave_rewards/core/wallet/wallet_utils_unittest.cc +++ b/components/brave_rewards/core/wallet/wallet_utils_unittest.cc @@ -8,7 +8,7 @@ #include "base/test/task_environment.h" #include "brave/components/brave_rewards/common/mojom/rewards.mojom.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" #include "testing/gmock/include/gmock/gmock.h" @@ -23,14 +23,14 @@ using testing::WithParamInterface; namespace brave_rewards::internal::wallet { -mojom::ExternalWalletPtr ExternalWalletPtrFromJSON(RewardsEngineImpl& engine, +mojom::ExternalWalletPtr ExternalWalletPtrFromJSON(RewardsEngine& engine, std::string wallet_string, std::string wallet_type); class WalletUtilTest : public Test { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_F(WalletUtilTest, InvalidJSON) { @@ -69,7 +69,7 @@ class TransitionWalletCreate public WithParamInterface { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(TransitionWalletCreate, Paths) { @@ -153,7 +153,7 @@ class TransitionWalletTransition public WithParamInterface { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(TransitionWalletTransition, Paths) { diff --git a/components/brave_rewards/core/wallet_provider/bitflyer/bitflyer_transfer.cc b/components/brave_rewards/core/wallet_provider/bitflyer/bitflyer_transfer.cc index 67096ceccfa..197c5e21998 100644 --- a/components/brave_rewards/core/wallet_provider/bitflyer/bitflyer_transfer.cc +++ b/components/brave_rewards/core/wallet_provider/bitflyer/bitflyer_transfer.cc @@ -10,7 +10,7 @@ #include "brave/components/brave_rewards/core/bitflyer/bitflyer.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { diff --git a/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.cc b/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.cc index 2f5b16472e5..257d02ff08e 100644 --- a/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.cc +++ b/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.cc @@ -18,7 +18,7 @@ #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/global_constants.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "crypto/sha2.h" @@ -31,7 +31,7 @@ using wallet_provider::ConnectExternalWallet; namespace bitflyer { -ConnectBitFlyerWallet::ConnectBitFlyerWallet(RewardsEngineImpl& engine) +ConnectBitFlyerWallet::ConnectBitFlyerWallet(RewardsEngine& engine) : ConnectExternalWallet(engine), bitflyer_server_(engine) {} ConnectBitFlyerWallet::~ConnectBitFlyerWallet() = default; diff --git a/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.h b/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.h index a4ad28b2f9b..4cbaf626ddd 100644 --- a/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.h +++ b/components/brave_rewards/core/wallet_provider/bitflyer/connect_bitflyer_wallet.h @@ -14,13 +14,13 @@ #include "brave/components/brave_rewards/core/wallet_provider/connect_external_wallet.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace bitflyer { class ConnectBitFlyerWallet : public wallet_provider::ConnectExternalWallet { public: - explicit ConnectBitFlyerWallet(RewardsEngineImpl& engine); + explicit ConnectBitFlyerWallet(RewardsEngine& engine); ~ConnectBitFlyerWallet() override; diff --git a/components/brave_rewards/core/wallet_provider/connect_external_wallet.cc b/components/brave_rewards/core/wallet_provider/connect_external_wallet.cc index 3aaf5b3358b..f97e078c2ec 100644 --- a/components/brave_rewards/core/wallet_provider/connect_external_wallet.cc +++ b/components/brave_rewards/core/wallet_provider/connect_external_wallet.cc @@ -14,7 +14,7 @@ #include "brave/components/brave_rewards/core/database/database.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" #include "brave/components/brave_rewards/core/logging/event_log_util.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/state/state_keys.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" @@ -26,7 +26,7 @@ using wallet::GetWalletIf; namespace wallet_provider { -ConnectExternalWallet::ConnectExternalWallet(RewardsEngineImpl& engine) +ConnectExternalWallet::ConnectExternalWallet(RewardsEngine& engine) : engine_(engine) {} ConnectExternalWallet::~ConnectExternalWallet() = default; diff --git a/components/brave_rewards/core/wallet_provider/connect_external_wallet.h b/components/brave_rewards/core/wallet_provider/connect_external_wallet.h index 387d74a55e6..be27e229a20 100644 --- a/components/brave_rewards/core/wallet_provider/connect_external_wallet.h +++ b/components/brave_rewards/core/wallet_provider/connect_external_wallet.h @@ -15,13 +15,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace wallet_provider { class ConnectExternalWallet { public: - explicit ConnectExternalWallet(RewardsEngineImpl& engine); + explicit ConnectExternalWallet(RewardsEngine& engine); virtual ~ConnectExternalWallet(); @@ -54,7 +54,7 @@ class ConnectExternalWallet { std::string&& address, endpoints::PostConnect::Result&&) const; - const raw_ref engine_; + const raw_ref engine_; OAuthInfo oauth_info_; private: diff --git a/components/brave_rewards/core/wallet_provider/connect_external_wallet_unittest.cc b/components/brave_rewards/core/wallet_provider/connect_external_wallet_unittest.cc index 38a0a8adcd7..185fef24467 100644 --- a/components/brave_rewards/core/wallet_provider/connect_external_wallet_unittest.cc +++ b/components/brave_rewards/core/wallet_provider/connect_external_wallet_unittest.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/database/database_mock.h" #include "brave/components/brave_rewards/core/endpoints/common/post_connect.h" #include "brave/components/brave_rewards/core/rewards_engine_client_mock.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl_mock.h" +#include "brave/components/brave_rewards/core/rewards_engine_mock.h" #include "brave/components/brave_rewards/core/test/test_rewards_engine_client.h" #include "brave/components/brave_rewards/core/wallet_provider/connect_external_wallet.h" #include "testing/gtest/include/gtest/gtest.h" @@ -30,8 +30,7 @@ using Result = endpoints::PostConnect::Result; class ConnectTestWallet : public wallet_provider::ConnectExternalWallet { public: - explicit ConnectTestWallet(RewardsEngineImpl& engine, - Result post_connect_result) + explicit ConnectTestWallet(RewardsEngine& engine, Result post_connect_result) : ConnectExternalWallet(engine), post_connect_result_(post_connect_result) {} @@ -67,7 +66,7 @@ class ConnectExternalWalletTest : public TestWithParam { protected: base::test::TaskEnvironment task_environment_; - MockRewardsEngineImpl mock_engine_impl_; + MockRewardsEngine mock_engine_impl_; }; TEST_P(ConnectExternalWalletTest, Paths) { diff --git a/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.cc b/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.cc index fac2ffefe9b..65befeca03d 100644 --- a/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.cc +++ b/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.cc @@ -18,7 +18,7 @@ #include "brave/components/brave_rewards/core/gemini/gemini.h" #include "brave/components/brave_rewards/core/global_constants.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/wallet/wallet.h" #include "crypto/sha2.h" @@ -32,7 +32,7 @@ using wallet_provider::ConnectExternalWallet; namespace gemini { -ConnectGeminiWallet::ConnectGeminiWallet(RewardsEngineImpl& engine) +ConnectGeminiWallet::ConnectGeminiWallet(RewardsEngine& engine) : ConnectExternalWallet(engine), gemini_server_(engine) {} ConnectGeminiWallet::~ConnectGeminiWallet() = default; diff --git a/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.h b/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.h index 18ee51dc24a..9fef5606902 100644 --- a/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.h +++ b/components/brave_rewards/core/wallet_provider/gemini/connect_gemini_wallet.h @@ -15,13 +15,13 @@ #include "brave/components/brave_rewards/core/wallet_provider/connect_external_wallet.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace gemini { class ConnectGeminiWallet : public wallet_provider::ConnectExternalWallet { public: - explicit ConnectGeminiWallet(RewardsEngineImpl& engine); + explicit ConnectGeminiWallet(RewardsEngine& engine); ~ConnectGeminiWallet() override; diff --git a/components/brave_rewards/core/wallet_provider/gemini/gemini_transfer.cc b/components/brave_rewards/core/wallet_provider/gemini/gemini_transfer.cc index 5ae2ba8521a..eec1404d3f1 100644 --- a/components/brave_rewards/core/wallet_provider/gemini/gemini_transfer.cc +++ b/components/brave_rewards/core/wallet_provider/gemini/gemini_transfer.cc @@ -10,7 +10,7 @@ #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/gemini/gemini.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { diff --git a/components/brave_rewards/core/wallet_provider/linkage_checker.cc b/components/brave_rewards/core/wallet_provider/linkage_checker.cc index 3f1d14bf66f..93dba1a3744 100644 --- a/components/brave_rewards/core/wallet_provider/linkage_checker.cc +++ b/components/brave_rewards/core/wallet_provider/linkage_checker.cc @@ -19,7 +19,7 @@ namespace brave_rewards::internal { -LinkageChecker::LinkageChecker(RewardsEngineImpl& engine) +LinkageChecker::LinkageChecker(RewardsEngine& engine) : RewardsEngineHelper(engine) {} LinkageChecker::~LinkageChecker() = default; diff --git a/components/brave_rewards/core/wallet_provider/linkage_checker.h b/components/brave_rewards/core/wallet_provider/linkage_checker.h index be530f6a935..e79e8b5409b 100644 --- a/components/brave_rewards/core/wallet_provider/linkage_checker.h +++ b/components/brave_rewards/core/wallet_provider/linkage_checker.h @@ -21,7 +21,7 @@ namespace brave_rewards::internal { class LinkageChecker : public RewardsEngineHelper, public WithHelperKey { public: - explicit LinkageChecker(RewardsEngineImpl& engine); + explicit LinkageChecker(RewardsEngine& engine); ~LinkageChecker() override; // Starts the wallet linkage checker, if not already started. If not already diff --git a/components/brave_rewards/core/wallet_provider/solana/solana_wallet_provider.cc b/components/brave_rewards/core/wallet_provider/solana/solana_wallet_provider.cc index c89ca9e53a0..f97368e839f 100644 --- a/components/brave_rewards/core/wallet_provider/solana/solana_wallet_provider.cc +++ b/components/brave_rewards/core/wallet_provider/solana/solana_wallet_provider.cc @@ -45,7 +45,7 @@ std::string UsernameFromAddress(const std::string& address) { } // namespace -SolanaWalletProvider::SolanaWalletProvider(RewardsEngineImpl& engine) +SolanaWalletProvider::SolanaWalletProvider(RewardsEngine& engine) : RewardsEngineHelper(engine), WalletProvider(engine) {} SolanaWalletProvider::~SolanaWalletProvider() = default; diff --git a/components/brave_rewards/core/wallet_provider/solana/solana_wallet_provider.h b/components/brave_rewards/core/wallet_provider/solana/solana_wallet_provider.h index 81cbbcc6aa1..b21baa8a3c8 100644 --- a/components/brave_rewards/core/wallet_provider/solana/solana_wallet_provider.h +++ b/components/brave_rewards/core/wallet_provider/solana/solana_wallet_provider.h @@ -20,7 +20,7 @@ class SolanaWalletProvider : public RewardsEngineHelper, public WithHelperKey, public wallet_provider::WalletProvider { public: - explicit SolanaWalletProvider(RewardsEngineImpl& engine); + explicit SolanaWalletProvider(RewardsEngine& engine); ~SolanaWalletProvider() override; const char* WalletType() const override; diff --git a/components/brave_rewards/core/wallet_provider/transfer.cc b/components/brave_rewards/core/wallet_provider/transfer.cc index 53c40828424..99d60667af0 100644 --- a/components/brave_rewards/core/wallet_provider/transfer.cc +++ b/components/brave_rewards/core/wallet_provider/transfer.cc @@ -10,11 +10,11 @@ #include "base/strings/string_number_conversions.h" #include "base/uuid.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal::wallet_provider { -Transfer::Transfer(RewardsEngineImpl& engine) : engine_(engine) {} +Transfer::Transfer(RewardsEngine& engine) : engine_(engine) {} Transfer::~Transfer() = default; diff --git a/components/brave_rewards/core/wallet_provider/transfer.h b/components/brave_rewards/core/wallet_provider/transfer.h index 65038d023a5..0e645549c4c 100644 --- a/components/brave_rewards/core/wallet_provider/transfer.h +++ b/components/brave_rewards/core/wallet_provider/transfer.h @@ -14,13 +14,13 @@ #include "brave/components/brave_rewards/core/rewards_callbacks.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace wallet_provider { class Transfer { public: - explicit Transfer(RewardsEngineImpl& engine); + explicit Transfer(RewardsEngine& engine); virtual ~Transfer(); @@ -61,7 +61,7 @@ class Transfer { virtual void CommitTransaction(ResultCallback, mojom::ExternalTransactionPtr) const = 0; - const raw_ref engine_; + const raw_ref engine_; }; } // namespace wallet_provider diff --git a/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.cc b/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.cc index 403f830753a..b5571989f1e 100644 --- a/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.cc +++ b/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.cc @@ -15,7 +15,7 @@ #include "brave/components/brave_rewards/core/global_constants.h" #include "brave/components/brave_rewards/core/logging/event_log_keys.h" #include "brave/components/brave_rewards/core/notifications/notification_keys.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/uphold/uphold.h" namespace brave_rewards::internal { @@ -28,7 +28,7 @@ using wallet_provider::ConnectExternalWallet; namespace uphold { -ConnectUpholdWallet::ConnectUpholdWallet(RewardsEngineImpl& engine) +ConnectUpholdWallet::ConnectUpholdWallet(RewardsEngine& engine) : ConnectExternalWallet(engine), card_(engine), server_(engine) {} ConnectUpholdWallet::~ConnectUpholdWallet() = default; diff --git a/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.h b/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.h index 8839d79d05e..903fe957ced 100644 --- a/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.h +++ b/components/brave_rewards/core/wallet_provider/uphold/connect_uphold_wallet.h @@ -20,7 +20,7 @@ namespace brave_rewards::internal::uphold { class ConnectUpholdWallet : public wallet_provider::ConnectExternalWallet { public: - explicit ConnectUpholdWallet(RewardsEngineImpl& engine); + explicit ConnectUpholdWallet(RewardsEngine& engine); ~ConnectUpholdWallet() override; diff --git a/components/brave_rewards/core/wallet_provider/uphold/uphold_transfer.cc b/components/brave_rewards/core/wallet_provider/uphold/uphold_transfer.cc index 5d210a5910c..69625ee40f4 100644 --- a/components/brave_rewards/core/wallet_provider/uphold/uphold_transfer.cc +++ b/components/brave_rewards/core/wallet_provider/uphold/uphold_transfer.cc @@ -9,7 +9,7 @@ #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/uphold/uphold.h" namespace brave_rewards::internal { diff --git a/components/brave_rewards/core/wallet_provider/wallet_provider.cc b/components/brave_rewards/core/wallet_provider/wallet_provider.cc index d90103fa30c..deda21c714f 100644 --- a/components/brave_rewards/core/wallet_provider/wallet_provider.cc +++ b/components/brave_rewards/core/wallet_provider/wallet_provider.cc @@ -9,12 +9,12 @@ #include "brave/components/brave_rewards/core/common/time_util.h" #include "brave/components/brave_rewards/core/database/database.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/wallet/wallet_util.h" namespace brave_rewards::internal::wallet_provider { -WalletProvider::WalletProvider(RewardsEngineImpl& engine) : engine_(engine) {} +WalletProvider::WalletProvider(RewardsEngine& engine) : engine_(engine) {} WalletProvider::~WalletProvider() = default; diff --git a/components/brave_rewards/core/wallet_provider/wallet_provider.h b/components/brave_rewards/core/wallet_provider/wallet_provider.h index cda71ff009e..5fc7e856b73 100644 --- a/components/brave_rewards/core/wallet_provider/wallet_provider.h +++ b/components/brave_rewards/core/wallet_provider/wallet_provider.h @@ -21,13 +21,13 @@ #include "brave/components/brave_rewards/core/wallet_provider/transfer.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace wallet_provider { class WalletProvider { public: - explicit WalletProvider(RewardsEngineImpl& engine); + explicit WalletProvider(RewardsEngine& engine); virtual ~WalletProvider(); virtual const char* WalletType() const = 0; @@ -98,7 +98,7 @@ class WalletProvider { void RemoveTransferFee(const std::string& contribution_id); protected: - const raw_ref engine_; + const raw_ref engine_; std::unique_ptr connect_wallet_; std::unique_ptr transfer_; diff --git a/components/brave_rewards/core/wallet_provider/zebpay/connect_zebpay_wallet.cc b/components/brave_rewards/core/wallet_provider/zebpay/connect_zebpay_wallet.cc index 7211574f71d..a0a6e1a58c3 100644 --- a/components/brave_rewards/core/wallet_provider/zebpay/connect_zebpay_wallet.cc +++ b/components/brave_rewards/core/wallet_provider/zebpay/connect_zebpay_wallet.cc @@ -13,7 +13,7 @@ #include "brave/components/brave_rewards/core/endpoints/brave/post_connect_zebpay.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/zebpay/zebpay.h" using brave_rewards::internal::endpoints::PostConnectZebPay; @@ -24,7 +24,7 @@ using brave_rewards::mojom::ConnectExternalWalletResult; namespace brave_rewards::internal::zebpay { -ConnectZebPayWallet::ConnectZebPayWallet(RewardsEngineImpl& engine) +ConnectZebPayWallet::ConnectZebPayWallet(RewardsEngine& engine) : ConnectExternalWallet(engine) {} ConnectZebPayWallet::~ConnectZebPayWallet() = default; diff --git a/components/brave_rewards/core/wallet_provider/zebpay/connect_zebpay_wallet.h b/components/brave_rewards/core/wallet_provider/zebpay/connect_zebpay_wallet.h index c0f146779c4..805d7da2c67 100644 --- a/components/brave_rewards/core/wallet_provider/zebpay/connect_zebpay_wallet.h +++ b/components/brave_rewards/core/wallet_provider/zebpay/connect_zebpay_wallet.h @@ -13,13 +13,13 @@ #include "brave/components/brave_rewards/core/wallet_provider/connect_external_wallet.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace zebpay { class ConnectZebPayWallet : public wallet_provider::ConnectExternalWallet { public: - explicit ConnectZebPayWallet(RewardsEngineImpl& engine); + explicit ConnectZebPayWallet(RewardsEngine& engine); ~ConnectZebPayWallet() override; diff --git a/components/brave_rewards/core/zebpay/zebpay.cc b/components/brave_rewards/core/zebpay/zebpay.cc index 0b14489a053..30161cfe623 100644 --- a/components/brave_rewards/core/zebpay/zebpay.cc +++ b/components/brave_rewards/core/zebpay/zebpay.cc @@ -12,7 +12,7 @@ #include "brave/components/brave_rewards/core/common/environment_config.h" #include "brave/components/brave_rewards/core/endpoints/request_for.h" #include "brave/components/brave_rewards/core/global_constants.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #include "brave/components/brave_rewards/core/wallet_provider/zebpay/connect_zebpay_wallet.h" using brave_rewards::internal::endpoints::GetBalanceZebPay; @@ -20,7 +20,7 @@ using brave_rewards::internal::endpoints::RequestFor; namespace brave_rewards::internal::zebpay { -ZebPay::ZebPay(RewardsEngineImpl& engine) +ZebPay::ZebPay(RewardsEngine& engine) : WalletProvider(engine), engine_(engine) { connect_wallet_ = std::make_unique(engine); } diff --git a/components/brave_rewards/core/zebpay/zebpay.h b/components/brave_rewards/core/zebpay/zebpay.h index 142940cc743..e8b0d550c15 100644 --- a/components/brave_rewards/core/zebpay/zebpay.h +++ b/components/brave_rewards/core/zebpay/zebpay.h @@ -15,13 +15,13 @@ #include "brave/components/brave_rewards/core/wallet_provider/wallet_provider.h" namespace brave_rewards::internal { -class RewardsEngineImpl; +class RewardsEngine; namespace zebpay { class ZebPay final : public wallet_provider::WalletProvider { public: - explicit ZebPay(RewardsEngineImpl& engine); + explicit ZebPay(RewardsEngine& engine); const char* WalletType() const override; @@ -36,7 +36,7 @@ class ZebPay final : public wallet_provider::WalletProvider { void OnFetchBalance(base::OnceCallback callback, endpoints::GetBalanceZebPay::Result&& result); - const raw_ref engine_; + const raw_ref engine_; }; } // namespace zebpay diff --git a/components/services/bat_rewards/rewards_engine_factory.cc b/components/services/bat_rewards/rewards_engine_factory.cc index 192c1e532d8..cf8faf9530a 100644 --- a/components/services/bat_rewards/rewards_engine_factory.cc +++ b/components/services/bat_rewards/rewards_engine_factory.cc @@ -8,7 +8,7 @@ #include #include -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" namespace brave_rewards::internal { @@ -25,7 +25,7 @@ void RewardsEngineFactory::CreateRewardsEngine( CreateRewardsEngineCallback callback) { if (!engine_) { engine_ = mojo::MakeSelfOwnedAssociatedReceiver( - std::make_unique(std::move(client_remote), *options), + std::make_unique(std::move(client_remote), *options), std::move(engine_receiver)); } diff --git a/ios/browser/api/brave_rewards/brave_rewards_api.mm b/ios/browser/api/brave_rewards/brave_rewards_api.mm index e4f3b7a7141..462ea80cbe9 100644 --- a/ios/browser/api/brave_rewards/brave_rewards_api.mm +++ b/ios/browser/api/brave_rewards/brave_rewards_api.mm @@ -26,7 +26,7 @@ #include "brave/components/brave_rewards/common/rewards_flags.h" #include "brave/components/brave_rewards/core/global_constants.h" #include "brave/components/brave_rewards/core/rewards_database.h" -#include "brave/components/brave_rewards/core/rewards_engine_impl.h" +#include "brave/components/brave_rewards/core/rewards_engine.h" #import "brave/ios/browser/api/brave_rewards/rewards.mojom.objc+private.h" #import "brave/ios/browser/api/brave_rewards/rewards_client_bridge.h" #import "brave/ios/browser/api/brave_rewards/rewards_client_ios.h" @@ -96,9 +96,9 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; @interface BraveRewardsAPI () { // DO NOT ACCESS DIRECTLY, use `postEngineTask` or ensure you are accessing // _engine from a task posted in `_engineTaskRunner` - std::unique_ptr> + brave_rewards::internal::RewardsEngine>> _engine; std::unique_ptr> @@ -179,7 +179,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; auto options = [self handleFlags:brave_rewards::RewardsFlags::ForCurrentProcess()]; self->_engine = brave_rewards::internal::make_task_ptr< - brave_rewards::internal::RewardsEngineImpl>( + brave_rewards::internal::RewardsEngine>( self->_rewardsClient->MakeRemote(), std::move(options)); })); @@ -230,8 +230,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; return options; } -- (void)postEngineTask: - (void (^)(brave_rewards::internal::RewardsEngineImpl*))task { +- (void)postEngineTask:(void (^)(brave_rewards::internal::RewardsEngine*))task { _engineTaskRunner->PostTask(FROM_HERE, base::BindOnce(^{ CHECK(self->_engine != nullptr); task(self->_engine.get()); @@ -244,7 +243,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; } self.initializing = YES; - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->Initialize(base::BindOnce(^(brave_rewards::mojom::Result result) { self.initialized = (result == brave_rewards::mojom::Result::OK || @@ -328,7 +327,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; // malformed data // - REGISTRATION_VERIFICATION_FAILED: Missing master user token self.initializingWallet = YES; - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->CreateRewardsWallet( "", base::BindOnce(^( brave_rewards::mojom::CreateRewardsWalletResult create_result) { @@ -389,7 +388,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; - (void)currentWalletInfo: (void (^)(BraveRewardsRewardsWallet* _Nullable wallet))completion { - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->GetRewardsWallet( base::BindOnce(^(brave_rewards::mojom::RewardsWalletPtr wallet) { const auto bridgedWallet = wallet.get() != nullptr @@ -405,7 +404,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; - (void)getRewardsParameters: (void (^)(BraveRewardsRewardsParameters* _Nullable))completion { - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->GetRewardsParameters( base::BindOnce(^(brave_rewards::mojom::RewardsParametersPtr info) { if (info) { @@ -426,7 +425,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; - (void)fetchBalance:(void (^)(BraveRewardsBalance* _Nullable))completion { const auto __weak weakSelf = self; - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->FetchBalance( base::BindOnce(^(brave_rewards::mojom::BalancePtr balance) { const auto strongSelf = weakSelf; @@ -470,7 +469,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; completion: (void (^)(NSArray*)) completion { - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { auto cppFilter = filter ? filter.cppObjPtr : brave_rewards::mojom::ActivityInfoFilter::New(); if (filter.excluded == BraveRewardsExcludeFilterFilterExcluded) { @@ -509,7 +508,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; faviconURL:(nullable NSURL*)faviconURL publisherBlob:(nullable NSString*)publisherBlob tabId:(uint64_t)tabId { - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { if (!URL.absoluteString) { return; } @@ -556,7 +555,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; completion(BraveRewardsPublisherStatusNotVerified); return; } - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->RefreshPublisher( base::SysNSStringToUTF8(publisherId), base::BindOnce(^(brave_rewards::mojom::PublisherStatus status) { @@ -571,7 +570,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; - (void)listRecurringTips: (void (^)(NSArray*))completion { - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->GetRecurringTips(base::BindOnce( ^(std::vector list) { const auto publishers = NSArrayFromVector( @@ -588,7 +587,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; } - (void)removeRecurringTipForPublisherWithId:(NSString*)publisherId { - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->RemoveRecurringTip( base::SysNSStringToUTF8(publisherId), base::BindOnce(^(brave_rewards::mojom::Result result){ @@ -612,7 +611,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; - (void)rewardsInternalInfo: (void (^)(BraveRewardsRewardsInternalsInfo* _Nullable info))completion { - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->GetRewardsInternalsInfo( base::BindOnce(^(brave_rewards::mojom::RewardsInternalsInfoPtr info) { auto bridgedInfo = info.get() != nullptr @@ -629,7 +628,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; - (void)allContributions: (void (^)(NSArray* contributions)) completion { - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->GetAllContributions(base::BindOnce( ^(std::vector list) { const auto convetedList = NSArrayFromVector( @@ -648,7 +647,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; - (void)fetchAutoContributeProperties: (void (^)(BraveRewardsAutoContributeProperties* _Nullable properties)) completion { - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->GetAutoContributeProperties(base::BindOnce( ^(brave_rewards::mojom::AutoContributePropertiesPtr props) { auto properties = @@ -673,13 +672,13 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; const auto time = [[NSDate date] timeIntervalSince1970]; if (_selectedTabId != selectedTabId) { const auto oldTabId = _selectedTabId; - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->OnHide(oldTabId, time); }]; } _selectedTabId = selectedTabId; if (_selectedTabId > 0) { - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->OnShow(selectedTabId, time); }]; } @@ -691,7 +690,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; } const auto time = [[NSDate date] timeIntervalSince1970]; - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->OnForeground(self.selectedTabId, time); }]; } @@ -702,7 +701,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; } const auto time = [[NSDate date] timeIntervalSince1970]; - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->OnBackground(self.selectedTabId, time); }]; } @@ -713,7 +712,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; } const auto time = [[NSDate date] timeIntervalSince1970]; - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { GURL parsedUrl(base::SysNSStringToUTF8(url.absoluteString)); url::Origin origin = url::Origin::Create(parsedUrl); const std::string baseDomain = GetDomainAndRegistry( @@ -747,7 +746,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; return; } - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { base::flat_map partsMap; const auto urlComponents = [[NSURLComponents alloc] initWithURL:url resolvingAgainstBaseURL:NO]; @@ -780,7 +779,7 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; } const auto time = [[NSDate date] timeIntervalSince1970]; - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->OnUnload(tabId, time); }]; } @@ -788,25 +787,25 @@ static NSString* const kTransferFeesPrefKey = @"transfer_fees"; #pragma mark - Preferences - (void)setMinimumVisitDuration:(int)minimumVisitDuration { - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->SetPublisherMinVisitTime(minimumVisitDuration); }]; } - (void)setMinimumNumberOfVisits:(int)minimumNumberOfVisits { - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->SetPublisherMinVisits(minimumNumberOfVisits); }]; } - (void)setContributionAmount:(double)contributionAmount { - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->SetAutoContributionAmount(contributionAmount); }]; } - (void)setAutoContributeEnabled:(bool)autoContributeEnabled { - [self postEngineTask:^(brave_rewards::internal::RewardsEngineImpl* engine) { + [self postEngineTask:^(brave_rewards::internal::RewardsEngine* engine) { engine->SetAutoContributeEnabled(autoContributeEnabled); }]; }