sync: Process 'control' data separately

sync/engine/conflict_resolver.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.
 //
 // A class that watches the syncer and attempts to resolve any conflicts that
 // occur.
 
 #ifndef SYNC_ENGINE_CONFLICT_RESOLVER_H_
 #define SYNC_ENGINE_CONFLICT_RESOLVER_H_
 #pragma once
@@ skipping 48 matching lines @@
                         const Cryptographer* cryptographer,
                         const sessions::ConflictProgress& progress,
                         sessions::StatusController* status);
 
  private:
   enum ProcessSimpleConflictResult {
     NO_SYNC_PROGRESS,  // No changes to advance syncing made.
     SYNC_PROGRESS,     // Progress made.
   };
 
-  void IgnoreLocalChanges(syncable::MutableEntry* entry);
-  void OverwriteServerChanges(syncable::WriteTransaction* trans,
-                              syncable::MutableEntry* entry);
-
   ProcessSimpleConflictResult ProcessSimpleConflict(
       syncable::WriteTransaction* trans,
       const syncable::Id& id,
       const Cryptographer* cryptographer,
       sessions::StatusController* status);
 
   bool ResolveSimpleConflicts(syncable::WriteTransaction* trans,
                               const Cryptographer* cryptographer,
                               const sessions::ConflictProgress& progress,
                               sessions::StatusController* status);
 
   DISALLOW_COPY_AND_ASSIGN(ConflictResolver);
 };
 
 }  // namespace csync
 
 #endif  // SYNC_ENGINE_CONFLICT_RESOLVER_H_