Revert of sync: Add non-blocking type encryption support

sync/engine/model_type_entity_unittest.cc

Index: sync/engine/model_type_entity_unittest.cc
diff --git a/sync/engine/model_type_entity_unittest.cc b/sync/engine/model_type_entity_unittest.cc
index 817bc8409a45983cf97717b1b55566bf6e5611bb..c605732fd058cd7236a8b23a3bdb74457ee6f6de 100644
--- a/sync/engine/model_type_entity_unittest.cc
+++ b/sync/engine/model_type_entity_unittest.cc
@@ -64,8 +64,7 @@
                                         specifics,
                                         false,
                                         kCtime,
-                                        kMtime,
-                                        std::string()));
+                                        kMtime));
 
   EXPECT_TRUE(entity->IsWriteRequired());
   EXPECT_FALSE(entity->IsUnsynced());
@@ -88,8 +87,7 @@
                                         sync_pb::EntitySpecifics(),
                                         true,
                                         kCtime,
-                                        kMtime,
-                                        std::string()));
+                                        kMtime));
 
   EXPECT_TRUE(entity->IsWriteRequired());
   EXPECT_FALSE(entity->IsUnsynced());
@@ -109,15 +107,13 @@
                                         specifics,
                                         false,
                                         kCtime,
-                                        kMtime,
-                                        std::string()));
+                                        kMtime));
 
   // A deletion update one version later.
   entity->ApplyUpdateFromServer(11,
                                 true,
                                 sync_pb::EntitySpecifics(),
-                                kMtime + base::TimeDelta::FromSeconds(10),
-                                std::string());
+                                kMtime + base::TimeDelta::FromSeconds(10));
 
   EXPECT_TRUE(entity->IsWriteRequired());
   EXPECT_FALSE(entity->IsUnsynced());
@@ -134,8 +130,7 @@
                                         specifics,
                                         false,
                                         kCtime,
-                                        kMtime,
-                                        std::string()));
+                                        kMtime));
 
   sync_pb::EntitySpecifics specifics2;
   specifics2.CopyFrom(specifics);
@@ -161,8 +156,7 @@
                                         specifics,
                                         false,
                                         kCtime,
-                                        kMtime,
-                                        std::string()));
+                                        kMtime));
 
   entity->Delete();