Index: chrome/browser/ui/search/search_unittest.cc |
diff --git a/chrome/browser/ui/search/search_unittest.cc b/chrome/browser/ui/search/search_unittest.cc |
index 8aaad4f4790458789535e0526faa4b424300eba6..c91203eed212a4c8aeeddfb11de4f9909c43633e 100644 |
--- a/chrome/browser/ui/search/search_unittest.cc |
+++ b/chrome/browser/ui/search/search_unittest.cc |
@@ -13,39 +13,42 @@ TEST(EmbeddedSearchFieldTrialTest, GetFieldTrialInfo) { |
uint64 group_number = 0; |
const uint64 ZERO = 0; |
- GetFieldTrialInfo("", &flags, &group_number); |
+ EXPECT_FALSE(GetFieldTrialInfo("", &flags, &group_number)); |
EXPECT_EQ(ZERO, group_number); |
EXPECT_EQ(ZERO, flags.size()); |
- GetFieldTrialInfo("Group77", &flags, &group_number); |
+ EXPECT_TRUE(GetFieldTrialInfo("Group77", &flags, &group_number)); |
EXPECT_EQ(uint64(77), group_number); |
EXPECT_EQ(ZERO, flags.size()); |
group_number = 0; |
- GetFieldTrialInfo("Group77.2", &flags, &group_number); |
+ EXPECT_FALSE(GetFieldTrialInfo("Group77.2", &flags, &group_number)); |
EXPECT_EQ(ZERO, group_number); |
EXPECT_EQ(ZERO, flags.size()); |
- GetFieldTrialInfo("Invalid77", &flags, &group_number); |
+ EXPECT_FALSE(GetFieldTrialInfo("Invalid77", &flags, &group_number)); |
EXPECT_EQ(ZERO, group_number); |
EXPECT_EQ(ZERO, flags.size()); |
- GetFieldTrialInfo("Group77 ", &flags, &group_number); |
+ EXPECT_FALSE(GetFieldTrialInfo("Invalid77", &flags, NULL)); |
+ EXPECT_EQ(ZERO, flags.size()); |
+ |
+ EXPECT_TRUE(GetFieldTrialInfo("Group77 ", &flags, &group_number)); |
EXPECT_EQ(uint64(77), group_number); |
EXPECT_EQ(ZERO, flags.size()); |
group_number = 0; |
flags.clear(); |
EXPECT_EQ(uint64(9999), GetUInt64ValueForFlagWithDefault("foo", 9999, flags)); |
- GetFieldTrialInfo("Group77 foo:6", &flags, &group_number); |
+ EXPECT_TRUE(GetFieldTrialInfo("Group77 foo:6", &flags, &group_number)); |
EXPECT_EQ(uint64(77), group_number); |
EXPECT_EQ(uint64(1), flags.size()); |
EXPECT_EQ(uint64(6), GetUInt64ValueForFlagWithDefault("foo", 9999, flags)); |
group_number = 0; |
flags.clear(); |
- GetFieldTrialInfo( |
- "Group77 bar:1 baz:7 cat:dogs", &flags, &group_number); |
+ EXPECT_TRUE(GetFieldTrialInfo( |
+ "Group77 bar:1 baz:7 cat:dogs", &flags, &group_number)); |
EXPECT_EQ(uint64(77), group_number); |
EXPECT_EQ(uint64(3), flags.size()); |
EXPECT_EQ(true, GetBoolValueForFlagWithDefault("bar", false, flags)); |
@@ -56,8 +59,8 @@ TEST(EmbeddedSearchFieldTrialTest, GetFieldTrialInfo) { |
group_number = 0; |
flags.clear(); |
- GetFieldTrialInfo( |
- "Group77 bar:1 baz:7 cat:dogs DISABLED", &flags, &group_number); |
+ EXPECT_FALSE(GetFieldTrialInfo( |
+ "Group77 bar:1 baz:7 cat:dogs DISABLED", &flags, &group_number)); |
EXPECT_EQ(ZERO, group_number); |
EXPECT_EQ(ZERO, flags.size()); |
} |