Use base::ResetAndReturn() in remoting.

remoting/test/access_token_fetcher.cc

Index: remoting/test/access_token_fetcher.cc
diff --git a/remoting/test/access_token_fetcher.cc b/remoting/test/access_token_fetcher.cc
index 4fa690e74a299542c514c75bc7d4c8474ba29a70..a7f0dcb6033ed22d4ff301ab2db912a31eacfac3 100644
--- a/remoting/test/access_token_fetcher.cc
+++ b/remoting/test/access_token_fetcher.cc
@@ -8,6 +8,7 @@
 #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"
@@ -149,8 +150,8 @@ void AccessTokenFetcher::OnGetTokenInfoResponse(
     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() {
@@ -159,8 +160,8 @@ void AccessTokenFetcher::OnOAuthError() {
   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) {
@@ -170,8 +171,8 @@ void AccessTokenFetcher::OnNetworkError(int 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() {