[ios] Convert IOSChromeSafetyCheckManagerFactory to PKSFIOS

Convert IOSChromeSafetyCheckManagerFactory to be a
ProfileKeydServiceFactoryIOS.

Fixed: 363217876
Change-Id: I5ff7c1067733eb7f1992a0ae82cc9d1cd39bec22
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6070387
Reviewed-by: Asami Doi <asamidoi@chromium.org>
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Asami Doi <asamidoi@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1391587}

ios/chrome/browser/safety_check/model/BUILD.gn

@@ -47,12 +47,11 @@ source_set("factory") {
   ]
   deps = [
     ":model",
-    "//components/keyed_service/core",
     "//components/prefs",
     "//ios/chrome/browser/passwords/model",
     "//ios/chrome/browser/shared/model/application_context",
-    "//ios/chrome/browser/shared/model/browser_state",
     "//ios/chrome/browser/shared/model/profile",
+    "//ios/chrome/browser/shared/model/profile:profile_keyed_service_factory",
     "//ios/chrome/browser/shared/public/features",
   ]
 }

ios/chrome/browser/safety_check/model/ios_chrome_safety_check_manager_factory.h

@@ -8,7 +8,7 @@
 #import <memory>
 
 #import "base/no_destructor.h"
-#import "components/keyed_service/ios/browser_state_keyed_service_factory.h"
+#import "ios/chrome/browser/shared/model/profile/profile_keyed_service_factory_ios.h"
 
 class IOSChromeSafetyCheckManager;
 class KeyedService;
@@ -17,17 +17,12 @@ class ProfileIOS;
 // Singleton that owns all IOSChromeSafetyCheckManager(s) and associates them
 // with profiles.
 class IOSChromeSafetyCheckManagerFactory
-    : public BrowserStateKeyedServiceFactory {
+    : public ProfileKeyedServiceFactoryIOS {
  public:
   static IOSChromeSafetyCheckManager* GetForProfile(ProfileIOS* profile);
   static IOSChromeSafetyCheckManagerFactory* GetInstance();
   static TestingFactory GetDefaultFactory();
 
-  IOSChromeSafetyCheckManagerFactory(
-      const IOSChromeSafetyCheckManagerFactory&) = delete;
-  IOSChromeSafetyCheckManagerFactory& operator=(
-      const IOSChromeSafetyCheckManagerFactory&) = delete;
-
  private:
   friend class base::NoDestructor<IOSChromeSafetyCheckManagerFactory>;
 
@@ -37,8 +32,6 @@ class IOSChromeSafetyCheckManagerFactory
   // BrowserStateKeyedServiceFactory implementation.
   std::unique_ptr<KeyedService> BuildServiceInstanceFor(
       web::BrowserState* context) const override;
-  web::BrowserState* GetBrowserStateToUse(
-      web::BrowserState* context) const override;
 };
 
 #endif  // IOS_CHROME_BROWSER_SAFETY_CHECK_MODEL_IOS_CHROME_SAFETY_CHECK_MANAGER_FACTORY_H_

ios/chrome/browser/safety_check/model/ios_chrome_safety_check_manager_factory.mm

@@ -6,13 +6,10 @@
 
 #import "base/memory/scoped_refptr.h"
 #import "base/task/sequenced_task_runner.h"
-#import "components/keyed_service/core/keyed_service.h"
-#import "components/keyed_service/ios/browser_state_dependency_manager.h"
 #import "components/prefs/pref_service.h"
 #import "ios/chrome/browser/passwords/model/ios_chrome_password_check_manager_factory.h"
 #import "ios/chrome/browser/safety_check/model/ios_chrome_safety_check_manager.h"
 #import "ios/chrome/browser/shared/model/application_context/application_context.h"
-#import "ios/chrome/browser/shared/model/browser_state/browser_state_otr_helper.h"
 #import "ios/chrome/browser/shared/model/profile/profile_ios.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
 
@@ -37,8 +34,8 @@ std::unique_ptr<KeyedService> BuildServiceInstance(web::BrowserState* context) {
 // static
 IOSChromeSafetyCheckManager* IOSChromeSafetyCheckManagerFactory::GetForProfile(
     ProfileIOS* profile) {
-  return static_cast<IOSChromeSafetyCheckManager*>(
+  return GetInstance()->GetServiceForProfileAs<IOSChromeSafetyCheckManager>(
-      GetInstance()->GetServiceForBrowserState(profile, true));
+      profile, /*create=*/true);
 }
 
 // static
@@ -55,9 +52,8 @@ IOSChromeSafetyCheckManagerFactory::GetDefaultFactory() {
 }
 
 IOSChromeSafetyCheckManagerFactory::IOSChromeSafetyCheckManagerFactory()
-    : BrowserStateKeyedServiceFactory(
+    : ProfileKeyedServiceFactoryIOS("SafetyCheckManager",
-          "SafetyCheckManager",
+                                    ProfileSelection::kRedirectedInIncognito) {
-          BrowserStateDependencyManager::GetInstance()) {
   DependsOn(IOSChromePasswordCheckManagerFactory::GetInstance());
 }
 
@@ -69,8 +65,3 @@ IOSChromeSafetyCheckManagerFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
   return BuildServiceInstance(context);
 }
-
-web::BrowserState* IOSChromeSafetyCheckManagerFactory::GetBrowserStateToUse(
-    web::BrowserState* context) const {
-  return GetBrowserStateRedirectedInIncognito(context);
-}