Fix crash in unit tests loading resources from Brave-Core

brave · Jan 9, 2025 · 9edd81a · 9edd81a
1 parent f5ed2af
commit 9edd81a
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 0 deletions.
diff --git a/ios/app/brave_core_main.h b/ios/app/brave_core_main.h
@@ -111,6 +111,8 @@ OBJC_EXPORT
 /// Should only be called in unit tests
 + (bool)initializeICUForTesting;
 
++ (void)initializeResourceBundleForTesting;
+
 @end
 
 NS_ASSUME_NONNULL_END

diff --git a/ios/app/brave_core_main.mm b/ios/app/brave_core_main.mm
@@ -10,6 +10,8 @@
 
 #include "base/apple/bundle_locations.h"
 #include "base/apple/foundation_util.h"
+#include "base/at_exit.h"
+#include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
@@ -77,6 +79,8 @@
 #include "ios/public/provider/chrome/browser/ui_utils/ui_utils_api.h"
 #include "ios/web/public/init/web_main.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_paths.h"
 
 #if BUILDFLAG(IOS_CREDENTIAL_PROVIDER_ENABLED)
 #include "ios/chrome/browser/credential_provider/model/credential_provider_service_factory.h"
@@ -516,6 +520,35 @@ + (bool)initializeICUForTesting {
   return base::i18n::InitializeICU();
 }
 
++ (void)initializeResourceBundleForTesting {
+  @autoreleasepool {
+    ios::RegisterPathProvider();
+    ui::RegisterPathProvider();
+  }
+
+  base::AtExitManager exit_manager;
+  base::CommandLine::Init(0, nullptr);
+
+  [BraveCoreMain initializeICUForTesting];
+
+  NSBundle* baseBundle = base::apple::OuterBundle();
+  base::apple::SetBaseBundleID(
+      base::SysNSStringToUTF8([baseBundle bundleIdentifier]).c_str());
+
+  // Register all providers before calling any Chromium code.
+  [ProviderRegistration registerProviders];
+
+  ui::ResourceBundle::InitSharedInstanceWithLocale(
+      "en-US", nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
+
+  // Add Brave Resource Pack
+  base::FilePath brave_pack_path;
+  base::PathService::Get(base::DIR_ASSETS, &brave_pack_path);
+  brave_pack_path = brave_pack_path.AppendASCII("brave_resources.pak");
+  ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+      brave_pack_path, ui::kScaleFactorNone);
+}
+
 #if BUILDFLAG(IOS_CREDENTIAL_PROVIDER_ENABLED)
 - (void)performFaviconsCleanup {
   ProfileIOS* browserState = _main_profile;

diff --git a/ios/brave-ios/Tests/ClientTests/TabManagerTests.swift b/ios/brave-ios/Tests/ClientTests/TabManagerTests.swift
@@ -2,6 +2,7 @@
 // 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/.
 
+import BraveCore
 import Preferences
 import Shared
 import Storage
@@ -119,6 +120,10 @@ open class MockTabManagerDelegate: TabManagerDelegate {
   private let privateBrowsingManager = PrivateBrowsingManager()
   private let testWindowId = UUID()
 
+  override class func setUp() {
+    BraveCoreMain.initializeResourceBundleForTesting()
+  }
+
   override func setUp() {
     super.setUp()