| Index: chrome/browser/sync/engine/syncer_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/sync/engine/syncer_unittest.cc (revision 51242)
|
| +++ chrome/browser/sync/engine/syncer_unittest.cc (working copy)
|
| @@ -2495,7 +2495,7 @@
|
| // TODO(chron): The fourth time that SyncShare is called it crashes.
|
| // This seems to be due to a bug in the conflict set building logic.
|
| // http://crbug.com/46621
|
| -TEST_F(SyncerTest, FAILS_ServerDeletingFolderWeHaveAnOpenEntryIn) {
|
| +TEST_F(SyncerTest, DISABLED_ServerDeletingFolderWeHaveAnOpenEntryIn) {
|
| ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
|
| CHECK(dir.good());
|
| mock_server_->AddUpdateBookmark(1, 0, "bob", 1, 10);
|
|
|