sync: Add non-blocking type encryption (retry)

sync/internal_api/public/test/null_sync_context_proxy.h

Index: sync/internal_api/public/test/null_sync_context_proxy.h
diff --git a/sync/internal_api/public/test/null_sync_context_proxy.h b/sync/internal_api/public/test/null_sync_context_proxy.h
index 808f664f372b27c95785c8a622aeb56c98dcf6c3..0ca080dd8fff6bac782899a5387af06bd684acf4 100644
--- a/sync/internal_api/public/test/null_sync_context_proxy.h
+++ b/sync/internal_api/public/test/null_sync_context_proxy.h
@@ -6,6 +6,7 @@
 #define SYNC_INTERNAL_API_PUBLIC_TEST_NULL_SYNC_CONTEXT_PROXY_H_
 
 #include "base/memory/weak_ptr.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/internal_api/public/sync_context_proxy.h"
 
 namespace syncer {
@@ -23,6 +24,7 @@ class NullSyncContextProxy : public SyncContextProxy {
   virtual void ConnectTypeToSync(
       syncer::ModelType type,
       const DataTypeState& data_type_state,
+      const UpdateResponseDataList& saved_pending_updates,
       const base::WeakPtr<ModelTypeSyncProxyImpl>& type_sync_proxy) OVERRIDE;
   virtual void Disconnect(syncer::ModelType type) OVERRIDE;
   virtual scoped_ptr<SyncContextProxy> Clone() const OVERRIDE;