Fixes no ads enable alert, ads are enabled by default when upgrading …

…build from 0.62.51 to 0.67.119 Fixes brave/brave-browser#5434
brave · Aug 2, 2019 · e3154c5 · e3154c5
1 parent ab1394a
commit e3154c5
Show file tree

Hide file tree

Showing 6 changed files with 285 additions and 107 deletions.
diff --git a/components/brave_ads/browser/ads_service_factory.cc b/components/brave_ads/browser/ads_service_factory.cc
@@ -83,13 +83,7 @@ bool AdsServiceFactory::ServiceIsNULLWhileTesting() const {
 
 void AdsServiceFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
-  if (ShouldMigratePrefs(registry)) {
-    // prefs::kVersion should default to 1 for legacy installations so that
-    // preferences are migrated from version 1 to the current version
-    registry->RegisterIntegerPref(prefs::kVersion, 1);
-  } else {
-    registry->RegisterIntegerPref(prefs::kVersion, 2);
-  }
+  registry->RegisterIntegerPref(prefs::kVersion, prefs::kCurrentVersionNumber);
 
   registry->RegisterBooleanPref(prefs::kEnabled, false);
 
@@ -113,18 +107,4 @@ void AdsServiceFactory::RegisterProfilePrefs(
       prefs::kLastShownFirstLaunchNotificationTimestamp, 0);
 }
 
-bool AdsServiceFactory::ShouldMigratePrefs(
-    user_prefs::PrefRegistrySyncable* registry) const {
-  // If prefs::kEnabled does not exist then this must be a fresh installion so
-  // we do not need to migrate
-  auto pref_store = registry->defaults();
-
-  const base::Value* value = nullptr;
-  if (!pref_store->GetValue(prefs::kEnabled, &value)) {
-    return false;
-  }
-
-  return true;
-}
-
 }  // namespace brave_ads
diff --git a/components/brave_ads/browser/ads_service_factory.h b/components/brave_ads/browser/ads_service_factory.h
@@ -36,7 +36,6 @@ class AdsServiceFactory : public BrowserContextKeyedServiceFactory {
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
   bool ServiceIsNULLWhileTesting() const override;
-  bool ShouldMigratePrefs(user_prefs::PrefRegistrySyncable* registry) const;
 
   DISALLOW_COPY_AND_ASSIGN(AdsServiceFactory);
 };