3671199: Remove ContentMainDelegate::PostFieldTrialInitialization

https://chromium-review.googlesource.com/c/chromium/src/+/3671199
electron · Jun 3, 2022 · 6392cfb · 6392cfb
1 parent fccfc1b
commit 6392cfb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc
@@ -460,8 +460,8 @@ ElectronMainDelegate::RunProcess(
     return std::move(main_function_params);
 }
 
-bool ElectronMainDelegate::ShouldCreateFeatureList() {
-  return false;
+bool ElectronMainDelegate::ShouldCreateFeatureList(InvokedIn invoked_in) {
+  return invoked_in == InvokedIn::kChildProcess;
 }
 
 bool ElectronMainDelegate::ShouldLockSchemeRegistry() {

diff --git a/shell/app/electron_main_delegate.h b/shell/app/electron_main_delegate.h
@@ -43,7 +43,7 @@ class ElectronMainDelegate : public content::ContentMainDelegate {
   absl::variant<int, content::MainFunctionParams> RunProcess(
       const std::string& process_type,
       content::MainFunctionParams main_function_params) override;
-  bool ShouldCreateFeatureList() override;
+  bool ShouldCreateFeatureList(InvokedIn invoked_in) override;
   bool ShouldLockSchemeRegistry() override;
 #if BUILDFLAG(IS_LINUX)
   void ZygoteForked() override;