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

Unified Diff: base/metrics/field_trial_unittest.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: base/metrics/field_trial_unittest.cc
diff --git a/base/metrics/field_trial_unittest.cc b/base/metrics/field_trial_unittest.cc
index 890b3e5824e3fb39a586b247377a724b992b8de9..5fa4dad6e0c62d9eaadc72fbfa568a0c6b8f9ec0 100644
--- a/base/metrics/field_trial_unittest.cc
+++ b/base/metrics/field_trial_unittest.cc
@@ -1146,12 +1146,8 @@ TEST(FieldTrialListTest, TestCopyFieldTrialStateToFlags) {
base::FieldTrialList::CopyFieldTrialStateToFlags(field_trial_handle,
&cmd_line);
-#if defined(OS_WIN)
EXPECT_TRUE(cmd_line.HasSwitch(field_trial_handle) ||
cmd_line.HasSwitch(switches::kForceFieldTrials));
-#else
- EXPECT_TRUE(cmd_line.HasSwitch(switches::kForceFieldTrials));
-#endif
}
Alexei Svitkine (slow) 2016/11/29 17:38:27 Suggest keeping this test and just make it Windows
lawrencewu 2016/11/29 19:11:01 Done.
TEST(FieldTrialListTest, InstantiateAllocator) {

Powered by Google App Engine
This is Rietveld 408576698