sync: Improve handling of bad UniquePos (retry)

sync/syncable/syncable_unittest.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 <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 326 matching lines @@
     WriteTransaction trans(FROM_HERE, UNITTEST, dir().get());
     MutableEntry create(
         &trans, CREATE, BOOKMARKS, trans.root_id(), create_name);
     MutableEntry update(&trans, CREATE_NEW_UPDATE_ITEM, update_id);
     create.PutIsUnsynced(true);
     update.PutIsUnappliedUpdate(true);
     sync_pb::EntitySpecifics specifics;
     specifics.mutable_bookmark()->set_favicon("PNG");
     specifics.mutable_bookmark()->set_url("http://nowhere");
     create.PutSpecifics(specifics);
-    update.PutSpecifics(specifics);
+    update.PutServerSpecifics(specifics);
     create_pre_save = create.GetKernelCopy();
     update_pre_save = update.GetKernelCopy();
     create_id = create.GetId();
   }
 
   dir()->SaveChanges();
   dir().reset(
       new Directory(new OnDiskDirectoryBackingStore(kDirectoryName, file_path_),
                     unrecoverable_error_handler(),
                     NULL,
@@ skipping 14 matching lines @@
     Entry update(&trans, GET_BY_ID, update_id);
     create_post_save = create.GetKernelCopy();
     update_post_save = update.GetKernelCopy();
   }
   int i = BEGIN_FIELDS;
   for ( ; i < INT64_FIELDS_END ; ++i) {
     EXPECT_EQ(create_pre_save.ref((Int64Field)i) +
                   (i == TRANSACTION_VERSION ? 1 : 0),
               create_post_save.ref((Int64Field)i))
               << "int64 field #" << i << " changed during save/load";
-    EXPECT_EQ(update_pre_save.ref((Int64Field)i) +
-              (i == TRANSACTION_VERSION ? 1 : 0),
+    EXPECT_EQ(update_pre_save.ref((Int64Field)i),
               update_post_save.ref((Int64Field)i))
-              << "int64 field #" << i << " changed during save/load";
+        << "int64 field #" << i << " changed during save/load";
   }
   for ( ; i < TIME_FIELDS_END ; ++i) {
     EXPECT_EQ(create_pre_save.ref((TimeField)i),
               create_post_save.ref((TimeField)i))
               << "time field #" << i << " changed during save/load";
     EXPECT_EQ(update_pre_save.ref((TimeField)i),
               update_post_save.ref((TimeField)i))
               << "time field #" << i << " changed during save/load";
   }
   for ( ; i < ID_FIELDS_END ; ++i) {
@@ skipping 278 matching lines @@
 TEST_F(SyncableClientTagTest, TestClientTagIndexDuplicateServer) {
   EXPECT_TRUE(CreateWithDefaultTag(factory_.NewServerId(), true));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), true));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), false));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), false));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), true));
 }
 
 }  // namespace syncable
 }  // namespace syncer