summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
Diffstat (limited to 'sync')
-rw-r--r--sync/internal_api/test/fake_sync_manager.cc9
-rw-r--r--sync/notifier/non_blocking_invalidator_unittest.cc6
2 files changed, 4 insertions, 11 deletions
diff --git a/sync/internal_api/test/fake_sync_manager.cc b/sync/internal_api/test/fake_sync_manager.cc
index f90bbd7..66b3ac6 100644
--- a/sync/internal_api/test/fake_sync_manager.cc
+++ b/sync/internal_api/test/fake_sync_manager.cc
@@ -7,6 +7,7 @@
#include <cstddef>
#include "base/bind.h"
+#include "base/bind_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/run_loop.h"
@@ -72,18 +73,12 @@ void FakeSyncManager::UpdateInvalidatorState(InvalidatorState state) {
}
}
-namespace {
-
-void DoNothing() {}
-
-} // namespace
-
void FakeSyncManager::WaitForSyncThread() {
// Post a task to |sync_task_runner_| and block until it runs.
base::RunLoop run_loop;
if (!sync_task_runner_->PostTaskAndReply(
FROM_HERE,
- base::Bind(&DoNothing),
+ base::Bind(&base::DoNothing),
run_loop.QuitClosure())) {
NOTREACHED();
}
diff --git a/sync/notifier/non_blocking_invalidator_unittest.cc b/sync/notifier/non_blocking_invalidator_unittest.cc
index 412c6b6..05d9f63 100644
--- a/sync/notifier/non_blocking_invalidator_unittest.cc
+++ b/sync/notifier/non_blocking_invalidator_unittest.cc
@@ -4,6 +4,7 @@
#include "sync/notifier/non_blocking_invalidator.h"
+#include "base/bind_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
@@ -23,9 +24,6 @@ namespace syncer {
namespace {
-// Needed by WaitForInvalidator().
-void DoNothing() {}
-
class NonBlockingInvalidatorTestDelegate {
public:
NonBlockingInvalidatorTestDelegate() : io_thread_("IO thread") {}
@@ -71,7 +69,7 @@ class NonBlockingInvalidatorTestDelegate {
ASSERT_TRUE(
io_thread_.message_loop_proxy()->PostTaskAndReply(
FROM_HERE,
- base::Bind(&DoNothing),
+ base::Bind(&base::DoNothing),
run_loop.QuitClosure()));
run_loop.Run();
}