Fix compiling of sync on linux.

chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

 // Copyright (c) 2006-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/build_and_process_conflict_sets_command.h"
 
 #include <string>
 #include <sstream>
 #include <vector>
 
@@ skipping 42 matching lines @@
     syncable::WriteTransaction* trans, SyncerSession* const session) {
   bool rv = false;
   ConflictResolutionView conflict_view(session);
   set<ConflictSet*>::const_iterator all_sets_iterator;
   for(all_sets_iterator = conflict_view.ConflictSetsBegin();
       all_sets_iterator != conflict_view.ConflictSetsEnd() ; ) {
     const ConflictSet* conflict_set = *all_sets_iterator;
     CHECK(conflict_set->size() >= 2);
     // We scan the set to see if it consists of changes of only one type.
     ConflictSet::const_iterator i;
-    int unsynced_count = 0, unapplied_count = 0;
+    size_t unsynced_count = 0, unapplied_count = 0;
     for (i = conflict_set->begin(); i != conflict_set->end(); ++i) {
       syncable::Entry entry(trans, syncable::GET_BY_ID, *i);
       CHECK(entry.good());
       if (entry.Get(syncable::IS_UNSYNCED))
         unsynced_count++;
       if (entry.Get(syncable::IS_UNAPPLIED_UPDATE))
         unapplied_count++;
     }
     if (conflict_set->size() == unsynced_count && 0 == unapplied_count) {
       LOG(INFO) << "Skipped transactional commit attempt.";
@@ skipping 39 matching lines @@
 
  private:
   string name_stem_;
 };
 
 bool RollbackEntry(syncable::WriteTransaction* trans,
                    syncable::EntryKernel* backup) {
   syncable::MutableEntry entry(trans, syncable::GET_BY_HANDLE,
                                backup->ref(syncable::META_HANDLE));
   CHECK(entry.good());
-  bool was_del = entry.Get(syncable::IS_DEL);
 
   if (!entry.Put(syncable::IS_DEL, backup->ref(syncable::IS_DEL)))
     return false;
   syncable::Name name = syncable::Name::FromEntryKernel(backup);
   if (!entry.PutParentIdAndName(backup->ref(syncable::PARENT_ID), name))
     return false;
 
   if (!backup->ref(syncable::IS_DEL)) {
     if (!entry.PutPredecessor(backup->ref(syncable::PREV_ID)))
       return false;
@@ skipping 299 matching lines @@
       return;
     LocallyDeletedPathChecker checker;
     if (!checker.CausingConflict(parent, *entry))
       return;
     view->MergeSets(entry->Get(syncable::ID), parent.Get(syncable::ID));
     CrawlDeletedTreeMergingSets(trans, parent, view, checker);
   }
 }
 
 }  // namespace browser_sync