Revert 270308 "sync: Improve handling of bad UniquePositions"

trunk/src/sync/syncable/syncable_unittest.cc

Index: trunk/src/sync/syncable/syncable_unittest.cc
===================================================================
--- trunk/src/sync/syncable/syncable_unittest.cc	(revision 270323)
+++ trunk/src/sync/syncable/syncable_unittest.cc	(working copy)
@@ -344,7 +344,7 @@
     specifics.mutable_bookmark()->set_favicon("PNG");
     specifics.mutable_bookmark()->set_url("http://nowhere");
     create.PutSpecifics(specifics);
-    update.PutServerSpecifics(specifics);
+    update.PutSpecifics(specifics);
     create_pre_save = create.GetKernelCopy();
     update_pre_save = update.GetKernelCopy();
     create_id = create.GetId();
@@ -379,9 +379,10 @@
                   (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),
+    EXPECT_EQ(update_pre_save.ref((Int64Field)i) +
+              (i == TRANSACTION_VERSION ? 1 : 0),
               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),