Use FakeServer-based invalidations for Sync tests

chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

Index: chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
index ba688ce742d3710eb83dcae228f122323aca4524..2b3e38a33d63ab8ac2d798efe436c99dec387a8e 100644
--- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
@@ -1616,7 +1616,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, MC_DuplicateFolders) {
   ASSERT_FALSE(ContainsDuplicateBookmarks(0));
 }
 
-IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, MC_DeleteBookmark) {
+// This test fails when run with FakeServer and FakeServerInvalidationService.

[rlarocque, 2014/04/22 18:22:22]

That's odd.  Do you know why it fails?

[pval...(no longer on Chromium), 2014/04/24 01:08:53]

IIRC, the progress markers don't match so AwaitQuiescence fails The interesting
part is that the test passes fine w/o the AwaitQuiescence check.

Let's debug this a little bit tomorrow before proceeding.

+IN_PROC_BROWSER_TEST_F(LegacyTwoClientBookmarksSyncTest, MC_DeleteBookmark) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncer::BOOKMARKS));