Merge pull request #6607 from /issues/11223-1.15.x

Fixes Brave Rewards service is associated to Tor Profiles - 1.15.x
brave · Sep 10, 2020 · 1e16e0f · 1e16e0f
2 parents 5b0a155 + 345fd7f
commit 1e16e0f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 22 deletions.
diff --git a/browser/brave_rewards/rewards_service_factory.cc b/browser/brave_rewards/rewards_service_factory.cc
@@ -9,6 +9,7 @@
 #include "brave/browser/brave_rewards/rewards_service_factory.h"
 
 #include "brave/browser/profiles/brave_profile_manager.h"
+#include "brave/browser/profiles/profile_util.h"
 #include "brave/components/brave_rewards/browser/buildflags/buildflags.h"
 #include "brave/components/brave_rewards/browser/rewards_service.h"
 #include "brave/components/brave_rewards/common/pref_names.h"
@@ -65,6 +66,10 @@ RewardsService* RewardsServiceFactory::GetForProfile(
     return testing_service_;
   }
 
+  if (profile->IsOffTheRecord() || brave::IsTorProfile(profile)) {
+    return nullptr;
+  }
+
   return static_cast<RewardsService*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
@@ -124,7 +129,7 @@ KeyedService* RewardsServiceFactory::BuildServiceInstanceFor(
                         std::move(notification_observer));
   return rewards_service.release();
 #else
-  return NULL;
+  return nullptr;
 #endif
 }
 

diff --git a/browser/brave_rewards/rewards_service_factory.h b/browser/brave_rewards/rewards_service_factory.h
@@ -17,11 +17,13 @@ class Profile;
 namespace brave_rewards {
 class RewardsService;
 
-// Singleton that owns all RewardsService and associates them with
-// Profiles.
+// Singleton that owns all RewardsService and associates them with Profiles.
 class RewardsServiceFactory : public BrowserContextKeyedServiceFactory,
                               public content::NotificationObserver {
  public:
+  RewardsServiceFactory(const RewardsServiceFactory&) = delete;
+  RewardsServiceFactory& operator=(const RewardsServiceFactory&) = delete;
+
   static brave_rewards::RewardsService* GetForProfile(Profile* profile);
 
   static RewardsServiceFactory* GetInstance();
@@ -45,8 +47,6 @@ class RewardsServiceFactory : public BrowserContextKeyedServiceFactory,
                const content::NotificationDetails& details) override;
 
   content::NotificationRegistrar registrar_;
-
-  DISALLOW_COPY_AND_ASSIGN(RewardsServiceFactory);
 };
 
 }  // namespace brave_rewards

diff --git a/components/brave_ads/browser/ads_service_factory.cc b/components/brave_ads/browser/ads_service_factory.cc
@@ -69,16 +69,6 @@ KeyedService* AdsServiceFactory::BuildServiceInstanceFor(
 #endif
 }
 
-content::BrowserContext* AdsServiceFactory::GetBrowserContextToUse(
-    content::BrowserContext* context) const {
-  if (context->IsOffTheRecord() || brave::IsTorProfile(context)) {
-    return chrome::GetBrowserContextOwnInstanceInIncognito(context);
-  }
-
-  // use original profile for session profiles
-  return chrome::GetBrowserContextRedirectedInIncognito(context);
-}
-
 bool AdsServiceFactory::ServiceIsNULLWhileTesting() const {
   return false;
 }

diff --git a/components/brave_ads/browser/ads_service_factory.h b/components/brave_ads/browser/ads_service_factory.h
@@ -36,8 +36,6 @@ class AdsServiceFactory : public BrowserContextKeyedServiceFactory {
   // BrowserContextKeyedServiceFactory:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
-  content::BrowserContext* GetBrowserContextToUse(
-      content::BrowserContext* context) const override;
   bool ServiceIsNULLWhileTesting() const override;
 };
 

diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc
@@ -2168,10 +2168,6 @@ void RewardsServiceImpl::DiagnosticLog(
     return;
   }
 
-  if (profile_->IsOffTheRecord()) {
-    return;
-  }
-
   if (verbose_level > kDiagnosticLogMaxVerboseLevel) {
     return;
   }
@@ -2189,7 +2185,6 @@ void RewardsServiceImpl::DiagnosticLog(
           AsWeakPtr()));
 }
 
-
 bool RewardsServiceImpl::WriteToDiagnosticLogOnFileTaskRunner(
     const base::FilePath& log_path,
     const int num_lines,