Use base::ResetAndReturn() in remoting.

remoting/host/setup/daemon_controller_delegate_mac.mm

 // 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 <CoreFoundation/CoreFoundation.h>
 
 #include "remoting/host/setup/daemon_controller_delegate_mac.h"
 
 #include <launch.h>
 #include <stdio.h>
 #include <sys/types.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
+#include "base/callback_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/launchd.h"
 #include "base/mac/mac_logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_launch_data.h"
 #include "base/time/time.h"
@@ skipping 143 matching lines @@
           kCFCompareEqualTo) {
     result = DaemonController::RESULT_OK;
   } else if (CFStringCompare(name, CFSTR(UPDATE_FAILED_NOTIFICATION_NAME), 0) ==
           kCFCompareEqualTo) {
     result = DaemonController::RESULT_FAILED;
   } else {
     LOG(WARNING) << "Ignoring unexpected notification: " << name;
     return;
   }
 
+  DeregisterForPreferencePaneNotifications();
+
   DCHECK(!current_callback_.is_null());
-  DaemonController::CompletionCallback done = current_callback_;
-  current_callback_.Reset();
-  done.Run(result);
-
-  DeregisterForPreferencePaneNotifications();
+  base::ResetAndReturn(&current_callback_).Run(result);
 }
 
 // static
 bool DaemonControllerDelegateMac::DoShowPreferencePane(
     const std::string& config_data) {
   if (!config_data.empty()) {
     base::FilePath config_path;
     if (!base::GetTempDir(&config_path)) {
       LOG(ERROR) << "Failed to get filename for saving configuration data.";
       return false;
@@ skipping 56 matching lines @@
   self->PreferencePaneCallbackDelegate(name);
 }
 
 scoped_refptr<DaemonController> DaemonController::Create() {
   scoped_ptr<DaemonController::Delegate> delegate(
       new DaemonControllerDelegateMac());
   return new DaemonController(delegate.Pass());
 }
 
 }  // namespace remoting