Use base::ResetAndReturn() in remoting.

remoting/test/access_token_fetcher.cc

 // Copyright 2015 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/test/access_token_fetcher.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
+#include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/google_api_keys.h"
 #include "net/url_request/url_fetcher.h"
 #include "remoting/base/url_request_context_getter.h"
 
 namespace {
 const int kMaxGetTokensRetries = 3;
@@ skipping 121 matching lines @@
 
     LOG(ERROR) << "OnGetTokenInfoResponse returned an error. "
                << "error: " << error_string << ", "
                << "description: " << error_description;
     access_token_.clear();
     refresh_token_.clear();
   } else {
     DVLOG(1) << "Access Token has been validated";
   }
 
-  access_token_callback_.Run(access_token_, refresh_token_);
-  access_token_callback_.Reset();
+  base::ResetAndReturn(&access_token_callback_)
+      .Run(access_token_, refresh_token_);
 }
 
 void AccessTokenFetcher::OnOAuthError() {
   LOG(ERROR) << "AccessTokenFetcher::OnOAuthError() Called";
 
   access_token_.clear();
   refresh_token_.clear();
 
-  access_token_callback_.Run(access_token_, refresh_token_);
-  access_token_callback_.Reset();
+  base::ResetAndReturn(&access_token_callback_)
+      .Run(access_token_, refresh_token_);
 }
 
 void AccessTokenFetcher::OnNetworkError(int response_code) {
   LOG(ERROR) << "AccessTokenFetcher::OnNetworkError() Called";
   LOG(ERROR) << "response code: " << response_code;
 
   access_token_.clear();
   refresh_token_.clear();
 
-  access_token_callback_.Run(access_token_, refresh_token_);
-  access_token_callback_.Reset();
+  base::ResetAndReturn(&access_token_callback_)
+      .Run(access_token_, refresh_token_);
 }
 
 void AccessTokenFetcher::ValidateAccessToken() {
   DVLOG(2) << "Calling GetTokenInfo to validate access token";
 
   // Create a new GaiaOAuthClient for each request to GAIA.
   CreateNewGaiaOAuthClientInstance();
   auth_client_->GetTokenInfo(access_token_, kMaxGetTokensRetries,
                              this);  // GaiaOAuthClient::Delegate* delegate
 }
 
 }  // namespace test
 }  // namespace remoting