sync: Start moving away from PREV_ID and NEXT_ID

sync/engine/process_commit_response_command_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 "sync/engine/process_commit_response_command.h"
 
 #include <vector>
 
 #include "base/location.h"
 #include "base/stringprintf.h"
@@ skipping 229 matching lines @@
   ASSERT_TRUE(b_folder.good());
   ASSERT_EQ("A bookmark folder", b_folder.Get(NON_UNIQUE_NAME))
       << "Name of bookmark folder should not change.";
   ASSERT_LT(0, b_folder.Get(BASE_VERSION))
       << "Bookmark folder should have a valid (positive) server base revision";
 
   // Look at the two bookmarks in bookmark_folder.
   Id cid;
   ASSERT_TRUE(directory()->GetFirstChildId(&trans, new_fid, &cid));
   Entry b1(&trans, syncable::GET_BY_ID, cid);
-  Entry b2(&trans, syncable::GET_BY_ID, b1.Get(syncable::NEXT_ID));
+  Entry b2(&trans, syncable::GET_BY_ID, b1.GetSuccessorId());
   CheckEntry(&b1, "bookmark 1", BOOKMARKS, new_fid);
   CheckEntry(&b2, "bookmark 2", BOOKMARKS, new_fid);
-  ASSERT_TRUE(b2.Get(syncable::NEXT_ID).IsRoot());
+  ASSERT_TRUE(b2.GetSuccessorId().IsRoot());
 
   // Look at the prefs and autofill items.
-  Entry p1(&trans, syncable::GET_BY_ID, b_folder.Get(syncable::NEXT_ID));
-  Entry p2(&trans, syncable::GET_BY_ID, p1.Get(syncable::NEXT_ID));
+  Entry p1(&trans, syncable::GET_BY_ID, b_folder.GetSuccessorId());
+  Entry p2(&trans, syncable::GET_BY_ID, p1.GetSuccessorId());
   CheckEntry(&p1, "Pref 1", PREFERENCES, id_factory_.root());
   CheckEntry(&p2, "Pref 2", PREFERENCES, id_factory_.root());
 
-  Entry a1(&trans, syncable::GET_BY_ID, p2.Get(syncable::NEXT_ID));
-  Entry a2(&trans, syncable::GET_BY_ID, a1.Get(syncable::NEXT_ID));
+  Entry a1(&trans, syncable::GET_BY_ID, p2.GetSuccessorId());
+  Entry a2(&trans, syncable::GET_BY_ID, a1.GetSuccessorId());
   CheckEntry(&a1, "Autofill 1", AUTOFILL, id_factory_.root());
   CheckEntry(&a2, "Autofill 2", AUTOFILL, id_factory_.root());
-  ASSERT_TRUE(a2.Get(syncable::NEXT_ID).IsRoot());
+  ASSERT_TRUE(a2.GetSuccessorId().IsRoot());
 }
 
 // In this test, we test processing a commit response for a commit batch that
 // includes a newly created folder and some (but not all) of its children.
 // In particular, the folder has 50 children, which alternate between being
 // new items and preexisting items.  This mixture of new and old is meant to
 // be a torture test of the code in ProcessCommitResponseCommand that changes
 // an item's ID from a local ID to a server-generated ID on the first commit.
 // We commit only the first 25 children in the sibling order, leaving the
 // second 25 children as unsynced items.  http://crbug.com/33081 describes
@@ skipping 88 matching lines @@
       // We alternated between creates and edits; double check that these items
       // have been preserved.
       if (child_count % 4 < 2) {
         ASSERT_FALSE(cid.ServerKnows());
         ASSERT_GE(0, c.Get(BASE_VERSION));
       } else {
         ASSERT_TRUE(cid.ServerKnows());
         ASSERT_LT(0, c.Get(BASE_VERSION));
       }
     }
-    cid = c.Get(syncable::NEXT_ID);
+    cid = c.GetSuccessorId();
     child_count++;
   }
   ASSERT_EQ(batch_size*2, child_count)
       << "Too few or too many children in parent folder after commit.";
 }
 
 // This test fixture runs across a Cartesian product of per-type fail/success
 // possibilities.
 enum {
   TEST_PARAM_BOOKMARK_ENABLE_BIT,
@@ skipping 63 matching lines @@
     EXPECT_EQ("xyz", final_monitor_records["xyz"].extension_id);
     EXPECT_EQ(2049U, final_monitor_records["ABC"].bookmark_write_count);
     EXPECT_EQ(4U,    final_monitor_records["xyz"].bookmark_write_count);
   } else {
     EXPECT_TRUE(final_monitor_records.empty())
         << "Should not restore records after successful bookmark commit.";
   }
 }
 
 }  // namespace syncer