[Sync] Add nigori node conflict resolution.

chrome/browser/sync/test/engine/mock_connection_manager.h

 // Copyright (c) 2011 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 CHROME_BROWSER_SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_
 #define CHROME_BROWSER_SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_
 #pragma once
 
@@ skipping 77 matching lines @@
   sync_pb::SyncEntity* AddUpdateDirectory(std::string id,
                                           std::string parent_id,
                                           std::string name,
                                           int64 version,
                                           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* 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.
   // The server may send the originator fields.
   void AddUpdateTombstone(const syncable::Id& id);
@@ skipping 123 matching lines @@
 
  private:
   sync_pb::SyncEntity* AddUpdateFull(syncable::Id id, syncable::Id parentid,
                                      std::string name, int64 version,
                                      int64 sync_ts,
                                      bool is_dir);
   sync_pb::SyncEntity* AddUpdateFull(std::string id,
                                      std::string parentid, std::string name,
                                      int64 version, int64 sync_ts,
                                      bool is_dir);
+  sync_pb::SyncEntity* AddUpdateMeta(std::string id, std::string parentid,
+                                    std::string name, int64 version,
+                                    int64 sync_ts);
+
   // Functions to handle the various types of server request.
   void ProcessGetUpdates(sync_pb::ClientToServerMessage* csm,
                          sync_pb::ClientToServerResponse* response);
   void ProcessAuthenticate(sync_pb::ClientToServerMessage* csm,
                            sync_pb::ClientToServerResponse* response,
                            const std::string& auth_token);
   void ProcessCommit(sync_pb::ClientToServerMessage* csm,
                      sync_pb::ClientToServerResponse* response_buffer);
   void ProcessClearData(sync_pb::ClientToServerMessage* csm,
                         sync_pb::ClientToServerResponse* response);
@@ skipping 100 matching lines @@
   int num_get_updates_requests_;
 
   std::string next_token_;
 
   sync_pb::ClientToServerMessage last_request_;
 
   DISALLOW_COPY_AND_ASSIGN(MockConnectionManager);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_