Use base::ResetAndReturn() in remoting.

remoting/protocol/third_party_authenticator_unittest.cc

 // Copyright 2013 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 "base/bind.h"
+#include "base/callback_helpers.h"
 #include "net/base/net_errors.h"
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/protocol/authenticator_test_base.h"
 #include "remoting/protocol/channel_authenticator.h"
 #include "remoting/protocol/connection_tester.h"
 #include "remoting/protocol/fake_authenticator.h"
 #include "remoting/protocol/third_party_authenticator_base.h"
 #include "remoting/protocol/third_party_client_authenticator.h"
 #include "remoting/protocol/third_party_host_authenticator.h"
 #include "remoting/protocol/token_validator.h"
@@ skipping 30 matching lines @@
         const TokenFetchedCallback& token_fetched_callback) override {
      ASSERT_EQ(token_url.spec(), kTokenUrl);
      ASSERT_EQ(scope, kTokenScope);
      ASSERT_FALSE(token_fetched_callback.is_null());
      on_token_fetched_ = token_fetched_callback;
     }
 
     void OnTokenFetched(const std::string& token,
                         const std::string& shared_secret) {
       ASSERT_FALSE(on_token_fetched_.is_null());
-      TokenFetchedCallback on_token_fetched = on_token_fetched_;
-      on_token_fetched_.Reset();
-      on_token_fetched.Run(token, shared_secret);
+      base::ResetAndReturn(&on_token_fetched_).Run(token, shared_secret);
     }
 
    private:
     TokenFetchedCallback on_token_fetched_;
   };
 
   class FakeTokenValidator : public TokenValidator {
    public:
     FakeTokenValidator()
      : token_url_(kTokenUrl),
        token_scope_(kTokenScope) {}
 
     ~FakeTokenValidator() override {}
 
     void ValidateThirdPartyToken(
         const std::string& token,
         const TokenValidatedCallback& token_validated_callback) override {
       ASSERT_FALSE(token_validated_callback.is_null());
       on_token_validated_ = token_validated_callback;
     }
 
     void OnTokenValidated(const std::string& shared_secret) {
       ASSERT_FALSE(on_token_validated_.is_null());
-      TokenValidatedCallback on_token_validated = on_token_validated_;
-      on_token_validated_.Reset();
-      on_token_validated.Run(shared_secret);
+      base::ResetAndReturn(&on_token_validated_).Run(shared_secret);
     }
 
     const GURL& token_url() const override { return token_url_; }
 
     const std::string& token_scope() const override { return token_scope_; }
 
    private:
     GURL token_url_;
     std::string token_scope_;
     base::Callback<void(const std::string& shared_secret)> on_token_validated_;
@@ skipping 110 matching lines @@
   ASSERT_EQ(Authenticator::PROCESSING_MESSAGE, host_->state());
   ASSERT_NO_FATAL_FAILURE(
       token_validator_->OnTokenValidated(kSharedSecret));
 
   // The end result is that the host rejected the fake authentication.
   ASSERT_EQ(Authenticator::REJECTED, client_->state());
 }
 
 }  // namespace protocol
 }  // namespace remoting