Merge pull request #9744 from /issues/14236

Refactored Brave Ads Result to bool

Author: tmancey

components/brave_ads/browser/ads_service_impl.cc

@@ -680,8 +680,8 @@ void AdsServiceImpl::OnCreate() {
   bat_ads_->Initialize(base::BindOnce(std::move(callback)));
 }
 
-void AdsServiceImpl::OnInitialize(const int32_t result) {
-  if (result != ads::Result::SUCCESS) {
+void AdsServiceImpl::OnInitialize(const bool success) {
+  if (!success) {
     VLOG(0) << "Failed to initialize ads";
 
     is_initialized_ = false;
@@ -706,10 +706,10 @@ void AdsServiceImpl::ShutdownBatAds() {
       base::BindOnce(&AdsServiceImpl::OnShutdownBatAds, AsWeakPtr()));
 }
 
-void AdsServiceImpl::OnShutdownBatAds(const int32_t result) {
+void AdsServiceImpl::OnShutdownBatAds(const bool success) {
   DCHECK(is_initialized_);
 
-  if (result != ads::Result::SUCCESS) {
+  if (!success) {
     VLOG(0) << "Failed to shutdown ads";
     return;
   }
@@ -807,10 +807,10 @@ void AdsServiceImpl::ResetAllState(const bool should_shutdown) {
       base::BindOnce(&AdsServiceImpl::OnShutdownAndResetBatAds, AsWeakPtr()));
 }
 
-void AdsServiceImpl::OnShutdownAndResetBatAds(const int32_t result) {
+void AdsServiceImpl::OnShutdownAndResetBatAds(const bool success) {
   DCHECK(is_initialized_);
 
-  if (result != ads::Result::SUCCESS) {
+  if (!success) {
     VLOG(0) << "Failed to shutdown and reset ads state";
     return;
   }
@@ -1346,8 +1346,8 @@ void AdsServiceImpl::OnGetAdDiagnostics(GetAdDiagnosticsCallback callback,
   std::move(callback).Run(success, json);
 }
 
-void AdsServiceImpl::OnRemoveAllHistory(const int32_t result) {
-  if (result != ads::Result::SUCCESS) {
+void AdsServiceImpl::OnRemoveAllHistory(const bool success) {
+  if (!success) {
     VLOG(0) << "Failed to remove ads history";
     return;
   }
@@ -1401,9 +1401,9 @@ void AdsServiceImpl::OnLoaded(const ads::LoadCallback& callback,
   }
 
   if (value.empty())
-    callback(ads::Result::FAILED, value);
+    callback(/* success */ false, value);
   else
-    callback(ads::Result::SUCCESS, value);
+    callback(/* success */ true, value);
 }
 
 void AdsServiceImpl::OnSaved(const ads::ResultCallback& callback,
@@ -1412,7 +1412,7 @@ void AdsServiceImpl::OnSaved(const ads::ResultCallback& callback,
     return;
   }
 
-  callback(success ? ads::Result::SUCCESS : ads::Result::FAILED);
+  callback(success);
 }
 
 void AdsServiceImpl::MigratePrefs() {
@@ -2047,7 +2047,7 @@ void AdsServiceImpl::LoadAdsResource(const std::string& id,
       g_brave_browser_process->resource_component()->GetPath(id, version);
 
   if (!path) {
-    callback(ads::Result::FAILED, "");
+    callback(/* success */ false, "");
     return;
   }
 

components/brave_ads/browser/ads_service_impl.h

@@ -200,10 +200,10 @@ class AdsServiceImpl : public AdsService,
 
   void OnCreate();
 
-  void OnInitialize(const int32_t result);
+  void OnInitialize(const bool success);
 
   void ShutdownBatAds();
-  void OnShutdownBatAds(const int32_t result);
+  void OnShutdownBatAds(const bool success);
 
   bool StartService();
 
@@ -212,7 +212,7 @@ class AdsServiceImpl : public AdsService,
   void Stop();
 
   void ResetState();
-  void OnShutdownAndResetBatAds(const int32_t result);
+  void OnShutdownAndResetBatAds(const bool success);
   void OnResetAllState(const bool success);
 
   void DetectUncertainFuture();
@@ -272,7 +272,7 @@ class AdsServiceImpl : public AdsService,
                           const bool success,
                           const std::string& json);
 
-  void OnRemoveAllHistory(const int32_t result);
+  void OnRemoveAllHistory(const bool success);
 
   void OnToggleAdThumbUp(OnToggleAdThumbUpCallback callback,
                          const std::string& creative_instance_id,

components/brave_ads/browser/notification_helper_android.cc

@@ -55,13 +55,15 @@ bool NotificationHelperAndroid::CanShowNativeNotifications() {
   const bool is_notification_channel_enabled =
       IsBraveAdsNotificationChannelEnabled(is_foreground);
 
-  bool result = is_notifications_enabled && is_notification_channel_enabled;
+  bool can_show_native_notifications =
+      is_notifications_enabled && is_notification_channel_enabled;
 
   if (!is_foreground) {
-    result = result && CanShowBackgroundNotifications();
+    can_show_native_notifications =
+        can_show_native_notifications && CanShowBackgroundNotifications();
   }
 
-  return result;
+  return can_show_native_notifications;
 }
 
 bool NotificationHelperAndroid::ShowMyFirstAdNotification() {

components/services/bat_ads/bat_ads_client_mojo_bridge.cc

@@ -13,17 +13,6 @@
 
 namespace bat_ads {
 
-namespace {
-
-ads::Result ToAdsResult(
-    const int32_t result) {
-  return (ads::Result)result;
-}
-
-}  // namespace
-
-///////////////////////////////////////////////////////////////////////////////
-
 BatAdsClientMojoBridge::BatAdsClientMojoBridge(
     mojo::PendingAssociatedRemote<mojom::BatAdsClient> client_info) {
   bat_ads_client_.Bind(std::move(client_info));
@@ -159,18 +148,16 @@ void BatAdsClientMojoBridge::UrlRequest(ads::mojom::UrlRequestPtr url_request,
       base::BindOnce(&OnUrlRequest, std::move(callback)));
 }
 
-void OnSave(
-    const ads::ResultCallback& callback,
-    const int32_t result) {
-  callback(ToAdsResult(result));
+void OnSave(const ads::ResultCallback& callback, const bool success) {
+  callback(success);
 }
 
 void BatAdsClientMojoBridge::Save(
     const std::string& name,
     const std::string& value,
     ads::ResultCallback callback) {
   if (!connected()) {
-    callback(ads::Result::FAILED);
+    callback(/* success */ false);
     return;
   }
 
@@ -179,16 +166,16 @@ void BatAdsClientMojoBridge::Save(
 }
 
 void OnLoadAdsResource(const ads::LoadCallback& callback,
-                       const int32_t result,
+                       const bool success,
                        const std::string& value) {
-  callback(ToAdsResult(result), value);
+  callback(success, value);
 }
 
 void BatAdsClientMojoBridge::LoadAdsResource(const std::string& id,
                                              const int version,
                                              ads::LoadCallback callback) {
   if (!connected()) {
-    callback(ads::Result::FAILED, "");
+    callback(/* success */ false, "");
     return;
   }
 
@@ -225,18 +212,17 @@ void BatAdsClientMojoBridge::RecordP2AEvent(const std::string& name,
   bat_ads_client_->RecordP2AEvent(name, type, value);
 }
 
-void OnLoad(
-    const ads::LoadCallback& callback,
-    const int32_t result,
-    const std::string& value) {
-  callback(ToAdsResult(result), value);
+void OnLoad(const ads::LoadCallback& callback,
+            const bool success,
+            const std::string& value) {
+  callback(success, value);
 }
 
 void BatAdsClientMojoBridge::Load(
     const std::string& name,
     ads::LoadCallback callback) {
   if (!connected()) {
-    callback(ads::Result::FAILED, "");
+    callback(/* success */ false, "");
     return;
   }
 

components/services/bat_ads/bat_ads_impl.cc

@@ -289,21 +289,19 @@ void BatAdsImpl::OnResourceComponentUpdated(const std::string& id) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void BatAdsImpl::OnInitialize(
-    CallbackHolder<InitializeCallback>* holder,
-    const int32_t result) {
+void BatAdsImpl::OnInitialize(CallbackHolder<InitializeCallback>* holder,
+                              const bool success) {
   if (holder->is_valid()) {
-    std::move(holder->get()).Run((ads::Result)result);
+    std::move(holder->get()).Run(success);
   }
 
   delete holder;
 }
 
-void BatAdsImpl::OnShutdown(
-    CallbackHolder<ShutdownCallback>* holder,
-    const int32_t result) {
+void BatAdsImpl::OnShutdown(CallbackHolder<ShutdownCallback>* holder,
+                            const bool success) {
   if (holder->is_valid()) {
-    std::move(holder->get()).Run((ads::Result)result);
+    std::move(holder->get()).Run(success);
   }
 
   delete holder;
@@ -323,9 +321,9 @@ void BatAdsImpl::OnGetInlineContentAd(
 
 void BatAdsImpl::OnRemoveAllHistory(
     CallbackHolder<RemoveAllHistoryCallback>* holder,
-    const int32_t result) {
+    const bool success) {
   if (holder->is_valid()) {
-    std::move(holder->get()).Run((ads::Result)result);
+    std::move(holder->get()).Run(success);
   }
 
   delete holder;

components/services/bat_ads/bat_ads_impl.h

@@ -178,36 +178,34 @@ class BatAdsImpl :
       Callback callback_;
     };
 
-  static void OnInitialize(
-      CallbackHolder<InitializeCallback>* holder,
-      const int32_t result);
-
-  static void OnShutdown(
-      CallbackHolder<ShutdownCallback>* holder,
-      const int32_t result);
-
-  static void OnGetInlineContentAd(
-      CallbackHolder<GetInlineContentAdCallback>* holder,
-      const bool success,
-      const std::string& dimensions,
-      const ads::InlineContentAdInfo& ad);
-
-  static void OnRemoveAllHistory(
-      CallbackHolder<RemoveAllHistoryCallback>* holder,
-      const int32_t result);
-
-  static void OnGetAccountStatement(
-      CallbackHolder<GetAccountStatementCallback>* holder,
-      const bool success,
-      const ads::StatementInfo& statement);
-
-  static void OnGetAdDiagnostics(
-      CallbackHolder<GetAdDiagnosticsCallback>* holder,
-      const bool success,
-      const std::string& json);
-
-  std::unique_ptr<BatAdsClientMojoBridge> bat_ads_client_mojo_proxy_;
-  std::unique_ptr<ads::Ads> ads_;
+    static void OnInitialize(CallbackHolder<InitializeCallback>* holder,
+                             const bool success);
+
+    static void OnShutdown(CallbackHolder<ShutdownCallback>* holder,
+                           const bool success);
+
+    static void OnGetInlineContentAd(
+        CallbackHolder<GetInlineContentAdCallback>* holder,
+        const bool success,
+        const std::string& dimensions,
+        const ads::InlineContentAdInfo& ad);
+
+    static void OnRemoveAllHistory(
+        CallbackHolder<RemoveAllHistoryCallback>* holder,
+        const bool success);
+
+    static void OnGetAccountStatement(
+        CallbackHolder<GetAccountStatementCallback>* holder,
+        const bool success,
+        const ads::StatementInfo& statement);
+
+    static void OnGetAdDiagnostics(
+        CallbackHolder<GetAdDiagnosticsCallback>* holder,
+        const bool success,
+        const std::string& json);
+
+    std::unique_ptr<BatAdsClientMojoBridge> bat_ads_client_mojo_proxy_;
+    std::unique_ptr<ads::Ads> ads_;
 };
 
 }  // namespace bat_ads

components/services/bat_ads/public/cpp/ads_client_mojo_bridge.cc

@@ -126,12 +126,12 @@ void AdsClientMojoBridge::Log(
 // static
 void AdsClientMojoBridge::OnLoadAdsResource(
     CallbackHolder<LoadCallback>* holder,
-    const ads::Result result,
+    const bool success,
     const std::string& value) {
   DCHECK(holder);
 
   if (holder->is_valid()) {
-    std::move(holder->get()).Run((int32_t)result, std::move(value));
+    std::move(holder->get()).Run(success, std::move(value));
   }
 
   delete holder;
@@ -180,14 +180,13 @@ void AdsClientMojoBridge::RecordP2AEvent(const std::string& name,
 }
 
 // static
-void AdsClientMojoBridge::OnLoad(
-    CallbackHolder<LoadCallback>* holder,
-    const ads::Result result,
-    const std::string& value) {
+void AdsClientMojoBridge::OnLoad(CallbackHolder<LoadCallback>* holder,
+                                 const bool success,
+                                 const std::string& value) {
   DCHECK(holder);
 
   if (holder->is_valid()) {
-    std::move(holder->get()).Run((int32_t)result, std::move(value));
+    std::move(holder->get()).Run(success, std::move(value));
   }
 
   delete holder;
@@ -204,13 +203,12 @@ void AdsClientMojoBridge::Load(
 }
 
 // static
-void AdsClientMojoBridge::OnSave(
-    CallbackHolder<SaveCallback>* holder,
-    const ads::Result result) {
+void AdsClientMojoBridge::OnSave(CallbackHolder<SaveCallback>* holder,
+                                 const bool success) {
   DCHECK(holder);
 
   if (holder->is_valid()) {
-    std::move(holder->get()).Run((int32_t)result);
+    std::move(holder->get()).Run(success);
   }
 
   delete holder;
@@ -253,7 +251,7 @@ void AdsClientMojoBridge::UrlRequest(ads::mojom::UrlRequestPtr url_request,
 void AdsClientMojoBridge::ShowNotification(
     const std::string& json) {
   ads::AdNotificationInfo ad_notification;
-  if (ad_notification.FromJson(json) != ads::Result::SUCCESS) {
+  if (!ad_notification.FromJson(json)) {
     return;
   }