Use base::ResetAndReturn() in remoting.

remoting/protocol/fake_authenticator.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/protocol/fake_authenticator.h"
 
+#include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/socket/stream_socket.h"
 #include "remoting/base/constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 
 namespace remoting {
@@ skipping 58 matching lines @@
 
 void FakeChannelAuthenticator::OnAuthBytesRead(int result) {
   EXPECT_EQ(1, result);
   EXPECT_FALSE(did_read_bytes_);
   did_read_bytes_ = true;
   if (did_write_bytes_)
     CallDoneCallback();
 }
 
 void FakeChannelAuthenticator::CallDoneCallback() {
-  DoneCallback callback = done_callback_;
-  done_callback_.Reset();
   if (result_ != net::OK)
     socket_.reset();
-  callback.Run(result_, socket_.Pass());
+  base::ResetAndReturn(&done_callback_).Run(result_, socket_.Pass());
 }
 
 FakeAuthenticator::FakeAuthenticator(
     Type type, int round_trips, Action action, bool async)
     : type_(type),
       round_trips_(round_trips),
       action_(action),
       async_(async),
       messages_(0),
       messages_till_started_(0) {
@@ skipping 90 matching lines @@
   FakeAuthenticator* authenticator = new FakeAuthenticator(
       FakeAuthenticator::HOST, round_trips_, action_, async_);
   authenticator->set_messages_till_started(messages_till_started_);
 
   scoped_ptr<Authenticator> result(authenticator);
   return result.Pass();
 }
 
 }  // namespace protocol
 }  // namespace remoting