Add rewards parity with browser laptop

DEPS

@@ -10,7 +10,7 @@ deps = {
   "vendor/boto": "https://github.com/boto/boto@f7574aa6cc2c819430c1f05e9a1a1a666ef8169b",
   "vendor/python-patch": "https://github.com/svn2github/python-patch@a336a458016ced89aba90dfc3f4c8222ae3b1403",
   "vendor/sparkle": "https://github.com/brave/Sparkle.git@c0759cce415d7c0feae45005c8a013b1898711f0",
-  "vendor/bat-native-ledger": "https://github.com/brave-intl/bat-native-ledger@123d1dec129528390eaf583d04e5dc2b6c426713",
+  "vendor/bat-native-ledger": "https://github.com/brave-intl/bat-native-ledger@65b9ec93925f3b99c4bd12282053bdbe011168c9",
   "vendor/bat-native-rapidjson": "https://github.com/brave-intl/bat-native-rapidjson.git@86aafe2ef89835ae71c9ed7c2527e3bb3000930e",
   "vendor/bip39wally-core-native": "https://github.com/brave-intl/bip39wally-core-native.git@9b119931c702d55be994117eb505d56310720b1d",
   "vendor/bat-native-anonize": "https://github.com/brave-intl/bat-native-anonize.git@6f5817c5a4dcabb49e22b578ecae4993159e6481",

browser/BUILD.gn

@@ -57,7 +57,7 @@ source_set("browser_process") {
 
   deps = [
     ":version_info",
-    "//brave/browser/payments",
+    "//brave/components/brave_rewards/browser",
     "//brave/components/brave_shields/browser:brave_shields",
     "//brave/components/content_settings/core/browser",
     "//brave/common",

browser/brave_tab_helpers.cc

@@ -4,18 +4,21 @@
 
 #include "brave/browser/brave_tab_helpers.h"
 
-#include "brave/browser/payments/buildflags/buildflags.h"
-#include "brave/browser/payments/payments_helper.h"
+#include "brave/components/brave_rewards/browser/buildflags/buildflags.h"
 #include "brave/components/brave_shields/browser/brave_shields_web_contents_observer.h"
 #include "content/public/browser/web_contents.h"
 
+#if BUILDFLAG(BRAVE_REWARDS_ENABLED)
+#include "brave/components/brave_rewards/browser/rewards_helper.h"
+#endif
+
 namespace brave {
 
 void AttachTabHelpers(content::WebContents* web_contents) {
   brave_shields::BraveShieldsWebContentsObserver::CreateForWebContents(
       web_contents);
-#if BUILDFLAG(BRAVE_PAYMENTS_ENABLED)
-  payments::PaymentsHelper::CreateForWebContents(web_contents);
+#if BUILDFLAG(BRAVE_REWARDS_ENABLED)
+  brave_rewards::RewardsHelper::CreateForWebContents(web_contents);
 #endif
 }
 

browser/browser_context_keyed_service_factories.cc

@@ -4,12 +4,12 @@
 
 #include "brave/browser/browser_context_keyed_service_factories.h"
 
-#include "brave/browser/payments/payments_service_factory.h"
+#include "brave/components/brave_rewards/browser/rewards_service_factory.h"
 
 namespace brave {
 
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
-  PaymentsServiceFactory::GetInstance();
+  brave_rewards::RewardsServiceFactory::GetInstance();
 }
 
 }  // namespace brave

browser/net/brave_network_delegate_base.cc

@@ -69,6 +69,10 @@ void BraveNetworkDelegateBase::RunNextCallback(
     return;
   }
 
+  if (request->status().status() == net::URLRequestStatus::CANCELED) {
+    return;
+  }
+
   // Continue processing callbacks until we hit one that returns PENDING
   int rv = net::OK;
 

browser/net/brave_profile_network_delegate.cc

@@ -6,6 +6,7 @@
 
 #include "brave/browser/net/brave_httpse_network_delegate_helper.h"
 #include "brave/browser/net/brave_site_hacks_network_delegate_helper.h"
+#include "brave/components/brave_rewards/browser/net/network_delegate_helper.h"
 
 BraveProfileNetworkDelegate::BraveProfileNetworkDelegate(
     extensions::EventRouterForwarder* event_router) :
@@ -20,6 +21,9 @@ BraveProfileNetworkDelegate::BraveProfileNetworkDelegate(
           brave::OnBeforeURLRequest_HttpsePreFileWork);
   before_url_request_callbacks_.push_back(callback);
 
+  callback = base::Bind(brave_rewards::OnBeforeURLRequest);
+  before_url_request_callbacks_.push_back(callback);
+
   brave::OnBeforeStartTransactionCallback start_transactions_callback =
       base::Bind(
           brave::OnBeforeStartTransaction_SiteHacksWork);