WIP: The Bookmark Position Megapatch

sync/internal_api/public/base/unique_position.h

Index: sync/internal_api/public/base/unique_position.h
diff --git a/sync/internal_api/public/base/unique_position.h b/sync/internal_api/public/base/unique_position.h
index 959164f403cfa5af9cf4ac8db44696c4476de1f4..1d472936b49de75e3f27b783bb604e9c98b4f369 100644
--- a/sync/internal_api/public/base/unique_position.h
+++ b/sync/internal_api/public/base/unique_position.h
@@ -28,8 +28,7 @@ namespace syncer {
 // though it could be adapted to be more generally useful.
 class UniquePosition {
  public:
-  static const size_t kSuffixLength = (64 + 128) / 8;
-  static const char kTerminatorByte = kuint8max;
+  static const size_t kSuffixLength;
 
   static bool IsValidSuffix(const std::string& suffix);
   static bool IsValidBytes(const std::string& bytes);
@@ -58,15 +57,6 @@ class UniquePosition {
                                 const UniquePosition& after,
                                 const std::string& suffix);
 
-  // Create a random suffix.  Should be used only as a last resort.
-  static const std::string GenerateUniqueSuffix();
-
-  // Create a unique suffix based on the input parameters.  The parameters are
-  // sufficient to uniquely identify any bookmark within the database.
-  static const std::string GenerateBookmarkSuffix(
-      const std::string& decoded_originator_cache_guid,
-      int64 numeric_originator_item_id);
-
   UniquePosition();
 
   bool LessThan(const UniquePosition& other) const;
@@ -88,18 +78,17 @@ class UniquePosition {
  private:
   friend class UniquePositionTest;
 
-  // Returns a string X such that (X ++ |suffix| ++ |kTerminatorByte|) < |str|.
+  // Returns a string X such that (X ++ |suffix|) < |str|.
   // |str| must be a trailing substring of a valid ordinal.
   // |suffix| must be a valid unique suffix.
   static std::string FindSmallerWithSuffix(const std::string& str,
                                            const std::string& suffix);
-  // Returns a string X such that (X ++ |suffix| ++ |kTerminatorByte|) > |str|.
+  // Returns a string X such that (X ++ |suffix|) > |str|.
   // |str| must be a trailing substring of a valid ordinal.
   // |suffix| must be a valid unique suffix.
   static std::string FindGreaterWithSuffix(const std::string& str,
                                            const std::string& suffix);
-  // Returns a string X such that
-  // |before| < (X ++ |suffix| ++ |kTerminatorByte|) < |after|.
+  // Returns a string X such that |before| < (X ++ |suffix|) < |after|.
   // |before| and after must be a trailing substrings of valid ordinals.
   // |suffix| must be a valid unique suffix.
   static std::string FindBetweenWithSuffix(const std::string& before,