Use base::ResetAndReturn() in remoting.

remoting/protocol/fake_stream_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_stream_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 20 matching lines @@
   // Complete pending read if any.
   if (!read_callback_.is_null()) {
     int result = std::min(read_buffer_size_,
                           static_cast<int>(input_data_.size() - input_pos_));
     EXPECT_GT(result, 0);
     memcpy(read_buffer_->data(),
            &(*input_data_.begin()) + input_pos_, result);
     input_pos_ += result;
     read_buffer_ = nullptr;
 
-    net::CompletionCallback callback = read_callback_;
-    read_callback_.Reset();
-    callback.Run(result);
+    base::ResetAndReturn(&read_callback_).Run(result);
   }
 }
 
 void FakeStreamSocket::PairWith(FakeStreamSocket* peer_socket) {
   EXPECT_TRUE(task_runner_->BelongsToCurrentThread());
   peer_socket_ = peer_socket->GetWeakPtr();
   peer_socket->peer_socket_ = GetWeakPtr();
 }
 
 base::WeakPtr<FakeStreamSocket> FakeStreamSocket::GetWeakPtr() {
@@ skipping 207 matching lines @@
   if (channels_.find(name) != channels_.end())
     callback.Run(owned_channel.Pass());
 }
 
 void FakeStreamChannelFactory::CancelChannelCreation(const std::string& name) {
   channels_.erase(name);
 }
 
 }  // namespace protocol
 }  // namespace remoting