WIP: The Bookmark Position Megapatch

sync/syncable/syncable_id.h

 // Copyright (c) 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.
 
 #ifndef SYNC_SYNCABLE_SYNCABLE_ID_H_
 #define SYNC_SYNCABLE_SYNCABLE_ID_H_
 
 #include <iosfwd>
 #include <limits>
 #include <sstream>
@@ skipping 84 matching lines @@
   // by operator<.
   Id GetLexicographicSuccessor() const;
 
   // Dumps the ID as a value and returns it.  Transfers ownership of
   // the StringValue to the caller.
   base::StringValue* ToValue() const;
 
   // Three functions are used to work with our proto buffers.
   std::string GetServerId() const;
   static Id CreateFromServerId(const std::string& server_id);
+
   // This should only be used if you get back a reference to a local
   // id from the server. Returns a client only opaque id.
   static Id CreateFromClientString(const std::string& local_id);
 
   // This method returns an ID that will compare less than any valid ID.
   // The returned ID is not a valid ID itself.  This is useful for
   // computing lower bounds on std::sets that are ordered by operator<.
   static Id GetLeastIdForLexicographicComparison();
 
  private:
   friend scoped_ptr<EntryKernel> UnpackEntry(sql::Statement* statement);
   friend void BindFields(const EntryKernel& entry,
                          sql::Statement* statement);
   friend std::ostream& operator<<(std::ostream& out, const Id& id);
   friend class MockConnectionManager;
   friend class SyncableIdTest;
 
   std::string s_;
 };
 
 Id GetNullId();
 
 }  // namespace syncable
 }  // namespace syncer
 
 #endif  // SYNC_SYNCABLE_SYNCABLE_ID_H_