Revert of sync: Add non-blocking type encryption support

sync/test/engine/mock_model_type_sync_proxy.cc

Index: sync/test/engine/mock_model_type_sync_proxy.cc
diff --git a/sync/test/engine/mock_model_type_sync_proxy.cc b/sync/test/engine/mock_model_type_sync_proxy.cc
index 423a37a5a2792d0461f2a323dcf9fe9a9ee91024..56f53fb1641b0188aaf40a15cc67b75989628560 100644
--- a/sync/test/engine/mock_model_type_sync_proxy.cc
+++ b/sync/test/engine/mock_model_type_sync_proxy.cc
@@ -29,13 +29,11 @@
 
 void MockModelTypeSyncProxy::OnUpdateReceived(
     const DataTypeState& type_state,
-    const UpdateResponseDataList& response_list,
-    const UpdateResponseDataList& pending_updates) {
+    const UpdateResponseDataList& response_list) {
   base::Closure task = base::Bind(&MockModelTypeSyncProxy::OnUpdateReceivedImpl,
                                   base::Unretained(this),
                                   type_state,
-                                  response_list,
-                                  pending_updates);
+                                  response_list);
   pending_tasks_.push_back(task);
   if (is_synchronous_)
     RunQueuedTasks();
@@ -111,12 +109,6 @@
     size_t n) const {
   DCHECK_LT(n, GetNumUpdateResponses());
   return received_update_responses_[n];
-}
-
-UpdateResponseDataList MockModelTypeSyncProxy::GetNthPendingUpdates(
-    size_t n) const {
-  DCHECK_LT(n, GetNumUpdateResponses());
-  return received_pending_updates_[n];
 }
 
 DataTypeState MockModelTypeSyncProxy::GetNthTypeStateReceivedInUpdateResponse(
@@ -189,10 +181,8 @@
 
 void MockModelTypeSyncProxy::OnUpdateReceivedImpl(
     const DataTypeState& type_state,
-    const UpdateResponseDataList& response_list,
-    const UpdateResponseDataList& pending_updates) {
+    const UpdateResponseDataList& response_list) {
   received_update_responses_.push_back(response_list);
-  received_pending_updates_.push_back(pending_updates);
   type_states_received_on_update_.push_back(type_state);
   for (UpdateResponseDataList::const_iterator it = response_list.begin();
        it != response_list.end();