remove check_includes = false for brave_rewards

browser/brave_rewards/BUILD.gn

@@ -3,8 +3,73 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+import("//extensions/buildflags/buildflags.gni")
 import("//testing/test.gni")
 
+source_set("brave_rewards") {
+  sources = [
+    "//brave/browser/brave_rewards/rewards_service_factory.h",
+    "//brave/browser/brave_rewards/rewards_tab_helper.h",
+  ]
+
+  deps = [
+    "//base",
+    "//brave/components/brave_rewards/browser",
+    "//chrome/browser/profiles",
+    "//components/keyed_service/content",
+    "//components/sessions",
+    "//content/public/browser",
+  ]
+}
+
+source_set("brave_rewards_impl") {
+  sources = [
+    "//brave/browser/brave_rewards/rewards_prefs_util.cc",
+    "//brave/browser/brave_rewards/rewards_prefs_util.h",
+    "//brave/browser/brave_rewards/rewards_service_factory.cc",
+    "//brave/browser/brave_rewards/rewards_tab_helper.cc",
+  ]
+
+  public_deps = [ ":brave_rewards" ]
+
+  deps = [
+    ":util",
+    "//base",
+    "//brave/browser/brave_wallet",
+    "//brave/browser/greaselion",
+    "//brave/browser/ui:brave_rewards_source",
+    "//brave/components/brave_rewards/browser",
+    "//brave/components/brave_rewards/common",
+    "//brave/components/greaselion/browser/buildflags",
+    "//chrome/browser/bitmap_fetcher",
+    "//chrome/browser/favicon",
+    "//chrome/browser/profiles",
+    "//chrome/browser/ui",
+    "//components/keyed_service/content",
+    "//components/prefs",
+    "//components/sessions",
+    "//extensions/buildflags",
+  ]
+
+  if (is_android) {
+    sources += [
+      "//brave/browser/brave_rewards/android/brave_rewards_native_worker.cc",
+      "//brave/browser/brave_rewards/android/brave_rewards_native_worker.h",
+    ]
+  }
+
+  if (enable_extensions) {
+    sources += [
+      "extension_rewards_notification_service_observer.cc",
+      "extension_rewards_notification_service_observer.h",
+      "extension_rewards_service_observer.cc",
+      "extension_rewards_service_observer.h",
+    ]
+
+    deps += [ "//extensions/browser" ]
+  }
+}
+
 source_set("util") {
   sources = [
     "rewards_util.cc",

browser/brave_rewards/android/brave_rewards_native_worker.cc

@@ -5,37 +5,19 @@
 
 #include "brave/browser/brave_rewards/android/brave_rewards_native_worker.h"
 
-#include <iomanip>
-#include <string>
-#include <vector>
 #include <utility>
 
-#include "base/android/jni_android.h"
-#include "base/android/jni_array.h"
-#include "base/android/jni_string.h"
 #include "base/containers/contains.h"
-#include "base/containers/flat_map.h"
-#include "base/feature_list.h"
-#include "base/json/json_writer.h"
-#include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "brave/browser/brave_ads/ads_service_factory.h"
 #include "brave/browser/brave_rewards/rewards_service_factory.h"
 #include "brave/build/android/jni_headers/BraveRewardsNativeWorker_jni.h"
-#include "brave/components/brave_adaptive_captcha/brave_adaptive_captcha_service.h"
 #include "brave/components/brave_adaptive_captcha/server_util.h"
-#include "brave/components/brave_ads/browser/ads_service.h"
-#include "brave/components/brave_ads/core/public/prefs/pref_names.h"
-#include "brave/components/brave_rewards/browser/rewards_p3a.h"
 #include "brave/components/brave_rewards/browser/rewards_service.h"
-#include "brave/components/brave_rewards/common/features.h"
-#include "brave/components/brave_rewards/common/pref_names.h"
 #include "brave/components/brave_rewards/common/rewards_util.h"
 #include "brave/components/brave_rewards/core/global_constants.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "components/prefs/pref_service.h"
-#include "content/public/browser/url_data_source.h"
 
 #define DEFAULT_ADS_PER_HOUR 2
 

browser/brave_rewards/extension_rewards_notification_service_observer.h

@@ -8,7 +8,6 @@
 
 #include "base/memory/raw_ptr.h"
 #include "brave/components/brave_rewards/browser/rewards_notification_service_observer.h"
-#include "brave/components/brave_rewards/common/mojom/rewards.mojom.h"
 
 class Profile;
 

browser/brave_rewards/rewards_service_factory.cc

@@ -11,17 +11,18 @@
 #include "base/no_destructor.h"
 #include "brave/browser/brave_rewards/rewards_util.h"
 #include "brave/browser/brave_wallet/brave_wallet_service_factory.h"
+#include "brave/browser/ui/webui/brave_rewards_source.h"
 #include "brave/components/brave_rewards/browser/rewards_notification_service_observer.h"
 #include "brave/components/brave_rewards/browser/rewards_service.h"
 #include "brave/components/brave_rewards/browser/rewards_service_impl.h"
 #include "brave/components/brave_rewards/browser/rewards_service_observer.h"
 #include "brave/components/greaselion/browser/buildflags/buildflags.h"
-#include "chrome/browser/browser_process.h"
+#include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h"
+#include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_manager.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
-#include "components/prefs/pref_service.h"
+#include "content/public/browser/storage_partition.h"
 #include "extensions/buildflags/buildflags.h"
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -32,7 +33,6 @@
 
 #if BUILDFLAG(ENABLE_GREASELION)
 #include "brave/browser/greaselion/greaselion_service_factory.h"
-#include "brave/components/greaselion/browser/greaselion_service.h"
 #endif
 
 namespace brave_rewards {
@@ -77,25 +77,26 @@ KeyedService* RewardsServiceFactory::BuildServiceInstanceFor(
   std::unique_ptr<RewardsServiceObserver> extension_observer = nullptr;
   std::unique_ptr<RewardsNotificationServiceObserver> notification_observer =
       nullptr;
+  auto* profile = Profile::FromBrowserContext(context);
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-  extension_observer = std::make_unique<ExtensionRewardsServiceObserver>(
-      Profile::FromBrowserContext(context));
+  extension_observer =
+      std::make_unique<ExtensionRewardsServiceObserver>(profile);
   notification_observer =
-      std::make_unique<ExtensionRewardsNotificationServiceObserver>(
-          Profile::FromBrowserContext(context));
+      std::make_unique<ExtensionRewardsNotificationServiceObserver>(profile);
 #endif
-  auto* brave_wallet_service =
-      brave_wallet::BraveWalletServiceFactory::GetServiceForContext(context);
-#if BUILDFLAG(ENABLE_GREASELION)
-  greaselion::GreaselionService* greaselion_service =
-      greaselion::GreaselionServiceFactory::GetForBrowserContext(context);
-  std::unique_ptr<RewardsServiceImpl> rewards_service(
-      new RewardsServiceImpl(Profile::FromBrowserContext(context),
-                             greaselion_service, brave_wallet_service));
-#else
+  // Set up the rewards data source
+  content::URLDataSource::Add(profile,
+                              std::make_unique<BraveRewardsSource>(profile));
   std::unique_ptr<RewardsServiceImpl> rewards_service(new RewardsServiceImpl(
-      Profile::FromBrowserContext(context), brave_wallet_service));
+      profile->GetPrefs(), profile->GetPath(),
+      FaviconServiceFactory::GetForProfile(profile,
+                                           ServiceAccessType::EXPLICIT_ACCESS),
+      BitmapFetcherServiceFactory::GetForBrowserContext(profile),
+      profile->GetDefaultStoragePartition(),
+#if BUILDFLAG(ENABLE_GREASELION)
+      greaselion::GreaselionServiceFactory::GetForBrowserContext(context),
 #endif
+      brave_wallet::BraveWalletServiceFactory::GetServiceForContext(context)));
   rewards_service->Init(std::move(extension_observer),
                         std::move(notification_observer));
   return rewards_service.release();

browser/brave_rewards/rewards_tab_helper.cc

@@ -21,14 +21,36 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #endif
 
 namespace brave_rewards {
 
+#if !BUILDFLAG(IS_ANDROID)
+class BraveBrowserListObserver : public BrowserListObserver {
+ public:
+  explicit BraveBrowserListObserver(RewardsTabHelper* tab_helper)
+      : tab_helper_(tab_helper) {}
+  ~BraveBrowserListObserver() override {}
+  void OnBrowserSetLastActive(Browser* browser) override {
+    tab_helper_->OnBrowserSetLastActive(browser);
+  }
+  void OnBrowserNoLongerActive(Browser* browser) override {
+    tab_helper_->OnBrowserNoLongerActive(browser);
+  }
+
+ private:
+  raw_ptr<RewardsTabHelper> tab_helper_;  // Not owned.
+};
+#endif
+
 RewardsTabHelper::RewardsTabHelper(content::WebContents* web_contents)
     : content::WebContentsUserData<RewardsTabHelper>(*web_contents),
       WebContentsObserver(web_contents),
+#if !BUILDFLAG(IS_ANDROID)
+      browser_list_observer_(new BraveBrowserListObserver(this)),
+#endif
       tab_id_(sessions::SessionTabHelper::IdForTab(web_contents)) {
   if (tab_id_.is_valid()) {
     rewards_service_ = RewardsServiceFactory::GetForProfile(
@@ -40,7 +62,7 @@ RewardsTabHelper::RewardsTabHelper(content::WebContents* web_contents)
   }
 
 #if !BUILDFLAG(IS_ANDROID)
-  BrowserList::AddObserver(this);
+  BrowserList::AddObserver(browser_list_observer_.get());
 #endif
 }
 
@@ -49,7 +71,7 @@ RewardsTabHelper::~RewardsTabHelper() {
     rewards_service_->RemoveObserver(this);
   }
 #if !BUILDFLAG(IS_ANDROID)
-  BrowserList::RemoveObserver(this);
+  BrowserList::RemoveObserver(browser_list_observer_.get());
 #endif
 }
 

browser/brave_rewards/rewards_tab_helper.h

@@ -1,11 +1,12 @@
 /* Copyright (c) 2019 The Brave Authors. All rights reserved.
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #ifndef BRAVE_BROWSER_BRAVE_REWARDS_REWARDS_TAB_HELPER_H_
 #define BRAVE_BROWSER_BRAVE_REWARDS_REWARDS_TAB_HELPER_H_
 
+#include <memory>
 #include <string>
 
 #include "base/memory/raw_ptr.h"
@@ -18,24 +19,18 @@
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
-#if !BUILDFLAG(IS_ANDROID)
-#include "chrome/browser/ui/browser_list_observer.h"
-#endif
-
 class Browser;
+class BrowserListObserver;
 
 namespace brave_rewards {
-
 class RewardsService;
+class BraveBrowserListObserver;
 
 // A tab helper responsible for sending user-activity events to the Rewards
-// engine in order to support the Auto Contribute feature, and for storing the
-// publisher ID corresponding to a given tab.
+// engine in order to support the Auto Contribute feature, and for storing
+// the publisher ID corresponding to a given tab.
 class RewardsTabHelper : public content::WebContentsUserData<RewardsTabHelper>,
                          public content::WebContentsObserver,
-#if !BUILDFLAG(IS_ANDROID)
-                         public BrowserListObserver,
-#endif
                          public RewardsServiceObserver {
  public:
   RewardsTabHelper(const RewardsTabHelper&) = delete;
@@ -52,16 +47,18 @@ class RewardsTabHelper : public content::WebContentsUserData<RewardsTabHelper>,
   using Observation = base::ScopedObservation<RewardsTabHelper, Observer>;
 
   // Returns the publisher ID associated with the web content loaded into this
-  // tab. The publisher ID does not necessarily refer to a registered publisher.
+  // tab. The publisher ID does not necessarily refer to a registered
+  // publisher.
   std::string GetPublisherIdForTab() { return publisher_id_; }
 
-  // Sets the publisher ID associated with the web content loaded into this tab.
-  // This method can be used to override the default publisher ID as determined
-  // by the current domain.
+  // Sets the publisher ID associated with the web content loaded into this
+  // tab. This method can be used to override the default publisher ID as
+  // determined by the current domain.
   void SetPublisherIdForTab(const std::string& publisher_id);
 
  private:
   friend class content::WebContentsUserData<RewardsTabHelper>;
+  friend class brave_rewards::BraveBrowserListObserver;
 
   explicit RewardsTabHelper(content::WebContents* web_contents);
 
@@ -78,10 +75,8 @@ class RewardsTabHelper : public content::WebContentsUserData<RewardsTabHelper>,
   void WebContentsDestroyed() override;
 
 #if !BUILDFLAG(IS_ANDROID)
-  // BrowserListObserver:
-  void OnBrowserSetLastActive(Browser* browser) override;
-  void OnBrowserNoLongerActive(Browser* browser) override;
-
+  void OnBrowserSetLastActive(Browser* browser);
+  void OnBrowserNoLongerActive(Browser* browser);
   bool BrowserHasWebContents(Browser* browser);
 #endif
 
@@ -90,6 +85,7 @@ class RewardsTabHelper : public content::WebContentsUserData<RewardsTabHelper>,
 
   void MaybeSavePublisherInfo();
 
+  std::unique_ptr<BrowserListObserver> browser_list_observer_;
   SessionID tab_id_;
   raw_ptr<RewardsService> rewards_service_ = nullptr;  // NOT OWNED
   base::ObserverList<Observer> observer_list_;