[Sync] Remove static initializers

chrome/browser/sync/engine/conflict_resolver.cc

 // Copyright (c) 2011 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/conflict_resolver.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 
@@ skipping 270 matching lines @@
     return false;
   }
   // We've deleted a directory tree that's got contents on the server. We
   // recreate the directory to solve the problem.
   //
   // We do this in two parts, first we ensure the tree is unaltered since
   // the conflict was detected.
   Id id = parent_id;
   // As we will be crawling the path of deleted entries there's a chance we'll
   // end up having to reparent an item as there will be an invalid parent.
-  Id reroot_id = syncable::kNullId;
+  Id reroot_id = syncable::GetNullId();
   // Similarly crawling deleted items means we risk loops.
   int loop_detection = conflict_set->size();
   while (!id.IsRoot() && --loop_detection >= 0) {
     Entry parent(trans, syncable::GET_BY_ID, id);
     // If we get a bad parent, or a parent that's deleted on client and server
     // we recreate the hierarchy in the root.
     if (!parent.good()) {
       reroot_id = id;
       break;
     }
@@ skipping 211 matching lines @@
       conflict_set_count_map_.erase(i++);
       // METRIC self resolved conflict sets ++.
     } else {
       ++i;
     }
   }
   return rv;
 }
 
 }  // namespace browser_sync