Fix deadlock issue with AllStatesToString

base/metrics/field_trial_unittest.cc

Index: base/metrics/field_trial_unittest.cc
diff --git a/base/metrics/field_trial_unittest.cc b/base/metrics/field_trial_unittest.cc
index be96aa6ceeab060339534704af7812457360f35e..ada7ff2a968a792caf01b3ddb745ba65afc5836c 100644
--- a/base/metrics/field_trial_unittest.cc
+++ b/base/metrics/field_trial_unittest.cc
@@ -1145,8 +1145,12 @@ TEST(FieldTrialListTest, TestCopyFieldTrialStateToFlags) {
 
   base::FieldTrialList::CopyFieldTrialStateToFlags("field-trial-handle",
                                                    &cmd_line);
-
-  EXPECT_TRUE(cmd_line.HasSwitch(switches::kForceFieldTrials));
+#if defined(OS_WIN)
+  EXPECT_TRUE(cmd_line.HasSwitch("field-trial-handle") ||
+              cmd_line.HasSwitch(switches::kForceFieldTrials));
+#else
+  EXPECT_TRUE(cmd_line.HasSwitch("field-trial-handle"));
+#endif
 }
 
 TEST(FieldTrialListTest, InstantiateAllocator) {