Index: remoting/client/plugin/chromoting_instance.cc |
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc |
index 9572bc401ba4921ef0d81f64ac6d267066106ff5..3faab96508cb0a30d58ea19e0c8a17d3bba03919 100644 |
--- a/remoting/client/plugin/chromoting_instance.cc |
+++ b/remoting/client/plugin/chromoting_instance.cc |
@@ -14,6 +14,7 @@ |
#include "base/bind.h" |
#include "base/callback.h" |
+#include "base/callback_helpers.h" |
#include "base/json/json_reader.h" |
#include "base/json/json_writer.h" |
#include "base/lazy_instance.h" |
@@ -905,8 +906,7 @@ void ChromotingInstance::HandleOnPinFetched(const base::DictionaryValue& data) { |
return; |
} |
if (!secret_fetched_callback_.is_null()) { |
- secret_fetched_callback_.Run(pin); |
- secret_fetched_callback_.Reset(); |
+ base::ResetAndReturn(&secret_fetched_callback_).Run(pin); |
} else { |
LOG(WARNING) << "Ignored OnPinFetched received without a pending fetch."; |
} |