sync: Improve handling of bad UniquePos (retry)

sync/engine/syncer_util.h

 // Copyright (c) 2012 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.
 //
 // Utility functions manipulating syncable::Entries, intended for use by the
 // syncer.
 
 #ifndef SYNC_ENGINE_SYNCER_UTIL_H_
 #define SYNC_ENGINE_SYNCER_UTIL_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
+#include "sync/base/sync_export.h"
 #include "sync/engine/syncer.h"
 #include "sync/engine/syncer_types.h"
 #include "sync/syncable/entry_kernel.h"
 #include "sync/syncable/metahandle_set.h"
 #include "sync/syncable/mutable_entry.h"
 #include "sync/syncable/syncable_id.h"
 
 namespace sync_pb {
 class SyncEntity;
 }  // namespace sync_pb
@@ skipping 26 matching lines @@
     Cryptographer* cryptographer);
 
 // Returns the most accurate position information available in this update.  It
 // prefers to use the unique_position() field, but will fall back to using the
 // int64-based position_in_parent if necessary.
 //
 // The suffix parameter is the unique bookmark tag for the item being updated.
 //
 // Will return an invalid position if no valid position can be constructed, or
 // if this type does not support positioning.
-UniquePosition GetUpdatePosition(const sync_pb::SyncEntity& update,
-                                 const std::string& suffix);
+SYNC_EXPORT_PRIVATE UniquePosition GetUpdatePosition(
+    const sync_pb::SyncEntity& update,
+    const std::string& suffix);
 
 // Fetch the cache_guid and item_id-based unique bookmark tag from an update.
 // Will return an empty string if someting unexpected happens.
-std::string GetUniqueBookmarkTagFromUpdate(const sync_pb::SyncEntity& update);
+SYNC_EXPORT_PRIVATE std::string GetUniqueBookmarkTagFromUpdate(
+    const sync_pb::SyncEntity& update);
 
 // Pass in name to avoid redundant UTF8 conversion.
 void UpdateServerFieldsFromUpdate(
     syncable::ModelNeutralMutableEntry* local_entry,
     const sync_pb::SyncEntity& server_entry,
     const std::string& name);
 
 // Creates a new Entry iff no Entry exists with the given id.
 void CreateNewEntry(syncable::ModelNeutralWriteTransaction *trans,
                     const syncable::Id& id);
@@ skipping 26 matching lines @@
                             syncable::ModelNeutralMutableEntry* target);
 
 void MarkDeletedChildrenSynced(
     syncable::Directory* dir,
     syncable::BaseWriteTransaction* trans,
     std::set<syncable::Id>* deleted_folders);
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_SYNCER_UTIL_H_