Take 2: sync changes to support encryption

chrome/browser/sync/engine/update_applicator.cc

 // Copyright (c) 2009 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 "chrome/browser/sync/engine/update_applicator.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "chrome/browser/sync/engine/syncer_util.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/syncable/syncable_id.h"
 
 using std::vector;
 
 namespace browser_sync {
 
 UpdateApplicator::UpdateApplicator(ConflictResolver* resolver,
+                                   Cryptographer* cryptographer,
                                    const UpdateIterator& begin,
                                    const UpdateIterator& end,
                                    const ModelSafeRoutingInfo& routes,
                                    ModelSafeGroup group_filter)
     : resolver_(resolver),
+      cryptographer_(cryptographer),
       begin_(begin),
       end_(end),
       pointer_(begin),
       group_filter_(group_filter),
       progress_(false),
       routing_info_(routes) {
     size_t item_count = end - begin;
     LOG(INFO) << "UpdateApplicator created for " << item_count << " items.";
     successful_ids_.reserve(item_count);
   }
@@ skipping 16 matching lines @@
     conflicting_ids_.clear();
   }
 
   syncable::Entry read_only(trans, syncable::GET_BY_HANDLE, *pointer_);
   if (SkipUpdate(read_only)) {
     Advance();
     return true;
   }
 
   syncable::MutableEntry entry(trans, syncable::GET_BY_HANDLE, *pointer_);
-  UpdateAttemptResponse updateResponse =
-      SyncerUtil::AttemptToUpdateEntry(trans, &entry, resolver_);
+  UpdateAttemptResponse updateResponse = SyncerUtil::AttemptToUpdateEntry(
+      trans, &entry, resolver_, cryptographer_);
   switch (updateResponse) {
     case SUCCESS:
       Advance();
       progress_ = true;
       successful_ids_.push_back(entry.Get(syncable::ID));
       break;
     case CONFLICT:
       pointer_++;
       conflicting_ids_.push_back(entry.Get(syncable::ID));
       break;
@@ skipping 35 matching lines @@
     conflict_progress->AddConflictingItemById(*i);
     update_progress->AddAppliedUpdate(CONFLICT, *i);
   }
   for (i = successful_ids_.begin(); i != successful_ids_.end(); ++i) {
     conflict_progress->EraseConflictingItemById(*i);
     update_progress->AddAppliedUpdate(SUCCESS, *i);
   }
 }
 
 }  // namespace browser_sync