sync: Process 'control' data separately

sync/engine/syncer_util.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.
 //
 // Utility functions manipulating syncable::Entries, intended for use by the
 // syncer.
 
 #ifndef SYNC_ENGINE_SYNCER_UTIL_H_
 #define SYNC_ENGINE_SYNCER_UTIL_H_
 #pragma once
@@ skipping 50 matching lines @@
 
   static void SplitServerInformationIntoNewEntry(
       syncable::WriteTransaction* trans,
       syncable::MutableEntry* entry);
 
   // This function is called on an entry when we can update the user-facing data
   // from the server data.
   static void UpdateLocalDataFromServerData(syncable::WriteTransaction* trans,
                                             syncable::MutableEntry* entry);
 
+  static void IgnoreLocalChanges(syncable::MutableEntry* entry);
+  static void OverwriteServerChanges(syncable::MutableEntry* entry);
+  static void IgnoreConflict(syncable::MutableEntry *trans);
+
   static VerifyCommitResult ValidateCommitEntry(syncable::Entry* entry);
 
   static VerifyResult VerifyNewEntry(const SyncEntity& update,
                                      syncable::Entry* target,
                                      const bool deleted);
 
   // Assumes we have an existing entry; check here for updates that break
   // consistency rules.
   static VerifyResult VerifyUpdateConsistency(syncable::WriteTransaction* trans,
                                               const SyncEntity& update,
@@ skipping 38 matching lines @@
       syncable::Directory* dir,
       std::set<syncable::Id>* deleted_folders);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(SyncerUtil);
 };
 
 }  // namespace browser_sync
 
 #endif  // SYNC_ENGINE_SYNCER_UTIL_H_