diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 06:34:22 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 06:34:22 +0000 |
| commit | 5485707a47aae11be217650d721913a096825852 (patch) | |
| tree | 5c69203d3ea27c23b0f884ada6bb29c485b1925e /sync | |
| parent | c87dfdab742620a0a602e1204925728adf92063c (diff) | |
| download | chromium_src-5485707a47aae11be217650d721913a096825852.zip chromium_src-5485707a47aae11be217650d721913a096825852.tar.gz chromium_src-5485707a47aae11be217650d721913a096825852.tar.bz2 | |
Remove various DoNothing functions in favor of base::DoNothing
BUG=
TBR=yoz@chromium.org,rkc@chromium.org,sergeyu@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11361269
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/internal_api/test/fake_sync_manager.cc | 9 | ||||
| -rw-r--r-- | sync/notifier/non_blocking_invalidator_unittest.cc | 6 |
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(); } |