Remove context-based dependencies on SyncerSession from ApplyUpdatesCommand....

chrome/browser/sync/engine/syncer_util.h

 // Copyright (c) 2006-2008 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 CHROME_BROWSER_SYNC_ENGINE_SYNCER_UTIL_H_
 #define CHROME_BROWSER_SYNC_ENGINE_SYNCER_UTIL_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "build/build_config.h"
 #include "chrome/browser/sync/engine/syncer.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/syncable/syncable_id.h"
 #include "chrome/browser/sync/util/path_helpers.h"
 #include "chrome/browser/sync/util/sync_types.h"
 
 namespace browser_sync {
 
-class SyncerSession;
 class SyncEntity;
 
 class SyncerUtil {
  public:
   // TODO(ncarter): Remove unique-in-parent title support and name conflicts.
   static syncable::Id GetNameConflictingItemId(
       syncable::BaseTransaction* trans,
       const syncable::Id& parent_id,
       const PathString& server_name);
 
@@ skipping 12 matching lines @@
                                              const syncable::Id& new_id);
 
   static void AttemptReuniteLostCommitResponses(
       syncable::WriteTransaction* trans,
       const SyncEntity& server_entry,
       const std::string& client_id);
 
   static UpdateAttemptResponse AttemptToUpdateEntry(
       syncable::WriteTransaction* const trans,
       syncable::MutableEntry* const entry,
-      SyncerSession* const session);
+      ConflictResolver* resolver);
 
   static UpdateAttemptResponse AttemptToUpdateEntryWithoutMerge(
       syncable::WriteTransaction* const trans,
       syncable::MutableEntry* const entry,
-      SyncerSession* const session, syncable::Id* const conflicting_id);
+      syncable::Id* const conflicting_id);
 
   // Pass in name to avoid redundant UTF8 conversion.
   static void UpdateServerFieldsFromUpdate(
       syncable::MutableEntry* local_entry,
       const SyncEntity& server_entry,
       const syncable::SyncName& name);
 
   static void ApplyExtendedAttributes(
       syncable::MutableEntry* local_entry,
       const SyncEntity& server_entry);
@@ skipping 123 matching lines @@
 
 inline bool ClientAndServerTimeMatch(int64 client_time, int64 server_time) {
   // Compare at the coarser timescale (server)
   return ClientTimeToServerTime(client_time) == server_time;
 }
 #endif
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_SYNCER_UTIL_H_