Sync: add a test for downloading a tombstoned bookmark

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

Index: chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
index f3428134968c1dbb7fd366951de0e14750a1fc70..2e0496337d46046d07a11791bfeb15e42a758f70 100644
--- a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
@@ -6,18 +6,21 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
+#include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "sync/test/fake_server/bookmark_entity_builder.h"
 #include "sync/test/fake_server/entity_builder_factory.h"
 #include "sync/test/fake_server/fake_server_verifier.h"
+#include "sync/test/fake_server/tombstone_entity.h"
 #include "ui/base/layout.h"
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 using bookmarks_helper::AddFolder;
 using bookmarks_helper::AddURL;
+using bookmarks_helper::AwaitCountBookmarksWithTitlesMatching;
 using bookmarks_helper::CountBookmarksWithTitlesMatching;
 using bookmarks_helper::Create1xFaviconFromPNGFile;
 using bookmarks_helper::GetBookmarkBarNode;
@@ -294,3 +297,33 @@ IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
   // Verify model matches verifier.
   ASSERT_TRUE(ModelMatchesVerifier(0));
 }
+
+IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
+                       DownloadDeletedBookmark) {
+  std::string title = "Patrick Star";
+  fake_server::EntityBuilderFactory entity_builder_factory;
+  scoped_ptr<fake_server::FakeServerEntity> entity =
+      entity_builder_factory.NewBookmarkEntityBuilder(
+          title, GURL("http://en.wikipedia.org/wiki/Patrick_Star")).Build();
+  fake_server_->InjectEntity(entity.Pass());
+
+  DisableVerifier();
+  ASSERT_TRUE(SetupSync());
+
+  ASSERT_EQ(1, CountBookmarksWithTitlesMatching(0, title));
+
+  std::vector<sync_pb::SyncEntity> server_bookmarks =
+      GetFakeServer()->GetSyncEntitiesByModelType(syncer::BOOKMARKS);
+  ASSERT_EQ(1ul, server_bookmarks.size());
+  std::string entity_id = server_bookmarks[0].id_string();
+  scoped_ptr<fake_server::FakeServerEntity> tombstone(
+      fake_server::TombstoneEntity::Create(entity_id));
+  GetFakeServer()->InjectEntity(tombstone.Pass());
+
+  const syncer::ModelTypeSet kBookmarksType(syncer::BOOKMARKS);
+  TriggerSyncForModelTypes(0, kBookmarksType);
+
+  ASSERT_TRUE(AwaitCountBookmarksWithTitlesMatching(0 /* profile */,

[maniscalco, 2015/05/08 20:13:18]

nit: I like how you added a comment here to the reader knows what the 0 is for. 
Another option along these same lines would be to create a const int that's
scoped to this test (profile_id?) and pass that here and elsewhere above
(CountBookmarksWithtitlesMatching).  And if most/all of the test cases in this
file deal with profile 0, you could even make it a file scoped constant.

[pval...(no longer on Chromium), 2015/05/08 22:34:19]

constant added in this file. PTAL.

I think we could also work to make some of these calls cleaner (avoid passing
the index in single client test methods), but this seems like enough improvement
for now.

[maniscalco, 2015/05/08 23:56:14]

Agreed.

+                                                    title,
+                                                    0 /* expected_count */));
+}