Use base::ResetAndReturn() in remoting.

remoting/host/setup/host_starter.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/host/setup/host_starter.h"
 
 #include "base/bind.h"
+#include "base/callback_helpers.h"
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "google_apis/google_api_keys.h"
 #include "remoting/host/pin_hash.h"
 #include "remoting/host/setup/oauth_helper.h"
 
 namespace {
 const int kMaxGetTokensRetries = 3;
@@ skipping 159 matching lines @@
   if (!main_task_runner_->BelongsToCurrentThread()) {
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
         &HostStarter::OnHostStarted, weak_ptr_, result));
     return;
   }
   if (result != DaemonController::RESULT_OK) {
     unregistering_host_ = true;
     service_client_->UnregisterHost(host_id_, access_token_, this);
     return;
   }
-  CompletionCallback cb = on_done_;
-  on_done_.Reset();
-  cb.Run(START_COMPLETE);
+  base::ResetAndReturn(&on_done_).Run(START_COMPLETE);
 }
 
 void HostStarter::OnOAuthError() {
   if (!main_task_runner_->BelongsToCurrentThread()) {
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
         &HostStarter::OnOAuthError, weak_ptr_));
     return;
   }
-  CompletionCallback cb = on_done_;
-  on_done_.Reset();
   if (unregistering_host_) {
     LOG(ERROR) << "OAuth error occurred when unregistering host.";
-    cb.Run(START_ERROR);
-  } else {
-    cb.Run(OAUTH_ERROR);
   }
+
+  base::ResetAndReturn(&on_done_)
+      .Run(unregistering_host_ ? START_ERROR : OAUTH_ERROR);
 }
 
 void HostStarter::OnNetworkError(int response_code) {
   if (!main_task_runner_->BelongsToCurrentThread()) {
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
         &HostStarter::OnNetworkError, weak_ptr_, response_code));
     return;
   }
-  CompletionCallback cb = on_done_;
-  on_done_.Reset();
   if (unregistering_host_) {
     LOG(ERROR) << "Network error occurred when unregistering host.";
-    cb.Run(START_ERROR);
-  } else {
-    cb.Run(NETWORK_ERROR);
   }
+
+  base::ResetAndReturn(&on_done_)
+      .Run(unregistering_host_ ? START_ERROR : NETWORK_ERROR);
 }
 
 void HostStarter::OnHostUnregistered() {
   if (!main_task_runner_->BelongsToCurrentThread()) {
     main_task_runner_->PostTask(FROM_HERE, base::Bind(
         &HostStarter::OnHostUnregistered, weak_ptr_));
     return;
   }
-  CompletionCallback cb = on_done_;
-  on_done_.Reset();
-  cb.Run(START_ERROR);
+  base::ResetAndReturn(&on_done_).Run(START_ERROR);
 }
 
 }  // namespace remoting