From 48805ee46e2ab2f0768aba01e966585937188d74 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 19 Sep 2024 03:01:00 -0500 Subject: [PATCH] refactor: remove use of deprecated API BuildServiceInstanceFor() (31-x-y) (#43782) refactor: remove use of deprecated API BuildServiceInstanceFor() (#43690) * refactor: update BadgeManagerFactory * refactor: update NetworkContextServiceFactory * refactor: update ElectronExtensionSystemFactory * refactor: update UsbChooserContextFactory * refactor: update UsbHidChooserContextFactory * refactor: update SerialChooserContextFactory * refactor: update FileSystemAccessPermissionContextFactory --- shell/browser/badging/badge_manager_factory.cc | 5 +++-- shell/browser/badging/badge_manager_factory.h | 2 +- .../extensions/electron_extension_system_factory.cc | 5 +++-- .../extensions/electron_extension_system_factory.h | 4 +++- .../file_system_access_permission_context_factory.cc | 10 ++-------- .../file_system_access_permission_context_factory.h | 7 +++---- shell/browser/hid/hid_chooser_context_factory.cc | 8 ++++---- shell/browser/hid/hid_chooser_context_factory.h | 6 ++++-- shell/browser/net/network_context_service_factory.cc | 5 +++-- shell/browser/net/network_context_service_factory.h | 5 +++-- shell/browser/serial/serial_chooser_context_factory.cc | 8 ++++---- shell/browser/serial/serial_chooser_context_factory.h | 4 +++- shell/browser/usb/usb_chooser_context_factory.cc | 8 ++++---- shell/browser/usb/usb_chooser_context_factory.h | 4 +++- 14 files changed, 43 insertions(+), 38 deletions(-) diff --git a/shell/browser/badging/badge_manager_factory.cc b/shell/browser/badging/badge_manager_factory.cc index bf3a8437fd1..bad156302be 100644 --- a/shell/browser/badging/badge_manager_factory.cc +++ b/shell/browser/badging/badge_manager_factory.cc @@ -32,9 +32,10 @@ BadgeManagerFactory::BadgeManagerFactory() BadgeManagerFactory::~BadgeManagerFactory() = default; -KeyedService* BadgeManagerFactory::BuildServiceInstanceFor( +std::unique_ptr +BadgeManagerFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { - return new BadgeManager(); + return std::make_unique(); } } // namespace badging diff --git a/shell/browser/badging/badge_manager_factory.h b/shell/browser/badging/badge_manager_factory.h index a104bc1c2a7..3ce918a7491 100644 --- a/shell/browser/badging/badge_manager_factory.h +++ b/shell/browser/badging/badge_manager_factory.h @@ -36,7 +36,7 @@ class BadgeManagerFactory : public BrowserContextKeyedServiceFactory { ~BadgeManagerFactory() override; // BrowserContextKeyedServiceFactory - KeyedService* BuildServiceInstanceFor( + std::unique_ptr BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const override; }; diff --git a/shell/browser/extensions/electron_extension_system_factory.cc b/shell/browser/extensions/electron_extension_system_factory.cc index 72074ec3312..55a654eec8b 100644 --- a/shell/browser/extensions/electron_extension_system_factory.cc +++ b/shell/browser/extensions/electron_extension_system_factory.cc @@ -35,9 +35,10 @@ ElectronExtensionSystemFactory::ElectronExtensionSystemFactory() ElectronExtensionSystemFactory::~ElectronExtensionSystemFactory() = default; -KeyedService* ElectronExtensionSystemFactory::BuildServiceInstanceFor( +std::unique_ptr +ElectronExtensionSystemFactory::BuildServiceInstanceForBrowserContext( BrowserContext* context) const { - return new ElectronExtensionSystem(context); + return std::make_unique(context); } BrowserContext* ElectronExtensionSystemFactory::GetBrowserContextToUse( diff --git a/shell/browser/extensions/electron_extension_system_factory.h b/shell/browser/extensions/electron_extension_system_factory.h index 449e49f3dd6..f2200dd2f39 100644 --- a/shell/browser/extensions/electron_extension_system_factory.h +++ b/shell/browser/extensions/electron_extension_system_factory.h @@ -5,6 +5,8 @@ #ifndef ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSION_SYSTEM_FACTORY_H_ #define ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSION_SYSTEM_FACTORY_H_ +#include + #include "extensions/browser/extension_system_provider.h" namespace base { @@ -36,7 +38,7 @@ class ElectronExtensionSystemFactory : public ExtensionSystemProvider { ~ElectronExtensionSystemFactory() override; // BrowserContextKeyedServiceFactory implementation: - KeyedService* BuildServiceInstanceFor( + std::unique_ptr BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const override; content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const override; diff --git a/shell/browser/file_system_access/file_system_access_permission_context_factory.cc b/shell/browser/file_system_access/file_system_access_permission_context_factory.cc index ff553fc2dc5..4f01b1cb65b 100644 --- a/shell/browser/file_system_access/file_system_access_permission_context_factory.cc +++ b/shell/browser/file_system_access/file_system_access_permission_context_factory.cc @@ -36,15 +36,9 @@ FileSystemAccessPermissionContextFactory:: FileSystemAccessPermissionContextFactory:: ~FileSystemAccessPermissionContextFactory() = default; -// static -KeyedService* FileSystemAccessPermissionContextFactory::BuildServiceInstanceFor( - content::BrowserContext* context) const { - return BuildInstanceFor(context).release(); -} - std::unique_ptr -FileSystemAccessPermissionContextFactory::BuildInstanceFor( - content::BrowserContext* context) { +FileSystemAccessPermissionContextFactory::BuildServiceInstanceForBrowserContext( + content::BrowserContext* context) const { return std::make_unique(context); } diff --git a/shell/browser/file_system_access/file_system_access_permission_context_factory.h b/shell/browser/file_system_access/file_system_access_permission_context_factory.h index b08fe99d02f..62256aa742e 100644 --- a/shell/browser/file_system_access/file_system_access_permission_context_factory.h +++ b/shell/browser/file_system_access/file_system_access_permission_context_factory.h @@ -5,6 +5,8 @@ #ifndef ELECTRON_SHELL_BROWSER_FILE_SYSTEM_ACCESS_FILE_SYSTEM_ACCESS_PERMISSION_CONTEXT_FACTORY_H_ #define ELECTRON_SHELL_BROWSER_FILE_SYSTEM_ACCESS_FILE_SYSTEM_ACCESS_PERMISSION_CONTEXT_FACTORY_H_ +#include + #include "base/no_destructor.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "shell/browser/file_system_access/file_system_access_permission_context.h" @@ -18,9 +20,6 @@ class FileSystemAccessPermissionContextFactory content::BrowserContext* context); static FileSystemAccessPermissionContextFactory* GetInstance(); - static std::unique_ptr BuildInstanceFor( - content::BrowserContext* context); - FileSystemAccessPermissionContextFactory( const FileSystemAccessPermissionContextFactory&) = delete; FileSystemAccessPermissionContextFactory& operator=( @@ -33,7 +32,7 @@ class FileSystemAccessPermissionContextFactory ~FileSystemAccessPermissionContextFactory() override; // BrowserContextKeyedServiceFactory: - KeyedService* BuildServiceInstanceFor( + std::unique_ptr BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const override; }; diff --git a/shell/browser/hid/hid_chooser_context_factory.cc b/shell/browser/hid/hid_chooser_context_factory.cc index cec317b2714..b317a053fa2 100644 --- a/shell/browser/hid/hid_chooser_context_factory.cc +++ b/shell/browser/hid/hid_chooser_context_factory.cc @@ -37,11 +37,11 @@ HidChooserContextFactory::HidChooserContextFactory() HidChooserContextFactory::~HidChooserContextFactory() = default; -KeyedService* HidChooserContextFactory::BuildServiceInstanceFor( +std::unique_ptr +HidChooserContextFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { - auto* browser_context = - static_cast(context); - return new HidChooserContext(browser_context); + return std::make_unique( + static_cast(context)); } content::BrowserContext* HidChooserContextFactory::GetBrowserContextToUse( diff --git a/shell/browser/hid/hid_chooser_context_factory.h b/shell/browser/hid/hid_chooser_context_factory.h index 14f444da6d5..01c3a3d09cf 100644 --- a/shell/browser/hid/hid_chooser_context_factory.h +++ b/shell/browser/hid/hid_chooser_context_factory.h @@ -5,6 +5,8 @@ #ifndef ELECTRON_SHELL_BROWSER_HID_HID_CHOOSER_CONTEXT_FACTORY_H_ #define ELECTRON_SHELL_BROWSER_HID_HID_CHOOSER_CONTEXT_FACTORY_H_ +#include + #include "base/no_destructor.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" @@ -30,8 +32,8 @@ class HidChooserContextFactory : public BrowserContextKeyedServiceFactory { HidChooserContextFactory(); ~HidChooserContextFactory() override; - // BrowserContextKeyedBaseFactory: - KeyedService* BuildServiceInstanceFor( + // BrowserContextKeyedServiceFactory: + std::unique_ptr BuildServiceInstanceForBrowserContext( content::BrowserContext* profile) const override; content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const override; diff --git a/shell/browser/net/network_context_service_factory.cc b/shell/browser/net/network_context_service_factory.cc index f2c635a5335..f7fd0e64712 100644 --- a/shell/browser/net/network_context_service_factory.cc +++ b/shell/browser/net/network_context_service_factory.cc @@ -28,9 +28,10 @@ NetworkContextServiceFactory::NetworkContextServiceFactory() NetworkContextServiceFactory::~NetworkContextServiceFactory() = default; -KeyedService* NetworkContextServiceFactory::BuildServiceInstanceFor( +std::unique_ptr +NetworkContextServiceFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { - return new NetworkContextService( + return std::make_unique( static_cast(context)); } diff --git a/shell/browser/net/network_context_service_factory.h b/shell/browser/net/network_context_service_factory.h index ef0b32b66a4..da723b80b3a 100644 --- a/shell/browser/net/network_context_service_factory.h +++ b/shell/browser/net/network_context_service_factory.h @@ -5,7 +5,8 @@ #ifndef ELECTRON_SHELL_BROWSER_NET_NETWORK_CONTEXT_SERVICE_FACTORY_H_ #define ELECTRON_SHELL_BROWSER_NET_NETWORK_CONTEXT_SERVICE_FACTORY_H_ -#include "base/memory/singleton.h" +#include + #include "components/keyed_service/content/browser_context_keyed_service_factory.h" class KeyedService; @@ -44,7 +45,7 @@ class NetworkContextServiceFactory : public BrowserContextKeyedServiceFactory { ~NetworkContextServiceFactory() override; // BrowserContextKeyedServiceFactory implementation: - KeyedService* BuildServiceInstanceFor( + std::unique_ptr BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const override; content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const override; diff --git a/shell/browser/serial/serial_chooser_context_factory.cc b/shell/browser/serial/serial_chooser_context_factory.cc index 5524af7d94a..25e01287a6e 100644 --- a/shell/browser/serial/serial_chooser_context_factory.cc +++ b/shell/browser/serial/serial_chooser_context_factory.cc @@ -18,11 +18,11 @@ SerialChooserContextFactory::SerialChooserContextFactory() SerialChooserContextFactory::~SerialChooserContextFactory() = default; -KeyedService* SerialChooserContextFactory::BuildServiceInstanceFor( +std::unique_ptr +SerialChooserContextFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { - auto* browser_context = - static_cast(context); - return new SerialChooserContext(browser_context); + return std::make_unique( + static_cast(context)); } // static diff --git a/shell/browser/serial/serial_chooser_context_factory.h b/shell/browser/serial/serial_chooser_context_factory.h index 9e73c428952..f738de85401 100644 --- a/shell/browser/serial/serial_chooser_context_factory.h +++ b/shell/browser/serial/serial_chooser_context_factory.h @@ -5,6 +5,8 @@ #ifndef ELECTRON_SHELL_BROWSER_SERIAL_SERIAL_CHOOSER_CONTEXT_FACTORY_H_ #define ELECTRON_SHELL_BROWSER_SERIAL_SERIAL_CHOOSER_CONTEXT_FACTORY_H_ +#include + #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "shell/browser/serial/serial_chooser_context.h" @@ -35,7 +37,7 @@ class SerialChooserContextFactory : public BrowserContextKeyedServiceFactory { delete; // BrowserContextKeyedServiceFactory methods: - KeyedService* BuildServiceInstanceFor( + std::unique_ptr BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const override; content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const override; diff --git a/shell/browser/usb/usb_chooser_context_factory.cc b/shell/browser/usb/usb_chooser_context_factory.cc index acbd8949dfa..5b8ae2d7d21 100644 --- a/shell/browser/usb/usb_chooser_context_factory.cc +++ b/shell/browser/usb/usb_chooser_context_factory.cc @@ -18,11 +18,11 @@ UsbChooserContextFactory::UsbChooserContextFactory() UsbChooserContextFactory::~UsbChooserContextFactory() = default; -KeyedService* UsbChooserContextFactory::BuildServiceInstanceFor( +std::unique_ptr +UsbChooserContextFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { - auto* browser_context = - static_cast(context); - return new UsbChooserContext(browser_context); + return std::make_unique( + static_cast(context)); } // static diff --git a/shell/browser/usb/usb_chooser_context_factory.h b/shell/browser/usb/usb_chooser_context_factory.h index 731c56d5f8e..99c09645be8 100644 --- a/shell/browser/usb/usb_chooser_context_factory.h +++ b/shell/browser/usb/usb_chooser_context_factory.h @@ -5,6 +5,8 @@ #ifndef ELECTRON_SHELL_BROWSER_USB_USB_CHOOSER_CONTEXT_FACTORY_H_ #define ELECTRON_SHELL_BROWSER_USB_USB_CHOOSER_CONTEXT_FACTORY_H_ +#include + #include "components/keyed_service/content/browser_context_keyed_service_factory.h" namespace base { @@ -34,7 +36,7 @@ class UsbChooserContextFactory : public BrowserContextKeyedServiceFactory { ~UsbChooserContextFactory() override; // BrowserContextKeyedServiceFactory methods: - KeyedService* BuildServiceInstanceFor( + std::unique_ptr BuildServiceInstanceForBrowserContext( content::BrowserContext* profile) const override; };