| Index: chrome/browser/sync/syncable/syncable_unittest.cc
|
| diff --git a/chrome/browser/sync/syncable/syncable_unittest.cc b/chrome/browser/sync/syncable/syncable_unittest.cc
|
| index 1b6fc3862a79a5ed40ea1ceda5c63d27527d915f..b7fcb6e95b78952e1144a849e18ba6e04445c4f1 100644
|
| --- a/chrome/browser/sync/syncable/syncable_unittest.cc
|
| +++ b/chrome/browser/sync/syncable/syncable_unittest.cc
|
| @@ -47,8 +47,8 @@ TEST_F(SyncableKernelTest, ToValue) {
|
| if (value.get()) {
|
| // Not much to check without repeating the ToValue() code.
|
| EXPECT_TRUE(value->HasKey("isDirty"));
|
| - // The extra +1 is for "isDirty".
|
| - EXPECT_EQ(BIT_TEMPS_END - BEGIN_FIELDS + 1,
|
| + // The extra +2 is for "isDirty" and "serverModelType".
|
| + EXPECT_EQ(BIT_TEMPS_END - BEGIN_FIELDS + 2,
|
| static_cast<int>(value->size()));
|
| } else {
|
| ADD_FAILURE();
|
| @@ -370,7 +370,6 @@ TEST_F(SyncableGeneralTest, ToValue) {
|
| scoped_ptr<DictionaryValue> value(me.ToValue());
|
| ExpectDictBooleanValue(true, *value, "good");
|
| EXPECT_TRUE(value->HasKey("kernel"));
|
| - ExpectDictStringValue("Unspecified", *value, "serverModelType");
|
| ExpectDictStringValue("Unspecified", *value, "modelType");
|
| ExpectDictBooleanValue(true, *value, "existsOnClientBecauseNameIsNonEmpty");
|
| ExpectDictBooleanValue(false, *value, "isRoot");
|
| @@ -880,10 +879,12 @@ TEST_F(SyncableDirectoryTest, TestGetUnsynced) {
|
| TEST_F(SyncableDirectoryTest, TestGetUnappliedUpdates) {
|
| Directory::UnappliedUpdateMetaHandles handles;
|
| int64 handle1, handle2;
|
| + syncable::ModelTypeBitSet all_types;
|
| + all_types.set();
|
| {
|
| WriteTransaction trans(FROM_HERE, UNITTEST, dir_.get());
|
|
|
| - dir_->GetUnappliedUpdateMetaHandles(&trans, &handles);
|
| + dir_->GetUnappliedUpdateMetaHandles(&trans, all_types, &handles);
|
| ASSERT_TRUE(0 == handles.size());
|
|
|
| MutableEntry e1(&trans, CREATE, trans.root_id(), "abba");
|
| @@ -905,7 +906,7 @@ TEST_F(SyncableDirectoryTest, TestGetUnappliedUpdates) {
|
| {
|
| WriteTransaction trans(FROM_HERE, UNITTEST, dir_.get());
|
|
|
| - dir_->GetUnappliedUpdateMetaHandles(&trans, &handles);
|
| + dir_->GetUnappliedUpdateMetaHandles(&trans, all_types, &handles);
|
| ASSERT_TRUE(0 == handles.size());
|
|
|
| MutableEntry e3(&trans, GET_BY_HANDLE, handle1);
|
| @@ -915,7 +916,7 @@ TEST_F(SyncableDirectoryTest, TestGetUnappliedUpdates) {
|
| dir_->SaveChanges();
|
| {
|
| WriteTransaction trans(FROM_HERE, UNITTEST, dir_.get());
|
| - dir_->GetUnappliedUpdateMetaHandles(&trans, &handles);
|
| + dir_->GetUnappliedUpdateMetaHandles(&trans, all_types, &handles);
|
| ASSERT_TRUE(1 == handles.size());
|
| ASSERT_TRUE(handle1 == handles[0]);
|
|
|
| @@ -926,7 +927,7 @@ TEST_F(SyncableDirectoryTest, TestGetUnappliedUpdates) {
|
| dir_->SaveChanges();
|
| {
|
| WriteTransaction trans(FROM_HERE, UNITTEST, dir_.get());
|
| - dir_->GetUnappliedUpdateMetaHandles(&trans, &handles);
|
| + dir_->GetUnappliedUpdateMetaHandles(&trans, all_types, &handles);
|
| ASSERT_TRUE(2 == handles.size());
|
| if (handle1 == handles[0]) {
|
| ASSERT_TRUE(handle2 == handles[1]);
|
| @@ -942,7 +943,7 @@ TEST_F(SyncableDirectoryTest, TestGetUnappliedUpdates) {
|
| dir_->SaveChanges();
|
| {
|
| WriteTransaction trans(FROM_HERE, UNITTEST, dir_.get());
|
| - dir_->GetUnappliedUpdateMetaHandles(&trans, &handles);
|
| + dir_->GetUnappliedUpdateMetaHandles(&trans, all_types, &handles);
|
| ASSERT_TRUE(1 == handles.size());
|
| ASSERT_TRUE(handle2 == handles[0]);
|
| }
|
|
|