Share field trial allocator on zygote-using Linuxes

content/app/content_main_runner.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/app/content_main_runner.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ skipping 126 matching lines @@
       *base::CommandLine::ForCurrentProcess();
 
   // Initialize statistical testing infrastructure.  We set the entropy
   // provider to nullptr to disallow non-browser processes from creating
   // their own one-time randomized trials; they should be created in the
   // browser process.
   field_trial_list->reset(new base::FieldTrialList(nullptr));
 
   // Ensure any field trials in browser are reflected into the child
   // process.
+#if defined(OS_POSIX) && !defined(OS_NACL) && !defined(OS_MACOSX) && \
+    !defined(OS_ANDROID)

[jochen (gone - plz use gerrit), 2016/11/29 15:13:39]

e.g. https://cs.chromium.org/chromium/src/content/public/common/zygote_handle.h
has a different condition. why OS_NACL?

[lawrencewu, 2016/11/29 15:24:51]

I wasn't sure if NaCl was POSIX-compliant and if it was, whether it used the
zygote. I wanted to be sure that we wouldn't go down this codepath if it was.
After your comment, I did some research and it looks like it isn't, so I changed
the condition to reflect the one in zygote_handle.h.

+  // On POSIX systems that use the zygote, we get the trials from a shared
+  // memory segment backed by an fd instead of the command line.
+  bool result =
+      base::FieldTrialList::CreateTrialsFromDescriptor(kFieldTrialDescriptor);
+  if (!result) {
+    base::FieldTrialList::CreateTrialsFromCommandLine(
+        command_line, switches::kFieldTrialHandle);
+  }
+#else
   base::FieldTrialList::CreateTrialsFromCommandLine(
       command_line, switches::kFieldTrialHandle);
+#endif
 
   std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
   feature_list->InitializeFromCommandLine(
       command_line.GetSwitchValueASCII(switches::kEnableFeatures),
       command_line.GetSwitchValueASCII(switches::kDisableFeatures));
   base::FeatureList::SetInstance(std::move(feature_list));
 }
 
 }  // namespace
 
@@ skipping 312 matching lines @@
     // - The ipc_fd is passed through the Java service.
     // Thus, these are all disabled.
 #if !defined(OS_ANDROID)
     // Set C library locale to make sure CommandLine can parse argument values
     // in correct encoding.
     setlocale(LC_ALL, "");
 
     SetupSignalHandlers();
     g_fds->Set(kMojoIPCChannel,
                kMojoIPCChannel + base::GlobalDescriptors::kBaseDescriptor);
+
+    g_fds->Set(
+        kFieldTrialDescriptor,
+        kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
 #endif  // !OS_ANDROID
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
     g_fds->Set(kCrashDumpSignal,
                kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor);
 #endif  // OS_LINUX || OS_OPENBSD
 
 
 #endif  // !OS_WIN
 
@@ skipping 340 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content