Fix compiling of sync on linux.

chrome/browser/sync/engine/conflict_resolver.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 entry.
 
 #include "chrome/browser/sync/engine/conflict_resolver.h"
 
 #include <map>
 #include <set>
 
 #include "chrome/browser/sync/engine/syncer.h"
@@ skipping 47 matching lines @@
   date.append(IntToPathString(now->tm_mday));
   return base + PSTR(" (Edited on ") + date + PSTR(")");
 }
 
 // TODO(ncarter): Remove title/path conflicts and the code to resolve them.
 Name FindNewName(BaseTransaction* trans,
                  Id parent_id,
                  const SyncName& original_name) {
   const PathString name = original_name.value();
   // 255 is defined in our spec.
-  const int allowed_length = kSyncProtocolMaxNameLengthBytes;
+  const size_t allowed_length = kSyncProtocolMaxNameLengthBytes;
   // TODO(sync): How do we get length on other platforms? The limit is
   // checked in java on the server, so it's not the number of glyphs its the
   // number of 16 bit characters in the UTF-16 representation.
 
   // 10 characters for 32 bit numbers + 2 characters for brackets means 12
   // characters should be more than enough for the name. Doubling this ensures
   // that we will have enough space.
   COMPILE_ASSERT(kSyncProtocolMaxNameLengthBytes >= 24,
                  maximum_name_too_short);
   CHECK(name.length() <= allowed_length);
@@ skipping 578 matching lines @@
     Id id = *conflicting_item_it;
     map<Id, ConflictSet*>::const_iterator item_set_it =
         view->IdToConflictSetFind(id);
     if (item_set_it == view->IdToConflictSetEnd() ||
         0 == item_set_it->second) {
       // We have a simple conflict.
       switch(ProcessSimpleConflict(&trans, id, session)) {
         case NO_SYNC_PROGRESS:
           {
             int conflict_count = (simple_conflict_count_map_[id] += 2);
-            bool stuck = LogAndSignalIfConflictStuck(&trans, conflict_count,
-                                                     &id, &id + 1, view);
+            LogAndSignalIfConflictStuck(&trans, conflict_count,
+                                        &id, &id + 1, view);
             break;
           }
         case SYNC_PROGRESS:
           forward_progress = true;
           break;
       }
     }
   }
   // Reduce the simple_conflict_count for each item currently tracked.
   SimpleConflictCountMap::iterator i = simple_conflict_count_map_.begin();
@@ skipping 38 matching lines @@
                                    conflict_set->begin(),
                                    conflict_set->end())) {
       LOG(INFO) << "Accelerating resolution for hierarchical merge.";
       conflict_count += 2;
     }
     // See if we should process this set.
     if (ProcessConflictSet(&trans, conflict_set, conflict_count, session)) {
       rv = true;
     }
     SyncerStatus status(session);
-    bool stuck = LogAndSignalIfConflictStuck(&trans, conflict_count,
-                                             conflict_set->begin(),
-                                             conflict_set->end(), view);
+    LogAndSignalIfConflictStuck(&trans, conflict_count,
+                                conflict_set->begin(),
+                                conflict_set->end(), view);
   }
   if (rv) {
     // This code means we don't signal that syncing is stuck when any conflict
     // resolution has occured.
     // TODO(sync): As this will also reduce our sensitivity to problem
     // conditions and increase the time for cascading resolutions we may have to
     // revisit this code later, doing something more intelligent.
     conflict_set_count_map_.clear();
     simple_conflict_count_map_.clear();
   }
   ConflictSetCountMap::iterator i = conflict_set_count_map_.begin();
   while (i != conflict_set_count_map_.end()) {
     if (0 == --i->second) {
       conflict_set_count_map_.erase(i++);
       // METRIC self resolved conflict sets ++.
     } else {
       ++i;
     }
   }
   return rv;
 }
 
 }  // namespace browser_sync