From d139b9647dc44fde0cd4dd113e481e6380c62aa9 Mon Sep 17 00:00:00 2001
From: brave-builds <45370463+brave-builds@users.noreply.github.com>
Date: Mon, 6 Nov 2023 14:24:01 -0500
Subject: [PATCH] [iOS] Re-add call to prepare keyed service factories (uplift
 to 1.61.x) (#20834)

Uplift of #20832 (squashed) to beta
---
 .../ios/chrome/browser/browser_state/model/BUILD.gn       | 8 ++++++++
 chromium_src/ios/chrome/browser/browser_state/model/DEPS  | 3 +++
 .../model/browser_state_keyed_service_factories.mm        | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 chromium_src/ios/chrome/browser/browser_state/model/BUILD.gn
 create mode 100644 chromium_src/ios/chrome/browser/browser_state/model/DEPS

diff --git a/chromium_src/ios/chrome/browser/browser_state/model/BUILD.gn b/chromium_src/ios/chrome/browser/browser_state/model/BUILD.gn
new file mode 100644
index 000000000000..13bac1f2838d
--- /dev/null
+++ b/chromium_src/ios/chrome/browser/browser_state/model/BUILD.gn
@@ -0,0 +1,8 @@
+# Copyright (c) 2023 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at https://mozilla.org/MPL/2.0/.
+
+group("model") {
+  deps = [ "//brave/ios/browser/browser_state" ]
+}
diff --git a/chromium_src/ios/chrome/browser/browser_state/model/DEPS b/chromium_src/ios/chrome/browser/browser_state/model/DEPS
new file mode 100644
index 000000000000..df194f3c56a0
--- /dev/null
+++ b/chromium_src/ios/chrome/browser/browser_state/model/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+brave/ios/browser/browser_state"
+]
diff --git a/chromium_src/ios/chrome/browser/browser_state/model/browser_state_keyed_service_factories.mm b/chromium_src/ios/chrome/browser/browser_state/model/browser_state_keyed_service_factories.mm
index f07cd83b6d32..c9c8733a89d8 100644
--- a/chromium_src/ios/chrome/browser/browser_state/model/browser_state_keyed_service_factories.mm
+++ b/chromium_src/ios/chrome/browser/browser_state/model/browser_state_keyed_service_factories.mm
@@ -5,6 +5,7 @@
 
 #include "ios/chrome/browser/browser_state/model/browser_state_keyed_service_factories.h"
 
+#include "brave/ios/browser/browser_state/brave_browser_state_keyed_service_factories.h"
 #include "ios/chrome/browser/autofill/personal_data_manager_factory.h"
 #include "ios/chrome/browser/bookmarks/model/bookmark_undo_service_factory.h"
 #include "ios/chrome/browser/bookmarks/model/local_or_syncable_bookmark_model_factory.h"
@@ -53,4 +54,6 @@ void EnsureBrowserStateKeyedServiceFactoriesBuilt() {
   ReadingListModelFactory::GetInstance();
   SessionSyncServiceFactory::GetInstance();
   SyncSetupServiceFactory::GetInstance();
+
+  brave::EnsureBrowserStateKeyedServiceFactoriesBuilt();
 }