CreateTrailsFromString function now accepts argument without last separator symbol

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 "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 379 matching lines @@
 
   FieldTrial* trial = FieldTrialList::Find("Some_name");
   ASSERT_NE(static_cast<FieldTrial*>(NULL), trial);
   EXPECT_EQ("Winner", trial->group_name());
   EXPECT_EQ("Some_name", trial->trial_name());
 
   trial = FieldTrialList::Find("xxx");
   ASSERT_NE(static_cast<FieldTrial*>(NULL), trial);
   EXPECT_EQ("yyyy", trial->group_name());
   EXPECT_EQ("xxx", trial->trial_name());
+
+  EXPECT_TRUE(FieldTrialList::CreateTrialsFromString(

[Alexei Svitkine (slow), 2014/08/08 18:28:48]

Create a new test case for this, instead of grouping it in the existing one.

[gayane -on leave until 09-2017, 2014/08/08 18:50:16]

Done.

+      "tname/gname", FieldTrialList::DONT_ACTIVATE_TRIALS,
+      std::set<std::string>()));
+
+  trial = FieldTrialList::Find("tname");
+  ASSERT_NE(static_cast<FieldTrial*>(NULL), trial);
+  EXPECT_EQ("gname", trial->group_name());
+  EXPECT_EQ("tname", trial->trial_name());
 }
 
 TEST_F(FieldTrialTest, BogusRestore) {
   EXPECT_FALSE(FieldTrialList::CreateTrialsFromString(
       "MissingSlash", FieldTrialList::DONT_ACTIVATE_TRIALS,
       std::set<std::string>()));
   EXPECT_FALSE(FieldTrialList::CreateTrialsFromString(
       "MissingGroupName/", FieldTrialList::DONT_ACTIVATE_TRIALS,
       std::set<std::string>()));
   EXPECT_FALSE(FieldTrialList::CreateTrialsFromString(
-      "MissingFinalSlash/gname", FieldTrialList::DONT_ACTIVATE_TRIALS,
-      std::set<std::string>()));
-  EXPECT_FALSE(FieldTrialList::CreateTrialsFromString(
       "noname, only group/", FieldTrialList::DONT_ACTIVATE_TRIALS,
       std::set<std::string>()));
 }
 
 TEST_F(FieldTrialTest, DuplicateRestore) {
   FieldTrial* trial = CreateFieldTrial("Some name", 10, "Default", NULL);
   trial->AppendGroup("Winner", 10);
   // Finalize the group selection by accessing the selected group.
   trial->group();
   std::string save_string;
@@ skipping 543 matching lines @@
     EXPECT_TRUE(active_groups.empty());
 
     // The trial shouldn't be listed in the |StatesToString()| result.
     std::string states;
     FieldTrialList::StatesToString(&states);
     EXPECT_TRUE(states.empty());
   }
 }
 
 }  // namespace base