diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2017-07-26 20:29:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-26 20:29:06 +0000 |
| commit | 38bc769bac923a216e9381d720ba730bd7b2f5ef (patch) | |
| tree | 0987cb51d27d74f7ff76c75683d6b504bac0e6d4 /base/callback_helpers.h | |
| parent | a29e6994243913703862fdbe17c059150c9ae149 (diff) | |
| parent | 54cfa4a2bacc9c43b06c1582d929da42bb165100 (diff) | |
| download | libchrome-38bc769bac923a216e9381d720ba730bd7b2f5ef.tar.gz | |
Revert "libchrome: Uprev the library to r456626 from Chromium" am: e5b2c6fa6f
am: 54cfa4a2ba
Change-Id: I651f5f9421f53c4c10798749155641b3e8bde687
Diffstat (limited to 'base/callback_helpers.h')
| -rw-r--r-- | base/callback_helpers.h | 11 |
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; } |