Adopt base::NoDestructor for KeyedService factories

For changes under /chrome/browser/profiles It replaces base::Singleton, following the latest recommendation in base/ and browser_context_keyed_service_factory.h. For factories with a trivial destructor, it makes no difference. LSC doc: https://docs.google.com/document/d/1x1LqRQyfBOmpMkNQBYs7QBPSxLtuiImvmgcJYI_kaS4/edit?usp=sharing This CL was uploaded by git cl split. R=droger@chromium.org Bug: 925323 Change-Id: I4fcfc6e86ca9f68cf56eaa51d8b15f963bd7d4d7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4572805 Auto-Submit: Mikel Astiz <mastiz@chromium.org> Commit-Queue: David Roger <droger@chromium.org> Reviewed-by: David Roger <droger@chromium.org> Cr-Commit-Position: refs/heads/main@{#1150437}
chromium · May 30, 2023 · 46b43cb · 46b43cb
1 parent 18a306e
commit 46b43cb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/chrome/browser/profiles/gaia_info_update_service_factory.cc b/chrome/browser/profiles/gaia_info_update_service_factory.cc
@@ -25,7 +25,7 @@ GAIAInfoUpdateServiceFactory::GAIAInfoUpdateServiceFactory()
   DependsOn(IdentityManagerFactory::GetInstance());
 }
 
-GAIAInfoUpdateServiceFactory::~GAIAInfoUpdateServiceFactory() {}
+GAIAInfoUpdateServiceFactory::~GAIAInfoUpdateServiceFactory() = default;
 
 // static
 GAIAInfoUpdateService* GAIAInfoUpdateServiceFactory::GetForProfile(
@@ -36,7 +36,8 @@ GAIAInfoUpdateService* GAIAInfoUpdateServiceFactory::GetForProfile(
 
 // static
 GAIAInfoUpdateServiceFactory* GAIAInfoUpdateServiceFactory::GetInstance() {
-  return base::Singleton<GAIAInfoUpdateServiceFactory>::get();
+  static base::NoDestructor<GAIAInfoUpdateServiceFactory> instance;
+  return instance.get();
 }
 
 KeyedService* GAIAInfoUpdateServiceFactory::BuildServiceInstanceFor(

diff --git a/chrome/browser/profiles/gaia_info_update_service_factory.h b/chrome/browser/profiles/gaia_info_update_service_factory.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_PROFILES_GAIA_INFO_UPDATE_SERVICE_FACTORY_H_
 #define CHROME_BROWSER_PROFILES_GAIA_INFO_UPDATE_SERVICE_FACTORY_H_
 
-#include "base/memory/singleton.h"
+#include "base/no_destructor.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 
 class GAIAInfoUpdateService;
@@ -29,7 +29,7 @@ class GAIAInfoUpdateServiceFactory : public ProfileKeyedServiceFactory {
       delete;
 
  private:
-  friend struct base::DefaultSingletonTraits<GAIAInfoUpdateServiceFactory>;
+  friend base::NoDestructor<GAIAInfoUpdateServiceFactory>;
 
   GAIAInfoUpdateServiceFactory();
   ~GAIAInfoUpdateServiceFactory() override;

diff --git a/chrome/browser/profiles/profile_statistics_factory.cc b/chrome/browser/profiles/profile_statistics_factory.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/profiles/profile_statistics_factory.h"
 
-#include "base/memory/singleton.h"
+#include "base/no_destructor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_statistics.h"
 #include "content/public/browser/browser_thread.h"
@@ -17,7 +17,8 @@ ProfileStatistics* ProfileStatisticsFactory::GetForProfile(Profile* profile) {
 
 // static
 ProfileStatisticsFactory* ProfileStatisticsFactory::GetInstance() {
-  return base::Singleton<ProfileStatisticsFactory>::get();
+  static base::NoDestructor<ProfileStatisticsFactory> instance;
+  return instance.get();
 }
 
 ProfileStatisticsFactory::ProfileStatisticsFactory()

diff --git a/chrome/browser/profiles/profile_statistics_factory.h b/chrome/browser/profiles/profile_statistics_factory.h
@@ -8,7 +8,8 @@
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 
 namespace base {
-template <typename T> struct DefaultSingletonTraits;
+template <typename T>
+class NoDestructor;
 }
 
 class Profile;
@@ -24,7 +25,7 @@ class ProfileStatisticsFactory : public ProfileKeyedServiceFactory {
   static ProfileStatisticsFactory* GetInstance();
 
  private:
-  friend struct base::DefaultSingletonTraits<ProfileStatisticsFactory>;
+  friend base::NoDestructor<ProfileStatisticsFactory>;
 
   ProfileStatisticsFactory();
 

diff --git a/chrome/browser/profiles/renderer_updater_factory.cc b/chrome/browser/profiles/renderer_updater_factory.cc
@@ -29,11 +29,12 @@ RendererUpdaterFactory::RendererUpdaterFactory()
 #endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
 }
 
-RendererUpdaterFactory::~RendererUpdaterFactory() {}
+RendererUpdaterFactory::~RendererUpdaterFactory() = default;
 
 // static
 RendererUpdaterFactory* RendererUpdaterFactory::GetInstance() {
-  return base::Singleton<RendererUpdaterFactory>::get();
+  static base::NoDestructor<RendererUpdaterFactory> instance;
+  return instance.get();
 }
 
 // static

diff --git a/chrome/browser/profiles/renderer_updater_factory.h b/chrome/browser/profiles/renderer_updater_factory.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_PROFILES_RENDERER_UPDATER_FACTORY_H_
 #define CHROME_BROWSER_PROFILES_RENDERER_UPDATER_FACTORY_H_
 
-#include "base/memory/singleton.h"
+#include "base/no_destructor.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 
 class Profile;
@@ -31,7 +31,7 @@ class RendererUpdaterFactory : public ProfileKeyedServiceFactory {
   bool ServiceIsCreatedWithBrowserContext() const override;
 
  private:
-  friend struct base::DefaultSingletonTraits<RendererUpdaterFactory>;
+  friend base::NoDestructor<RendererUpdaterFactory>;
 
   RendererUpdaterFactory();
   ~RendererUpdaterFactory() override;