Fix deadlock issue with AllStatesToString

base/metrics/field_trial_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/metrics/field_trial.h"
 
 #include <stddef.h>
 
 #include "base/base_switches.h"
 #include "base/build_time.h"
@@ skipping 1124 matching lines @@
           base::FieldTrial::ONE_TIME_RANDOMIZED, NULL),
       "");
 }
 
 TEST(FieldTrialListTest, TestCopyFieldTrialStateToFlags) {
   base::FieldTrialList field_trial_list(
       base::MakeUnique<base::MockEntropyProvider>());
   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";
 
-  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) {
   FieldTrialList field_trial_list(nullptr);
   FieldTrialList::CreateFieldTrial("Trial1", "Group1");
 
   FieldTrialList::InstantiateFieldTrialAllocatorIfNeeded();
   void* memory = field_trial_list.field_trial_allocator_->shared_memory();
   size_t used = field_trial_list.field_trial_allocator_->used();
 
@@ skipping 23 matching lines @@
   FieldTrialList field_trial_list2(nullptr);
   std::unique_ptr<base::SharedMemory> shm(new SharedMemory(handle, true));
   shm.get()->Map(4 << 10);  // Hardcoded, equal to kFieldTrialAllocationSize.
   FieldTrialList::CreateTrialsFromSharedMemory(std::move(shm));
   std::string check_string;
   FieldTrialList::AllStatesToString(&check_string);
   EXPECT_EQ(save_string, check_string);
 }
 
 }  // namespace base