[Sync] USS: Ignore encryption changes during conflict resolution 2/2

sync/engine/non_blocking_type_commit_contribution.h

Index: sync/engine/non_blocking_type_commit_contribution.h
diff --git a/sync/engine/non_blocking_type_commit_contribution.h b/sync/engine/non_blocking_type_commit_contribution.h
index f0fddcfc6ceda1a8336295fe47e12b2371ce03e6..df0fe282b0deb9f4d8b854111a9fa57f6e19913c 100644
--- a/sync/engine/non_blocking_type_commit_contribution.h
+++ b/sync/engine/non_blocking_type_commit_contribution.h
@@ -27,7 +27,6 @@ class NonBlockingTypeCommitContribution : public syncer::CommitContribution {
   NonBlockingTypeCommitContribution(
       const sync_pb::DataTypeContext& context,
       const google::protobuf::RepeatedPtrField<sync_pb::SyncEntity>& entities,
-      const std::vector<int64_t>& sequence_numbers,
       ModelTypeWorker* worker);
   ~NonBlockingTypeCommitContribution() override;
 
@@ -49,10 +48,6 @@ class NonBlockingTypeCommitContribution : public syncer::CommitContribution {
   // The set of entities to be committed, serialized as SyncEntities.
   const google::protobuf::RepeatedPtrField<sync_pb::SyncEntity> entities_;
 
-  // The sequence numbers associated with the pending commits.  These match up
-  // with the entities_ vector.
-  const std::vector<int64_t> sequence_numbers_;
-
   // The index in the commit message where this contribution's entities are
   // added.  Used to correlate per-item requests with per-item responses.
   size_t entries_start_index_;