Rename RewardsEngineImpl to brave_rewards::internal::RewardsEngine

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",

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<ConnectBitFlyerWallet>(engine);
   transfer_ = std::make_unique<BitFlyerTransfer>(engine);

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;
 

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;

components/brave_rewards/core/common/environment_config.h

@@ -18,7 +18,7 @@ namespace brave_rewards::internal {
 class EnvironmentConfig : public RewardsEngineHelper,
                           public WithHelperKey<EnvironmentConfig> {
  public:
-  explicit EnvironmentConfig(RewardsEngineImpl& engine);
+  explicit EnvironmentConfig(RewardsEngine& engine);
   ~EnvironmentConfig() override;
 
   mojom::Environment current_environment() const;

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"
 

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;
 

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<URLLoader> {
  public:
-  explicit URLLoader(RewardsEngineImpl& engine);
+  explicit URLLoader(RewardsEngine& engine);
   ~URLLoader() override;
 
   enum class LogLevel {

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),

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<mojom::PublisherInfoPtr> list);
 
-  const raw_ref<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
   Unblinded unblinded_;
   ContributionSKU sku_;
   ContributionMonthly monthly_;

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;
 

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<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
   base::WeakPtrFactory<ContributionAC> weak_factory_{this};
 };
 

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;

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<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
   base::WeakPtrFactory<ContributionExternalWallet> weak_factory_{this};
 };
 

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;

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<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
   base::WeakPtrFactory<ContributionMonthly> weak_factory_{this};
 };
 

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;

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<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
   credential::CredentialsSKU credentials_;
   sku::SKU sku_;
   base::WeakPtrFactory<ContributionSKU> weak_factory_{this};

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;
 

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<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
   base::WeakPtrFactory<ContributionTip> weak_factory_{this};
 };
 

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;
 

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<mojom::CredsBatchType>& types,
@@ -130,7 +130,7 @@ class Unblinded {
       double amount,
       const std::vector<mojom::ContributionPublisherPtr>& publisher_list);
 
-  const raw_ref<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
   credential::CredentialsSKU credentials_sku_;
   base::WeakPtrFactory<Unblinded> weak_factory_{this};
 };

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_};
 };
 

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;
 

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<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
   base::WeakPtrFactory<CredentialsCommon> weak_factory_{this};
 };
 

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;

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<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
   CredentialsCommon common_;
   endpoint::PaymentServer payment_server_;
   base::WeakPtrFactory<CredentialsSKU> weak_factory_{this};

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<mojom::UnblindedToken>& token_list,
     const std::string& body) {
   base::Value::List credentials;

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<std::string> UnBlindCredsMock(const mojom::CredsBatch& creds);
 std::string ConvertRewardTypeToString(const mojom::RewardsType type);
 
 base::Value::List GenerateCredentials(
-    RewardsEngineImpl& engine,
+    RewardsEngine& engine,
     const std::vector<mojom::UnblindedToken>& token_list,
     const std::string& body);
 

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),

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<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
   DatabaseInitialize initialize_;
   DatabaseActivityInfo activity_info_;
   DatabaseBalanceReport balance_report_;

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;

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);

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_};
 };
 

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;

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,

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_};
 };
 

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;

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);

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() =

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,

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;

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,

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() =

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,

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;

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);

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;

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);

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;

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);

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;

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<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
   DatabaseMigration migration_;
 };
 

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;

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,

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;
 

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<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
   static uint32_t test_target_version_;
 };
 

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"

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;
 

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;
 

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;

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);

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<publisher::PrefixIterator, std::string, size_t> GetPrefixInsertList(
 
 namespace database {
 
-DatabasePublisherPrefixList::DatabasePublisherPrefixList(
-    RewardsEngineImpl& engine)
+DatabasePublisherPrefixList::DatabasePublisherPrefixList(RewardsEngine& engine)
     : DatabaseTable(engine) {}
 
 DatabasePublisherPrefixList::~DatabasePublisherPrefixList() = default;

components/brave_rewards/core/database/database_publisher_prefix_list.h

@@ -19,7 +19,7 @@ using SearchPublisherPrefixListCallback = base::OnceCallback<void(bool)>;
 
 class DatabasePublisherPrefixList : public DatabaseTable {
  public:
-  explicit DatabasePublisherPrefixList(RewardsEngineImpl& engine);
+  explicit DatabasePublisherPrefixList(RewardsEngine& engine);
   ~DatabasePublisherPrefixList() override;
 
   void Reset(publisher::PrefixListReader reader, ResultCallback callback);

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_};
 };
 

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<void(bool)> callback,
 
 }  // namespace
 
-DatabaseRecurringTip::DatabaseRecurringTip(RewardsEngineImpl& engine)
+DatabaseRecurringTip::DatabaseRecurringTip(RewardsEngine& engine)
     : DatabaseTable(engine) {}
 
 DatabaseRecurringTip::~DatabaseRecurringTip() = default;

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

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;

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,

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;

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,

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;

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,

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;

components/brave_rewards/core/database/database_sku_order.h

@@ -21,7 +21,7 @@ using GetSKUOrderCallback = base::OnceCallback<void(mojom::SKUOrderPtr)>;
 
 class DatabaseSKUOrder : public DatabaseTable {
  public:
-  explicit DatabaseSKUOrder(RewardsEngineImpl& engine);
+  explicit DatabaseSKUOrder(RewardsEngine& engine);
   ~DatabaseSKUOrder() override;
 
   void InsertOrUpdate(mojom::SKUOrderPtr info, ResultCallback callback);

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;

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,

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;

components/brave_rewards/core/database/database_sku_transaction.h

@@ -21,7 +21,7 @@ using GetSKUTransactionCallback = base::OnceCallback<void(
 
 class DatabaseSKUTransaction : public DatabaseTable {
  public:
-  explicit DatabaseSKUTransaction(RewardsEngineImpl& engine);
+  explicit DatabaseSKUTransaction(RewardsEngine& engine);
   ~DatabaseSKUTransaction() override;
 
   void InsertOrUpdate(mojom::SKUTransactionPtr info, ResultCallback callback);

components/brave_rewards/core/database/database_table.cc

@@ -4,12 +4,12 @@
  * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #include "brave/components/brave_rewards/core/database/database_table.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 {
 
-DatabaseTable::DatabaseTable(RewardsEngineImpl& engine) : engine_(engine) {}
+DatabaseTable::DatabaseTable(RewardsEngine& engine) : engine_(engine) {}
 
 DatabaseTable::~DatabaseTable() = default;
 

components/brave_rewards/core/database/database_table.h

@@ -18,7 +18,7 @@
 #include "brave/components/brave_rewards/core/rewards_callbacks.h"
 
 namespace brave_rewards::internal {
-class RewardsEngineImpl;
+class RewardsEngine;
 
 namespace database {
 
@@ -42,11 +42,11 @@ using ContributionPublisherPairListCallback =
 
 class DatabaseTable {
  public:
-  explicit DatabaseTable(RewardsEngineImpl& engine);
+  explicit DatabaseTable(RewardsEngine& engine);
   virtual ~DatabaseTable();
 
  protected:
-  const raw_ref<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
 };
 
 }  // namespace database

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;

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<mojom::UnblindedTokenPtr> list,

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;

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_; }

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;
 

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<void(const mojom::Result result,
 
 class GetBalance {
  public:
-  explicit GetBalance(RewardsEngineImpl& engine);
+  explicit GetBalance(RewardsEngine& engine);
   ~GetBalance();
 
   void Request(const std::string& token, GetBalanceCallback callback);
@@ -67,7 +67,7 @@ class GetBalance {
 
   void OnRequest(GetBalanceCallback callback, mojom::UrlResponsePtr response);
 
-  const raw_ref<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
 };
 
 }  // namespace bitflyer

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_};
 };
 

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;
 

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<void(mojom::Result,
 
 class PostOauth {
  public:
-  explicit PostOauth(RewardsEngineImpl& engine);
+  explicit PostOauth(RewardsEngine& engine);
   ~PostOauth();
 
   void Request(const std::string& external_account_id,
@@ -79,7 +79,7 @@ class PostOauth {
 
   void OnRequest(PostOauthCallback, mojom::UrlResponsePtr);
 
-  const raw_ref<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
 };
 
 }  // namespace endpoint::bitflyer

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_};
 };
 

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),

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_; }

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;
 

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<void(mojom::Result,
 
 class PostAccount {
  public:
-  explicit PostAccount(RewardsEngineImpl& engine);
+  explicit PostAccount(RewardsEngine& engine);
   ~PostAccount();
 
   void Request(const std::string& token, PostAccountCallback);
@@ -65,7 +65,7 @@ class PostAccount {
 
   void OnRequest(PostAccountCallback, mojom::UrlResponsePtr);
 
-  const raw_ref<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
 };
 
 }  // namespace endpoint::gemini

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_};
 };
 

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;
 

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<void(const mojom::Result result,
 
 class PostBalance {
  public:
-  explicit PostBalance(RewardsEngineImpl& engine);
+  explicit PostBalance(RewardsEngine& engine);
   ~PostBalance();
 
   void Request(const std::string& token, PostBalanceCallback callback);
@@ -65,7 +65,7 @@ class PostBalance {
 
   void OnRequest(PostBalanceCallback callback, mojom::UrlResponsePtr response);
 
-  const raw_ref<RewardsEngineImpl> engine_;
+  const raw_ref<RewardsEngine> engine_;
 };
 
 }  // namespace gemini

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_};
 };
 

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;