Remove unique naming.

chrome/test/sync/engine/mock_server_connection.cc

 // 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 regression tests.
 
 #include "chrome/test/sync/engine/mock_server_connection.h"
 
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
 #include "chrome/browser/sync/util/character_set_converters.h"
@@ skipping 23 matching lines @@
       conflict_all_commits_(false),
       conflict_n_commits_(0),
       next_new_id_(10000),
       store_birthday_("Store BDay!"),
       store_birthday_sent_(false),
       client_stuck_(false),
       commit_time_rename_prepended_string_(""),
       fail_next_postbuffer_(false),
       directory_manager_(dirmgr),
       directory_name_(name),
-      mid_commit_callback_function_(NULL),
+      mid_commit_callback_(NULL),
       mid_commit_observer_(NULL),
       throttling_(false),
       fail_non_periodic_get_updates_(false),
       client_command_(NULL),
       next_position_in_parent_(2) {
     server_reachable_ = true;
 };
 
 MockConnectionManager::~MockConnectionManager() {
   for (size_t i = 0; i < commit_messages_.size(); i++)
     delete commit_messages_[i];
 }
 
 void MockConnectionManager::SetCommitTimeRename(string prepend) {
   commit_time_rename_prepended_string_ = prepend;
 }
 
-void MockConnectionManager::SetMidCommitCallbackFunction(
-    MockConnectionManager::TestCallbackFunction callback) {
-  mid_commit_callback_function_ = callback;
+void MockConnectionManager::SetMidCommitCallback(Closure* callback) {
+  mid_commit_callback_ = callback;
 }
 
 void MockConnectionManager::SetMidCommitObserver(
     MockConnectionManager::MidCommitObserver* observer) {
     mid_commit_observer_ = observer;
 }
 
 bool MockConnectionManager::PostBufferToPath(const PostBufferParams* params,
                                              const string& path,
                                              const string& auth_token) {
@@ skipping 49 matching lines @@
 
   {
     AutoLock throttle_lock(throttle_lock_);
     if (throttling_) {
         response.set_error_code(ClientToServerResponse::THROTTLED);
         throttling_ = false;
     }
   }
 
   response.SerializeToString(params->buffer_out);
-  if (mid_commit_callback_function_) {
-    if (mid_commit_callback_function_(directory))
-      mid_commit_callback_function_ = 0;
+  if (mid_commit_callback_) {
+    mid_commit_callback_->Run();
   }
   if (mid_commit_observer_) {
     mid_commit_observer_->Observe();
   }
 
   return result;
 }
 
 bool MockConnectionManager::IsServerReachable() {
   return true;
@@ skipping 253 matching lines @@
 }
 
 void MockConnectionManager::ThrottleNextRequest(
     ThrottleRequestVisitor* visitor) {
   AutoLock lock(throttle_lock_);
   throttling_ = true;
   if (visitor)
     visitor->VisitAtomically();
 }