Use base::ResetAndReturn() in remoting.

remoting/client/plugin/chromoting_instance.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/plugin/chromoting_instance.h"
 
 #include <string>
 #include <vector>
 
 #if defined(OS_NACL)
 #include <nacl_io/nacl_io.h>
 #include <sys/mount.h>
 #endif
 
 #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"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
 #include "crypto/random.h"
@@ skipping 871 matching lines @@
   audio_control.set_enable(!pause);
   client_->host_stub()->ControlAudio(audio_control);
 }
 void ChromotingInstance::HandleOnPinFetched(const base::DictionaryValue& data) {
   std::string pin;
   if (!data.GetString("pin", &pin)) {
     LOG(ERROR) << "Invalid onPinFetched.";
     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.";
   }
 }
 
 void ChromotingInstance::HandleOnThirdPartyTokenFetched(
     const base::DictionaryValue& data) {
   std::string token;
   std::string shared_secret;
   if (!data.GetString("token", &token) ||
@@ skipping 270 matching lines @@
 
 #if !defined(OS_NACL)
   // Log messages are forwarded to the webapp only in PNaCl version of the
   // plugin, so ProcessLogToUI() needs to be called explicitly in the non-PNaCl
   // version.
   ProcessLogToUI(message);
 #endif  // !defined(OS_NACL)
 }
 
 }  // namespace remoting