Index: chrome/browser/sync/syncable/model_type_unittest.cc |
diff --git a/chrome/browser/sync/syncable/model_type_unittest.cc b/chrome/browser/sync/syncable/model_type_unittest.cc |
index 5461f76de113f9e8bcd1f0edb3f690b2edf581e0..0eb74aefba7cfaaeaaa548d0ad922a14498bcdd8 100644 |
--- a/chrome/browser/sync/syncable/model_type_unittest.cc |
+++ b/chrome/browser/sync/syncable/model_type_unittest.cc |
@@ -62,20 +62,18 @@ TEST_F(ModelTypeTest, ModelTypeBitSetFromString) { |
input.set(BOOKMARKS); |
input.set(AUTOFILL); |
input.set(APPS); |
- std::string input_string = input.to_string(); |
+ std::string input_string = "Bookmarks, Autofill, Apps"; |
EXPECT_TRUE(ModelTypeBitSetFromString(input_string, &output)); |
EXPECT_EQ(input, output); |
- input_string.clear(); |
- EXPECT_FALSE(ModelTypeBitSetFromString(input_string, &output)); |
- |
- input_string = "hello world"; |
- EXPECT_FALSE(ModelTypeBitSetFromString(input_string, &output)); |
+ // Check that ModelTypeBitSetFromString(ModelTypeBitSetToString(set)) == set. |
+ std::string set_as_string = ModelTypeBitSetToString(input); |
+ EXPECT_TRUE(ModelTypeBitSetFromString(set_as_string, &output)); |
+ EXPECT_EQ(input, output); |
input_string.clear(); |
- for (int i = 0; i < MODEL_TYPE_COUNT; ++i) |
- input_string += '0' + (i%10); |
- EXPECT_FALSE(ModelTypeBitSetFromString(input_string, &output)); |
+ EXPECT_TRUE(ModelTypeBitSetFromString(input_string, &output)); |
+ EXPECT_EQ(ModelTypeBitSet(), output); |
} |
TEST_F(ModelTypeTest, IsRealDataType) { |