| 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 5b39a3cb2995a348f0210782ca102534122f4cec..2db0ab91e7be1506ed1cb3ad8602a292ce274a3c 100644
|
| --- a/chrome/browser/sync/syncable/model_type_unittest.cc
|
| +++ b/chrome/browser/sync/syncable/model_type_unittest.cc
|
| @@ -38,33 +38,6 @@ TEST_F(ModelTypeTest, ModelTypeFromValue) {
|
| }
|
| }
|
|
|
| -TEST_F(ModelTypeTest, ModelTypeBitSetToValue) {
|
| - ModelTypeBitSet model_types;
|
| - model_types.set(syncable::BOOKMARKS);
|
| - model_types.set(syncable::APPS);
|
| -
|
| - scoped_ptr<ListValue> value(ModelTypeBitSetToValue(model_types));
|
| - EXPECT_EQ(2u, value->GetSize());
|
| - std::string types[2];
|
| - EXPECT_TRUE(value->GetString(0, &types[0]));
|
| - EXPECT_TRUE(value->GetString(1, &types[1]));
|
| - EXPECT_EQ("Bookmarks", types[0]);
|
| - EXPECT_EQ("Apps", types[1]);
|
| -}
|
| -
|
| -TEST_F(ModelTypeTest, ModelTypeBitSetFromValue) {
|
| - // Try empty set first.
|
| - ModelTypeBitSet model_types;
|
| - scoped_ptr<ListValue> value(ModelTypeBitSetToValue(model_types));
|
| - EXPECT_EQ(model_types, ModelTypeBitSetFromValue(*value));
|
| -
|
| - // Now try with a few random types.
|
| - model_types.set(syncable::BOOKMARKS);
|
| - model_types.set(syncable::APPS);
|
| - value.reset(ModelTypeBitSetToValue(model_types));
|
| - EXPECT_EQ(model_types, ModelTypeBitSetFromValue(*value));
|
| -}
|
| -
|
| TEST_F(ModelTypeTest, ModelTypeSetToValue) {
|
| ModelTypeSet model_types;
|
| model_types.insert(syncable::BOOKMARKS);
|
|
|