linux: fix gcc 4.3 issues (for arm)

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 513 matching lines @@
       break;
     }
     if (!parent.Get(syncable::IS_DEL) ||
         parent.Get(syncable::SERVER_IS_DEL) ||
         !parent.Get(syncable::IS_UNSYNCED)) {
       return false;
     }
     id = parent.Get(syncable::PARENT_ID);
   }
   // If we find we've been looping we re-root the hierarchy.
-  if (loop_detection < 0)
+  if (loop_detection < 0) {
     if (id == entry.Get(syncable::ID))
       reroot_id = entry.Get(syncable::PARENT_ID);
     else
       reroot_id = id;
+  }
   // Now we fix things up by undeleting all the folders in the item's path.
   id = parent_id;
   while (!id.IsRoot() && id != reroot_id) {
     if (!binary_search(conflict_set->begin(), conflict_set->end(), id))
       break;
     MutableEntry entry(trans, syncable::GET_BY_ID, id);
     Id parent_id = entry.Get(syncable::PARENT_ID);
     if (parent_id == reroot_id)
       parent_id = trans->root_id();
     Name old_name = entry.GetName();
@@ skipping 196 matching lines @@
       conflict_set_count_map_.erase(i++);
       // METRIC self resolved conflict sets ++.
     } else {
       ++i;
     }
   }
   return rv;
 }
 
 }  // namespace browser_sync