Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(817)

Unified Diff: content/app/content_main_runner.cc

Issue 2530573002: Share field trial allocator on zygote-using Linuxes (Closed)
Patch Set: git rebase-update Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 9d92e28e19c5d1133b7af61925cf10f53b04fe4d..695f8511ebe144f0dabe48b5951be28e5cb041f5 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -145,7 +145,7 @@ void InitializeFieldTrialAndFeatureList(
// Ensure any field trials in browser are reflected into the child
// process.
base::FieldTrialList::CreateTrialsFromCommandLine(
- command_line, switches::kFieldTrialHandle);
+ command_line, switches::kFieldTrialHandle, kFieldTrialHandle);
std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
feature_list->InitializeFromCommandLine(
@@ -478,6 +478,9 @@ class ContentMainRunnerImpl : public ContentMainRunner {
SetupSignalHandlers();
g_fds->Set(kMojoIPCChannel,
kMojoIPCChannel + base::GlobalDescriptors::kBaseDescriptor);
+
+ g_fds->Set(kFieldTrialHandle,
+ kFieldTrialHandle + base::GlobalDescriptors::kBaseDescriptor);
#endif // !OS_ANDROID
#if defined(OS_LINUX) || defined(OS_OPENBSD)

Powered by Google App Engine
This is Rietveld 408576698