Revert of sync: Add non-blocking type encryption support

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 8b6b52394942c2a4b3575fbae5017db9d8c2f842..9c90232fa2ad9791f40a347263527ca114200da2 100644
--- a/sync/test/engine/mock_model_type_sync_worker.cc
+++ b/sync/test/engine/mock_model_type_sync_worker.cc
@@ -94,8 +94,6 @@
   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;
 }
 
@@ -119,8 +117,6 @@
   data.ctime = base::Time::UnixEpoch() + base::TimeDelta::FromDays(1);
   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;
 }
@@ -153,11 +149,6 @@
   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;
 }