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

Unified Diff: base/metrics/field_trial.h

Issue 2633203002: Enable field trial shared memory segment on Android. (Closed)
Patch Set: Add #error Unsupported OS. Created 3 years, 11 months 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
« no previous file with comments | « no previous file | base/metrics/field_trial.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/metrics/field_trial.h
diff --git a/base/metrics/field_trial.h b/base/metrics/field_trial.h
index 5c5240c42af6bc4ba773f1c2d1fdec21e1179ce1..b2e9bf1e25ff6d67c2b8f990169d3dd59f587fd3 100644
--- a/base/metrics/field_trial.h
+++ b/base/metrics/field_trial.h
@@ -567,7 +567,9 @@ class BASE_EXPORT FieldTrialList {
// list of handles to be inherited.
static void AppendFieldTrialHandleIfNeeded(
base::HandlesToInheritVector* handles);
-#elif defined(OS_POSIX)
+#endif
+
+#if defined(OS_POSIX) && !defined(OS_NACL)
// On POSIX, we also need to explicitly pass down this file descriptor that
// should be shared with the child process. Returns kInvalidPlatformFile if no
// handle exists or was not initialized properly.
@@ -649,7 +651,7 @@ class BASE_EXPORT FieldTrialList {
static bool CreateTrialsFromHandleSwitch(const std::string& handle_switch);
#endif
-#if defined(OS_POSIX) && !defined(OS_NACL) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_NACL)
// On POSIX systems that use the zygote, we look up the correct fd that backs
// the shared memory segment containing the field trials by looking it up via
// an fd key in GlobalDescriptors. Returns true on success, false on failure.
« no previous file with comments | « no previous file | base/metrics/field_trial.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698