[Sync] Trigger unapply + getupdates for persistence errors

chrome/browser/sync/glue/bookmark_model_associator.cc

Index: chrome/browser/sync/glue/bookmark_model_associator.cc
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index 891d06e62cba9f0111825d683c3f9df398ee6341..103edeae78bd015b7f4038c7514890021e624b7a 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -712,7 +712,7 @@ syncer::SyncError BookmarkModelAssociator::CheckModelSyncState() const {
     int64 native_version = syncer::syncable::kInvalidTransactionVersion;
     int64 sync_version = trans.GetModelVersion(syncer::BOOKMARKS);
     if (base::StringToInt64(version_str, &native_version) &&
-        native_version != sync_version) {
+        (native_version != sync_version || native_version != 0)) {

[tim (not reviewing), 2013/07/01 21:10:18]

So.. this is 

!(native_version == sync_version && native_version == 0)

I think you want to remove this (here and below) :)

[Nicolas Zea, 2013/07/01 23:27:45]

Done.

       UMA_HISTOGRAM_ENUMERATION("Sync.LocalModelOutOfSync",
                                 ModelTypeToHistogramInt(syncer::BOOKMARKS),
                                 syncer::MODEL_TYPE_COUNT);
@@ -723,7 +723,7 @@ syncer::SyncError BookmarkModelAssociator::CheckModelSyncState() const {
 
       // If the native version is higher, there was a sync persistence failure,
       // and we need to delay association until after a GetUpdates.
-      if (sync_version < native_version) {
+      if (sync_version < native_version || native_version != 0) {
         DVLOG(1) << "Native version (" << native_version << ") does not match "
                  << "sync version (" << sync_version << ").";
         return syncer::SyncError(FROM_HERE,