WIP: The Bookmark Position Megapatch

sync/test/engine/mock_connection_manager.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.
 //
 // Mock ServerConnectionManager class for use in client unit tests.
 
 #ifndef SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_
 #define SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_
 
 #include <bitset>
 #include <list>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "sync/engine/net/server_connection_manager.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/base/model_type_invalidation_map.h"
+#include "sync/internal_api/public/base/unique_position.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace syncer {
 
 class MockConnectionManager : public ServerConnectionManager {
  public:
   class MidCommitObserver {
    public:
     virtual void Observe() = 0;
 
@@ skipping 54 matching lines @@
                                           int64 sync_ts);
   sync_pb::SyncEntity* AddUpdateBookmark(std::string id,
                                          std::string parent_id,
                                          std::string name,
                                          int64 version,
                                          int64 sync_ts);
   // Versions of the AddUpdate function that accept specifics.
   sync_pb::SyncEntity* AddUpdateSpecifics(int id, int parent_id,
       std::string name,int64 version, int64 sync_ts, bool is_dir,
       int64 position, const sync_pb::EntitySpecifics& specifics);
+  sync_pb::SyncEntity* AddBookmarkUpdateSpecifics(
+      int id, int parent_id, std::string name, int64 version, int64 sync_ts,
+      bool is_dir, int64 position, const sync_pb::EntitySpecifics& specifics);
+  sync_pb::SyncEntity* AddBookmarkUpdateSpecifics(int id, int parent_id,
+      std::string name, int64 version, int64 sync_ts, bool is_dir,
+      const syncer::UniquePosition& position,
+      const sync_pb::EntitySpecifics& specifics);
   sync_pb::SyncEntity* SetNigori(int id, int64 version, int64 sync_ts,
       const sync_pb::EntitySpecifics& specifics);
 
   // Find the last commit sent by the client, and replay it for the next get
   // updates command.  This can be used to simulate the GetUpdates that happens
   // immediately after a successful commit.
   sync_pb::SyncEntity* AddUpdateFromLastCommit();
 
   // Add a deleted item.  Deletion records typically contain no
   // additional information beyond the deletion, and no specifics.
@@ skipping 156 matching lines @@
   bool IsModelTypePresentInSpecifics(
       const google::protobuf::RepeatedPtrField<
           sync_pb::DataTypeProgressMarker>& filter,
       ModelType value);
 
   sync_pb::DataTypeProgressMarker const* GetProgressMarkerForType(
       const google::protobuf::RepeatedPtrField<
           sync_pb::DataTypeProgressMarker>& filter,
       ModelType value);
 
+  // Sets some reasonable values for originator_item_id and
+  // originator_cache_guid if the given entity is of type BOOKMARKS.
+  //
+  // Unfortunately, there's no guarantee that a single item will always have the
+  // same originator_client_item_id, though such a guarantee would be exist in a
+  // real sync system.  This could lead to spurious position changes in some
+  // situations.
+  void SetUpdateOriginatorFields(sync_pb::SyncEntity* ent);
+
   // When false, we pretend to have network connectivity issues.
   bool server_reachable_;
 
   // All IDs that have been committed.
   std::vector<syncable::Id> committed_ids_;
 
   // Control of when/if we return conflicts.
   bool conflict_all_commits_;
   int conflict_n_commits_;
 
@@ skipping 61 matching lines @@
   ModelTypeSet expected_filter_;
 
   ModelTypeInvalidationMap expected_states_;
 
   int num_get_updates_requests_;
 
   std::string next_token_;
 
   sync_pb::ClientToServerMessage last_request_;
 
+  // A unique originator_item_id value.
+  int64 originator_item_id_;
+
   DISALLOW_COPY_AND_ASSIGN(MockConnectionManager);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_