[Sync] USS: Filter out tombstones for initial sync.

components/sync/engine_impl/uss_migrator.cc

Index: components/sync/engine_impl/uss_migrator.cc
diff --git a/components/sync/engine_impl/uss_migrator.cc b/components/sync/engine_impl/uss_migrator.cc
index b853cb2faa7d448e2949772d81188d97607cf8cb..d144dd93ae9840e35ecb252c6f95845bc1ab9db3 100644
--- a/components/sync/engine_impl/uss_migrator.cc
+++ b/components/sync/engine_impl/uss_migrator.cc
@@ -103,8 +103,11 @@ bool MigrateDirectoryDataWithBatchSize(ModelType type,
         worker->AbortMigration();
         return false;
       }
-      entity_ptrs.push_back(entity.get());
-      entities.push_back(std::move(entity));
+      // Ignore tombstones.

[skym, 2017/01/13 16:31:23]

// Ignore tombstones because ...

[maxbogue, 2017/01/17 22:02:26]

Done.

+      if (!entity->deleted()) {
+        entity_ptrs.push_back(entity.get());
+        entities.push_back(std::move(entity));
+      }
     }
 
     worker->ProcessGetUpdatesResponse(progress, context, entity_ptrs, nullptr);

[skym, 2017/01/13 16:31:23]

I forget, is this always going to result in a merge? Or is it possible the
bridge gets some of this as an apply?

[maxbogue, 2017/01/17 22:02:26]

Always a merge due to the PassiveApplyUpdates call below.