Reland 125805 - Reland 124817 - A profile-keyed service for Extensions, ExtensionSystem.

chrome/browser/profiles/profile_manager.cc

Index: chrome/browser/profiles/profile_manager.cc
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 1f4f2eb2aadd6aef348e73bc3f571ce0fe0f0b2c..84ecbd8772c946a82e33a5880c4c8df3062e18b8 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -18,6 +18,8 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/managed_mode.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
@@ -637,9 +639,9 @@ void ProfileManager::DoFinalInit(Profile* profile, bool go_off_the_record) {
 }
 
 void ProfileManager::DoFinalInitForServices(Profile* profile,
-                                         bool go_off_the_record) {
+                                            bool go_off_the_record) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  profile->InitExtensions(!go_off_the_record);
+  ExtensionSystemFactory::GetForProfile(profile)->Init(!go_off_the_record);
   if (!command_line.HasSwitch(switches::kDisableWebResources))
     profile->InitPromoResources();
 }