diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 14:06:11 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 14:06:11 +0000 |
| commit | a66e33a22551f345c784e94e324ef7f59eb82460 (patch) | |
| tree | 0cef9730b0d0fe6ad2e4f74f754c3fc17cee4067 /chrome/test/sync | |
| parent | f8efd95f9652964bc214367648c5dfbce8ae9d30 (diff) | |
| download | chromium_src-a66e33a22551f345c784e94e324ef7f59eb82460.zip chromium_src-a66e33a22551f345c784e94e324ef7f59eb82460.tar.gz chromium_src-a66e33a22551f345c784e94e324ef7f59eb82460.tar.bz2 | |
sync: Get rid of duplicated typedef Closure definition.
The closure.h file just defines a callback type. But base/callback.h already
define a callback with the same type, but with a different name. So just use
the callback from base instead.
BUG=26443
TEST=trybots
Signed-off-by: Thiago Farina <tfarina@chromium.org>
Review URL: http://codereview.chromium.org/2966009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/sync')
| -rw-r--r-- | chrome/test/sync/engine/mock_connection_manager.cc | 2 | ||||
| -rw-r--r-- | chrome/test/sync/engine/mock_connection_manager.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/test/sync/engine/mock_connection_manager.cc b/chrome/test/sync/engine/mock_connection_manager.cc index 5aec1ba..cb3f309 100644 --- a/chrome/test/sync/engine/mock_connection_manager.cc +++ b/chrome/test/sync/engine/mock_connection_manager.cc @@ -62,7 +62,7 @@ void MockConnectionManager::SetCommitTimeRename(string prepend) { commit_time_rename_prepended_string_ = prepend; } -void MockConnectionManager::SetMidCommitCallback(Closure* callback) { +void MockConnectionManager::SetMidCommitCallback(Callback0::Type* callback) { mid_commit_callback_.reset(callback); } diff --git a/chrome/test/sync/engine/mock_connection_manager.h b/chrome/test/sync/engine/mock_connection_manager.h index dd2573d..0e4759d 100644 --- a/chrome/test/sync/engine/mock_connection_manager.h +++ b/chrome/test/sync/engine/mock_connection_manager.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. // @@ -11,12 +11,12 @@ #include <string> #include <vector> +#include "base/callback.h" #include "base/scoped_vector.h" #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/syncable/model_type.h" -#include "chrome/browser/sync/util/closure.h" namespace syncable { class DirectoryManager; @@ -47,7 +47,7 @@ class MockConnectionManager : public browser_sync::ServerConnectionManager { virtual bool IsUserAuthenticated(); // Control of commit response. - void SetMidCommitCallback(Closure* callback); + void SetMidCommitCallback(Callback0::Type* callback); void SetMidCommitObserver(MidCommitObserver* observer); // Set this if you want commit to perform commit time rename. Will request @@ -271,7 +271,7 @@ class MockConnectionManager : public browser_sync::ServerConnectionManager { // The updates we'll return to the next request. sync_pb::GetUpdatesResponse updates_; - scoped_ptr<Closure> mid_commit_callback_; + scoped_ptr<Callback0::Type> mid_commit_callback_; MidCommitObserver* mid_commit_observer_; // The AUTHENTICATE response we'll return for auth requests. |