sync: Add non-blocking type encryption (retry)

sync/internal_api/public/sync_context.h

Index: sync/internal_api/public/sync_context.h
diff --git a/sync/internal_api/public/sync_context.h b/sync/internal_api/public/sync_context.h
index 67b1a4152316e9e05d4579a7d4fd94a6b3d24851..12598cdee055641f3194d203963a6eaf50d38d40 100644
--- a/sync/internal_api/public/sync_context.h
+++ b/sync/internal_api/public/sync_context.h
@@ -10,11 +10,11 @@
 #include "base/sequenced_task_runner.h"
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/base/model_type.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 
 namespace syncer {
 
 class ModelTypeSyncProxyImpl;
-struct DataTypeState;
 
 // An interface of the core parts of sync.
 //
@@ -35,6 +35,7 @@ class SYNC_EXPORT_PRIVATE SyncContext {
   virtual void ConnectSyncTypeToWorker(
       syncer::ModelType type,
       const DataTypeState& data_type_state,
+      const syncer::UpdateResponseDataList& saved_pending_updates,
       const scoped_refptr<base::SequencedTaskRunner>& datatype_task_runner,
       const base::WeakPtr<ModelTypeSyncProxyImpl>& type_sync_proxy) = 0;