[Sync] Remove static initializers

chrome/browser/sync/engine/build_and_process_conflict_sets_command.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/build_and_process_conflict_sets_command.h"
 
 #include <set>
 #include <string>
 #include <sstream>
 #include <vector>
@@ skipping 323 matching lines @@
     return e.good() && e.Get(syncable::IS_DEL) && e.Get(syncable::IS_UNSYNCED);
   }
 
   // returns 0 if we should stop investigating the path.
   static syncable::Id GetAndExamineParent(syncable::BaseTransaction* trans,
                                           const syncable::Id& id,
                                           const syncable::Id& check_id,
                                           const syncable::Entry& log_entry) {
     syncable::Entry parent(trans, syncable::GET_BY_ID, id);
     if (!parent.good())
-      return syncable::kNullId;
+      return syncable::GetNullId();
     syncable::Id parent_id = parent.Get(syncable::PARENT_ID);
     if (parent_id == check_id)
-      return syncable::kNullId;
+      return syncable::GetNullId();
     return parent_id;
   }
 };
 
 template <typename Checker>
 void CrawlDeletedTreeMergingSets(syncable::BaseTransaction* trans,
                                  const syncable::Entry& entry,
                                  ConflictProgress* conflict_progress,
                                  Checker checker) {
   syncable::Id parent_id = entry.Get(syncable::PARENT_ID);
@@ skipping 42 matching lines @@
     LocallyDeletedPathChecker checker;
     if (!checker.CausingConflict(parent, *entry))
       return;
     conflict_progress->MergeSets(entry->Get(syncable::ID),
                                  parent.Get(syncable::ID));
     CrawlDeletedTreeMergingSets(trans, parent, conflict_progress, checker);
   }
 }
 
 }  // namespace browser_sync