mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: prefer using base::NoDestructor to base::{Singleton,LazyInstance} (#41424)

Browse source 
refactor: prefer using base::NoDestructor to base::{Singleton,LazyInstance}

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot] 2024-02-28 11:38:49 +09:00 • committed by GitHub
commit 7331e5dfb1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 44 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
shell/browser/badging/badge_manager_factory.cc
View file

@ -21,7 +21,8 @@ BadgeManager* BadgeManagerFactory::GetForBrowserContext(
// static // static
BadgeManagerFactory* BadgeManagerFactory::GetInstance() { BadgeManagerFactory* BadgeManagerFactory::GetInstance() {
return base::Singleton<BadgeManagerFactory>::get(); static base::NoDestructor<BadgeManagerFactory> instance;
return instance.get();
} }
BadgeManagerFactory::BadgeManagerFactory() BadgeManagerFactory::BadgeManagerFactory()

4
shell/browser/badging/badge_manager_factory.h
View file

@ -9,7 +9,7 @@
namespace base { namespace base {
template <typename T> template <typename T>
struct DefaultSingletonTraits; class NoDestructor;
} }
namespace badging { namespace badging {
@ -30,7 +30,7 @@ class BadgeManagerFactory : public BrowserContextKeyedServiceFactory {
BadgeManagerFactory& operator=(const BadgeManagerFactory&) = delete; BadgeManagerFactory& operator=(const BadgeManagerFactory&) = delete;
private: private:
friend struct base::DefaultSingletonTraits<BadgeManagerFactory>; friend base::NoDestructor<BadgeManagerFactory>;
BadgeManagerFactory(); BadgeManagerFactory();
~BadgeManagerFactory() override; ~BadgeManagerFactory() override;

4
shell/browser/extensions/electron_extension_system_factory.cc
View file

@ -4,6 +4,7 @@
#include "shell/browser/extensions/electron_extension_system_factory.h" #include "shell/browser/extensions/electron_extension_system_factory.h"
#include "base/no_destructor.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "extensions/browser/extension_prefs_factory.h" #include "extensions/browser/extension_prefs_factory.h"
#include "extensions/browser/extension_registry_factory.h" #include "extensions/browser/extension_registry_factory.h"
@ -21,7 +22,8 @@ ExtensionSystem* ElectronExtensionSystemFactory::GetForBrowserContext(
// static // static
ElectronExtensionSystemFactory* ElectronExtensionSystemFactory::GetInstance() { ElectronExtensionSystemFactory* ElectronExtensionSystemFactory::GetInstance() {
return base::Singleton<ElectronExtensionSystemFactory>::get(); static base::NoDestructor<ElectronExtensionSystemFactory> instance;
return instance.get();
} }
ElectronExtensionSystemFactory::ElectronExtensionSystemFactory() ElectronExtensionSystemFactory::ElectronExtensionSystemFactory()

8
shell/browser/extensions/electron_extension_system_factory.h
View file

@ -5,9 +5,13 @@
#ifndef ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSION_SYSTEM_FACTORY_H_ #ifndef ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSION_SYSTEM_FACTORY_H_
#define ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSION_SYSTEM_FACTORY_H_ #define ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSION_SYSTEM_FACTORY_H_
#include "base/memory/singleton.h"
#include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extension_system_provider.h"
namespace base {
template <typename T>
class NoDestructor;
} // namespace base
namespace extensions { namespace extensions {
// A factory that provides ElectronExtensionSystem. // A factory that provides ElectronExtensionSystem.
@ -26,7 +30,7 @@ class ElectronExtensionSystemFactory : public ExtensionSystemProvider {
const ElectronExtensionSystemFactory&) = delete; const ElectronExtensionSystemFactory&) = delete;
private: private:
friend struct base::DefaultSingletonTraits<ElectronExtensionSystemFactory>; friend base::NoDestructor<ElectronExtensionSystemFactory>;
ElectronExtensionSystemFactory(); ElectronExtensionSystemFactory();
~ElectronExtensionSystemFactory() override; ~ElectronExtensionSystemFactory() override;

5
shell/browser/media/media_capture_devices_dispatcher.cc
View file

@ -3,7 +3,7 @@
// found in the LICENSE-CHROMIUM file. // found in the LICENSE-CHROMIUM file.
#include "shell/browser/media/media_capture_devices_dispatcher.h" #include "shell/browser/media/media_capture_devices_dispatcher.h"
// #include "base/no_destructor.h"
#include "base/logging.h" #include "base/logging.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/media_capture_devices.h" #include "content/public/browser/media_capture_devices.h"
@ -13,7 +13,8 @@ using content::BrowserThread;
namespace electron { namespace electron {
MediaCaptureDevicesDispatcher* MediaCaptureDevicesDispatcher::GetInstance() { MediaCaptureDevicesDispatcher* MediaCaptureDevicesDispatcher::GetInstance() {
return base::Singleton<MediaCaptureDevicesDispatcher>::get(); static base::NoDestructor<MediaCaptureDevicesDispatcher> instance;
return instance.get();
} }
MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher() { MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher() {

3
shell/browser/media/media_capture_devices_dispatcher.h
View file

@ -5,7 +5,6 @@
#ifndef ELECTRON_SHELL_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_ #ifndef ELECTRON_SHELL_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
#define ELECTRON_SHELL_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_ #define ELECTRON_SHELL_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
#include "base/memory/singleton.h"
#include "components/webrtc/media_stream_device_enumerator_impl.h" #include "components/webrtc/media_stream_device_enumerator_impl.h"
#include "content/public/browser/media_observer.h" #include "content/public/browser/media_observer.h"
#include "content/public/browser/media_stream_request.h" #include "content/public/browser/media_stream_request.h"
@ -45,7 +44,7 @@ class MediaCaptureDevicesDispatcher
const MediaCaptureDevicesDispatcher&) = delete; const MediaCaptureDevicesDispatcher&) = delete;
private: private:
friend struct base::DefaultSingletonTraits<MediaCaptureDevicesDispatcher>; friend base::NoDestructor<MediaCaptureDevicesDispatcher>;
MediaCaptureDevicesDispatcher(); MediaCaptureDevicesDispatcher();
~MediaCaptureDevicesDispatcher() override; ~MediaCaptureDevicesDispatcher() override;

4
shell/browser/net/network_context_service_factory.cc
View file

@ -4,6 +4,7 @@
#include "shell/browser/net/network_context_service_factory.h" #include "shell/browser/net/network_context_service_factory.h"
#include "base/no_destructor.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "shell/browser/net/network_context_service.h" #include "shell/browser/net/network_context_service.h"
@ -16,7 +17,8 @@ NetworkContextService* NetworkContextServiceFactory::GetForContext(
} }
NetworkContextServiceFactory* NetworkContextServiceFactory::GetInstance() { NetworkContextServiceFactory* NetworkContextServiceFactory::GetInstance() {
return base::Singleton<NetworkContextServiceFactory>::get(); static base::NoDestructor<NetworkContextServiceFactory> instance;
return instance.get();
} }
NetworkContextServiceFactory::NetworkContextServiceFactory() NetworkContextServiceFactory::NetworkContextServiceFactory()

7
shell/browser/net/network_context_service_factory.h
View file

@ -14,6 +14,11 @@ namespace content {
class BrowserContext; class BrowserContext;
} }
namespace base {
template <typename T>
class NoDestructor;
}
namespace electron { namespace electron {
class NetworkContextService; class NetworkContextService;
@ -33,7 +38,7 @@ class NetworkContextServiceFactory : public BrowserContextKeyedServiceFactory {
delete; delete;
private: private:
friend struct base::DefaultSingletonTraits<NetworkContextServiceFactory>; friend base::NoDestructor<NetworkContextServiceFactory>;
NetworkContextServiceFactory(); NetworkContextServiceFactory();
~NetworkContextServiceFactory() override; ~NetworkContextServiceFactory() override;

4
shell/browser/serial/serial_chooser_context_factory.cc
View file

@ -4,6 +4,7 @@
#include "shell/browser/serial/serial_chooser_context_factory.h" #include "shell/browser/serial/serial_chooser_context_factory.h"
#include "base/no_destructor.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "shell/browser/electron_browser_context.h" #include "shell/browser/electron_browser_context.h"
#include "shell/browser/serial/serial_chooser_context.h" #include "shell/browser/serial/serial_chooser_context.h"
@ -26,7 +27,8 @@ KeyedService* SerialChooserContextFactory::BuildServiceInstanceFor(
// static // static
SerialChooserContextFactory* SerialChooserContextFactory::GetInstance() { SerialChooserContextFactory* SerialChooserContextFactory::GetInstance() {
return base::Singleton<SerialChooserContextFactory>::get(); static base::NoDestructor<SerialChooserContextFactory> instance;
return instance.get();
} }
// static // static

8
shell/browser/serial/serial_chooser_context_factory.h
View file

@ -5,10 +5,14 @@
#ifndef ELECTRON_SHELL_BROWSER_SERIAL_SERIAL_CHOOSER_CONTEXT_FACTORY_H_ #ifndef ELECTRON_SHELL_BROWSER_SERIAL_SERIAL_CHOOSER_CONTEXT_FACTORY_H_
#define ELECTRON_SHELL_BROWSER_SERIAL_SERIAL_CHOOSER_CONTEXT_FACTORY_H_ #define ELECTRON_SHELL_BROWSER_SERIAL_SERIAL_CHOOSER_CONTEXT_FACTORY_H_
#include "base/memory/singleton.h"
#include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
#include "shell/browser/serial/serial_chooser_context.h" #include "shell/browser/serial/serial_chooser_context.h"
namespace base {
template <typename T>
class NoDestructor;
} // namespace base
namespace electron { namespace electron {
class SerialChooserContext; class SerialChooserContext;
@ -20,7 +24,7 @@ class SerialChooserContextFactory : public BrowserContextKeyedServiceFactory {
static SerialChooserContextFactory* GetInstance(); static SerialChooserContextFactory* GetInstance();
private: private:
friend struct base::DefaultSingletonTraits<SerialChooserContextFactory>; friend base::NoDestructor<SerialChooserContextFactory>;
SerialChooserContextFactory(); SerialChooserContextFactory();
~SerialChooserContextFactory() override; ~SerialChooserContextFactory() override;

4
shell/browser/usb/usb_chooser_context_factory.cc
View file

@ -4,6 +4,7 @@
#include "shell/browser/usb/usb_chooser_context_factory.h" #include "shell/browser/usb/usb_chooser_context_factory.h"
#include "base/no_destructor.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "shell/browser/electron_browser_context.h" #include "shell/browser/electron_browser_context.h"
#include "shell/browser/usb/usb_chooser_context.h" #include "shell/browser/usb/usb_chooser_context.h"
@ -26,7 +27,8 @@ KeyedService* UsbChooserContextFactory::BuildServiceInstanceFor(
// static // static
UsbChooserContextFactory* UsbChooserContextFactory::GetInstance() { UsbChooserContextFactory* UsbChooserContextFactory::GetInstance() {
return base::Singleton<UsbChooserContextFactory>::get(); static base::NoDestructor<UsbChooserContextFactory> instance;
return instance.get();
} }
// static // static

8
shell/browser/usb/usb_chooser_context_factory.h
View file

@ -5,9 +5,13 @@
#ifndef ELECTRON_SHELL_BROWSER_USB_USB_CHOOSER_CONTEXT_FACTORY_H_ #ifndef ELECTRON_SHELL_BROWSER_USB_USB_CHOOSER_CONTEXT_FACTORY_H_
#define ELECTRON_SHELL_BROWSER_USB_USB_CHOOSER_CONTEXT_FACTORY_H_ #define ELECTRON_SHELL_BROWSER_USB_USB_CHOOSER_CONTEXT_FACTORY_H_
#include "base/memory/singleton.h"
#include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
namespace base {
template <typename T>
class NoDestructor;
} // namespace base
namespace electron { namespace electron {
class UsbChooserContext; class UsbChooserContext;
@ -24,7 +28,7 @@ class UsbChooserContextFactory : public BrowserContextKeyedServiceFactory {
UsbChooserContextFactory& operator=(const UsbChooserContextFactory&) = delete; UsbChooserContextFactory& operator=(const UsbChooserContextFactory&) = delete;
private: private:
friend struct base::DefaultSingletonTraits<UsbChooserContextFactory>; friend base::NoDestructor<UsbChooserContextFactory>;
UsbChooserContextFactory(); UsbChooserContextFactory();
~UsbChooserContextFactory() override; ~UsbChooserContextFactory() override;