Remove unique naming.

chrome/test/sync/engine/mock_server_connection.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 file.
 //
 // Mock ServerConnectionManager class for use in client unit tests.
 
 #ifndef CHROME_TEST_SYNC_ENGINE_MOCK_SERVER_CONNECTION_H_
 #define CHROME_TEST_SYNC_ENGINE_MOCK_SERVER_CONNECTION_H_
 
 #include <string>
 #include <vector>
 
 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
 #include "chrome/browser/sync/protocol/sync.pb.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
+#include "chrome/browser/sync/util/closure.h"
 
 using std::string;
 using std::vector;
 
 namespace syncable {
 class DirectoryManager;
 class ScopedDirLookup;
 }
 namespace browser_sync {
 struct HttpResponse;
 }
 
 class MockConnectionManager : public browser_sync::ServerConnectionManager {
  public:
-  // A callback function type. These can be set to be called when server
-  // activity would normally take place. This aids simulation of race
-  // conditions.
-  typedef bool (*TestCallbackFunction)(syncable::Directory* dir);
   class MidCommitObserver {
    public:
     virtual void Observe() = 0;
   };
 
   MockConnectionManager(syncable::DirectoryManager* dirmgr,
                         const std::string& name);
   virtual ~MockConnectionManager();
 
   // Overridden ServerConnectionManager functions.
   virtual bool PostBufferToPath(const PostBufferParams*,
                                 const string& path,
                                 const string& auth_token);
 
   virtual bool IsServerReachable();
   virtual bool IsUserAuthenticated();
 
   // Control of commit response.
-  void SetMidCommitCallbackFunction(TestCallbackFunction callback);
+  void SetMidCommitCallback(Closure* callback);
   void SetMidCommitObserver(MidCommitObserver* observer);
 
   // Set this if you want commit to perform commit time rename. Will request
   // that the client renames all commited entries, prepending this string.
   void SetCommitTimeRename(string prepend);
 
   // Control of get updates response. All updates set will only be returned
   // once. This mock object doesn't simulate a changelist, it simulates server
   // responses.
   void ResetUpdates();
@@ skipping 139 matching lines @@
 
   // Fail on the next call to PostBufferToPath().
   bool fail_next_postbuffer_;
 
   // Our directory.
   syncable::DirectoryManager* directory_manager_;
   std::string directory_name_;
 
   // The updates we'll return to the next request.
   sync_pb::GetUpdatesResponse updates_;
-  TestCallbackFunction mid_commit_callback_function_;
+  Closure* mid_commit_callback_;
   MidCommitObserver* mid_commit_observer_;
 
   // The AUTHENTICATE response we'll return for auth requests.
   sync_pb::AuthenticateResponse auth_response_;
   // What we use to determine if we should return SUCCESS or BAD_AUTH_TOKEN.
   std::string valid_auth_token_;
 
   // Whether we are faking a server mandating clients to throttle requests.
   // Protected by |throttle_lock_|.
   bool throttling_;
   Lock throttle_lock_;
 
   // True if we are only accepting GetUpdatesCallerInfo::PERIODIC requests.
   bool fail_non_periodic_get_updates_;
 
   scoped_ptr<sync_pb::ClientCommand> client_command_;
 
   // The next value to use for the position_in_parent property.
   int64 next_position_in_parent_;
 
   DISALLOW_COPY_AND_ASSIGN(MockConnectionManager);
 };
 
 #endif  // CHROME_TEST_SYNC_ENGINE_MOCK_SERVER_CONNECTION_H_