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..619068f4102c5263b68f359847e0c29c25d57219 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);
-
+#if defined(OS_WIN)
+  EXPECT_TRUE(cmd_line.HasSwitch("field-trial-handle") ||

[Alexei Svitkine (slow), 2016/10/28 18:57:34]

Please reference the flag via it's switches:: constant.

[lawrencewu, 2016/10/31 18:59:25]

The flag is in content_switches.cc so I don't think we can use it from base.

[Alexei Svitkine (slow), 2016/10/31 19:01:40]

Ah, I see - you're specifying it manually on line 1146. I suggest making a char
constant within the test for it and re-using it in both places. You can also
name it something else so it's not easily confused with the real flag - e.g.
test-field-trial-handle.

[lawrencewu, 2016/10/31 21:09:09]

Done.

+              cmd_line.HasSwitch(switches::kForceFieldTrials));
+#else
   EXPECT_TRUE(cmd_line.HasSwitch(switches::kForceFieldTrials));
+#endif
 }
 
 TEST(FieldTrialListTest, InstantiateAllocator) {