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..7491bd0444147d2367aef5e33b2f41246f0af2ee 100644
--- a/base/metrics/field_trial_unittest.cc
+++ b/base/metrics/field_trial_unittest.cc
@@ -1142,11 +1142,16 @@ TEST(FieldTrialListTest, TestCopyFieldTrialStateToFlags) {
   base::FieldTrialList::CreateFieldTrial("Trial1", "Group1");
   base::FilePath test_file_path = base::FilePath(FILE_PATH_LITERAL("Program"));
   base::CommandLine cmd_line = base::CommandLine(test_file_path);
+  const char* field_trial_handle = "test-field-trial-handle";

[Alexei Svitkine (slow), 2016/10/31 21:13:45]

Nit: const char kFieldTrialHandleSwitch[] =

 
-  base::FieldTrialList::CopyFieldTrialStateToFlags("field-trial-handle",
+  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
 }
 
 TEST(FieldTrialListTest, InstantiateAllocator) {