Remove unique naming.

chrome/browser/sync/engine/syncer.h

 // Copyright (c) 2009 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 entry.
 
 #ifndef CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_
 #define CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "chrome/browser/sync/engine/client_command_channel.h"
 #include "chrome/browser/sync/engine/conflict_resolver.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
 #include "chrome/browser/sync/engine/syncproto.h"
 #include "chrome/browser/sync/syncable/directory_event.h"
+#include "chrome/browser/sync/util/closure.h"
 #include "chrome/browser/sync/util/event_sys-inl.h"
 #include "chrome/browser/sync/util/event_sys.h"
 #include "chrome/browser/sync/util/extensions_activity_monitor.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"  // For FRIEND_TEST
 
 namespace syncable {
 class Directory;
 class DirectoryManager;
 class Entry;
 class Id;
@@ skipping 34 matching lines @@
 // as SyncerCommands, and the ordering of the steps is expressed using
 // the SyncerStep enum.
 //
 // A Syncer instance expects to run on a dedicated thread.  Calls
 // to SyncShare() may take an unbounded amount of time, as SyncerCommands
 // may block on network i/o, on lock contention, or on tasks posted to
 // other threads.
 class Syncer {
  public:
   typedef std::vector<int64> UnsyncedMetaHandles;
-  typedef void (*TestCallbackFunction)(syncable::Directory* dir);
 
   // The constructor may be called from a thread that is not the Syncer's
   // dedicated thread, to allow some flexibility in the setup.
   Syncer(syncable::DirectoryManager* dirman, const PathString& account_name,
       ServerConnectionManager* connection_manager,
       ModelSafeWorker* model_safe_worker);
   ~Syncer();
 
   // Called by other threads to tell the syncer to stop what it's doing
   // and return early from SyncShare, if possible.
@@ skipping 101 matching lines @@
   ExtensionsActivityMonitor* extensions_monitor_;
 
   // The source of the last nudge.
   sync_pb::GetUpdatesCallerInfo::GET_UPDATES_SOURCE updates_source_;
 
   // True only if the notification channel is authorized and open.
   bool notifications_enabled_;
 
   // A callback hook used in unittests to simulate changes between conflict set
   // building and conflict resolution.
-  TestCallbackFunction pre_conflict_resolution_function_;
+  Closure* pre_conflict_resolution_closure_;
 
-  FRIEND_TEST(SyncerTest, NewServerItemInAFolderHierarchyWeHaveDeleted3);
+  FRIEND_TEST(SusanDeletingTest,
+              NewServerItemInAFolderHierarchyWeHaveDeleted3);
   FRIEND_TEST(SyncerTest, TestCommitListOrderingAndNewParent);
   FRIEND_TEST(SyncerTest, TestCommitListOrderingAndNewParentAndChild);
   FRIEND_TEST(SyncerTest, TestCommitListOrderingCounterexample);
   FRIEND_TEST(SyncerTest, TestCommitListOrderingWithNesting);
   FRIEND_TEST(SyncerTest, TestCommitListOrderingWithNewItems);
   FRIEND_TEST(SyncerTest, TestGetUnsyncedAndSimpleCommit);
 
   DISALLOW_COPY_AND_ASSIGN(Syncer);
 };
 
@@ skipping 24 matching lines @@
 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest);
 void ClearServerData(syncable::MutableEntry* entry);
 
 // Get update contents as a string. Intended for logging, and intended
 // to have a smaller footprint than the protobuf's built-in pretty printer.
 std::string SyncEntityDebugString(const sync_pb::SyncEntity& entry);
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_