Support OnceCallback on base::ResetAndReturn

base/callback_helpers.h

Index: base/callback_helpers.h
diff --git a/base/callback_helpers.h b/base/callback_helpers.h
index 782371f6e71703059aeb6a4022a1aee785f1ad2d..5bac0d62f7d2b0eecf99a13c7abc4d9f3b3aa218 100644
--- a/base/callback_helpers.h
+++ b/base/callback_helpers.h
@@ -20,9 +20,12 @@
 
 namespace base {
 
-template <typename Sig>
-base::Callback<Sig> ResetAndReturn(base::Callback<Sig>* cb) {
-  base::Callback<Sig> ret(*cb);
+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(*cb);
   cb->Reset();
   return ret;
 }