sync: Add non-blocking type encryption (retry)

sync/test/engine/mock_model_type_sync_worker.cc

Index: sync/test/engine/mock_model_type_sync_worker.cc
diff --git a/sync/test/engine/mock_model_type_sync_worker.cc b/sync/test/engine/mock_model_type_sync_worker.cc
index 9c90232fa2ad9791f40a347263527ca114200da2..8b6b52394942c2a4b3575fbae5017db9d8c2f842 100644
--- a/sync/test/engine/mock_model_type_sync_worker.cc
+++ b/sync/test/engine/mock_model_type_sync_worker.cc
@@ -94,6 +94,8 @@ UpdateResponseData MockModelTypeSyncWorker::UpdateFromServer(
   data.mtime = data.ctime + base::TimeDelta::FromSeconds(version);
   data.non_unique_name = specifics.preference().name();
 
+  data.encryption_key_name = server_encryption_key_name_;
+
   return data;
 }
 
@@ -118,6 +120,8 @@ UpdateResponseData MockModelTypeSyncWorker::TombstoneFromServer(
   data.mtime = data.ctime + base::TimeDelta::FromSeconds(version);
   data.non_unique_name = "Name Non Unique";
 
+  data.encryption_key_name = server_encryption_key_name_;
+
   return data;
 }
 
@@ -149,6 +153,11 @@ CommitResponseData MockModelTypeSyncWorker::SuccessfulCommitResponse(
   return response_data;
 }
 
+void MockModelTypeSyncWorker::SetServerEncryptionKey(
+    const std::string& key_name) {
+  server_encryption_key_name_ = key_name;
+}
+
 std::string MockModelTypeSyncWorker::GenerateId(const std::string& tag_hash) {
   return "FakeId:" + tag_hash;
 }