summaryrefslogtreecommitdiff
path: root/base/callback_helpers.h
diff options
context:
space:
mode:
Diffstat (limited to 'base/callback_helpers.h')
-rw-r--r--base/callback_helpers.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/base/callback_helpers.h b/base/callback_helpers.h
index ec3d6cbf16..782371f6e7 100644
--- a/base/callback_helpers.h
+++ b/base/callback_helpers.h
@@ -20,13 +20,10 @@
namespace base {
-template <typename Signature,
- internal::CopyMode copy_mode,
- internal::RepeatMode repeat_mode>
-base::Callback<Signature, copy_mode, repeat_mode> ResetAndReturn(
- base::Callback<Signature, copy_mode, repeat_mode>* cb) {
- base::Callback<Signature, copy_mode, repeat_mode> ret(std::move(*cb));
- DCHECK(!*cb);
+template <typename Sig>
+base::Callback<Sig> ResetAndReturn(base::Callback<Sig>* cb) {
+ base::Callback<Sig> ret(*cb);
+ cb->Reset();
return ret;
}