sync: Finish non-blocking type encryption support

sync/engine/model_type_sync_proxy_impl.cc

Index: sync/engine/model_type_sync_proxy_impl.cc
diff --git a/sync/engine/model_type_sync_proxy_impl.cc b/sync/engine/model_type_sync_proxy_impl.cc
index 7ea5d526214411fa504fb60767b137c325ee1553..8c5ea5da9b9e429c1d97d0d9e4b5bc608227e22b 100644
--- a/sync/engine/model_type_sync_proxy_impl.cc
+++ b/sync/engine/model_type_sync_proxy_impl.cc
@@ -240,6 +240,9 @@ void ModelTypeSyncProxyImpl::OnUpdateReceived(
     // commit to fix it.
     if (data_type_state_.encryption_key_name !=
         response_data.encryption_key_name) {
+      DVLOG(1) << ModelTypeToString(type_) << ": Requesting re-encrypt commit "

[Nicolas Zea, 2014/08/13 20:49:07]

nit: given this is per entity, prefer DVLOG(2)

[rlarocque, 2014/08/15 18:33:17]

Done.  I fixed this log statement, and a few others.

While I was at it, I also removed some VLOG(1) statements that had been
accidentally left in model_type_registry.cc.

+               << response_data.encryption_key_name << " -> "
+               << data_type_state_.encryption_key_name;
       EntityMap::iterator it2 = entities_.find(client_tag_hash);
       it2->second->UpdateDesiredEncryptionKey(
           data_type_state_.encryption_key_name);