[Sync] Trigger unapply + getupdates for persistence errors

chrome/browser/sync/glue/bookmark_model_associator.cc

 // Copyright 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.
 
 #include "chrome/browser/sync/glue/bookmark_model_associator.h"
 
 #include <stack>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 694 matching lines @@
 }
 
 syncer::SyncError BookmarkModelAssociator::CheckModelSyncState() const {
   std::string version_str;
   if (bookmark_model_->root_node()->GetMetaInfo(kBookmarkTransactionVersionKey,
                                                 &version_str)) {
     syncer::ReadTransaction trans(FROM_HERE, user_share_);
     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);
 
       // Clear version on bookmark model so that we only report error once.
       bookmark_model_->DeleteNodeMetaInfo(bookmark_model_->root_node(),
                                           kBookmarkTransactionVersionKey);
 
       // 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,
                                  syncer::SyncError::PERSISTENCE_ERROR,
                                  syncer::BOOKMARKS);
       }
     }
   }
   return syncer::SyncError();
 }
 
 }  // namespace browser_sync