Use base::ResetAndReturn() in remoting.

remoting/protocol/fake_datagram_socket.cc

 // Copyright 2014 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_datagram_socket.h"
 
 #include "base/bind.h"
+#include "base/callback_helpers.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "net/base/address_list.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
 namespace protocol {
@@ skipping 11 matching lines @@
 void FakeDatagramSocket::AppendInputPacket(const std::string& data) {
   EXPECT_TRUE(task_runner_->BelongsToCurrentThread());
   input_packets_.push_back(data);
 
   // Complete pending read if any.
   if (!read_callback_.is_null()) {
     DCHECK_EQ(input_pos_, static_cast<int>(input_packets_.size()) - 1);
     int result = CopyReadData(read_buffer_.get(), read_buffer_size_);
     read_buffer_ = nullptr;
 
-    net::CompletionCallback callback = read_callback_;
-    read_callback_.Reset();
-    callback.Run(result);
+    base::ResetAndReturn(&read_callback_).Run(result);
   }
 }
 
 void FakeDatagramSocket::PairWith(FakeDatagramSocket* peer_socket) {
   EXPECT_TRUE(task_runner_->BelongsToCurrentThread());
   peer_socket_ = peer_socket->GetWeakPtr();
   peer_socket->peer_socket_ = GetWeakPtr();
 }
 
 base::WeakPtr<FakeDatagramSocket> FakeDatagramSocket::GetWeakPtr() {
@@ skipping 109 matching lines @@
     callback.Run(owned_socket.Pass());
 }
 
 void FakeDatagramChannelFactory::CancelChannelCreation(
     const std::string& name) {
   channels_.erase(name);
 }
 
 }  // namespace protocol
 }  // namespace remoting