sync: Finish non-blocking type encryption support

sync/engine/model_type_entity.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/engine/model_type_entity.h"
 #include "sync/syncable/syncable_util.h"
 
 namespace syncer {
 
 scoped_ptr<ModelTypeEntity> ModelTypeEntity::NewLocalItem(
@@ skipping 113 matching lines @@
 void ModelTypeEntity::MakeLocalChange(
     const sync_pb::EntitySpecifics& specifics) {
   sequence_number_++;
   specifics_ = specifics;
 }
 
 void ModelTypeEntity::UpdateDesiredEncryptionKey(const std::string& name) {
   if (encryption_key_name_ == name)
     return;
 
+  DVLOG(2) << id_ << ": Encryption triggered commit: " << encryption_key_name_
+           << " -> " << name;
+
   // Schedule commit with the expectation that the worker will re-encrypt with
   // the latest encryption key as it does.
   sequence_number_++;
 }
 
 void ModelTypeEntity::Delete() {
   sequence_number_++;
   specifics_.Clear();
   deleted_ = true;
 }
@@ skipping 35 matching lines @@
 void ModelTypeEntity::ClearSyncState() {
   base_version_ = kUncommittedVersion;
   is_dirty_ = true;
   sequence_number_ = 1;
   commit_requested_sequence_number_ = 0;
   acked_sequence_number_ = 0;
   id_.clear();
 }
 
 }  // namespace syncer