Make PacketReader/PacketWriter interfaces async-only.

blimp/net/blimp_connection.cc

 // Copyright 2015 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 "blimp/net/blimp_connection.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 22 matching lines @@
   // BlimpMessageProcessor implementation.
   void ProcessMessage(scoped_ptr<BlimpMessage> message,
                       const net::CompletionCallback& callback) override;
 
  private:
   void OnWritePacketComplete(int result);
 
   PacketWriter* writer_;
   ConnectionErrorObserver* error_observer_;
   scoped_refptr<net::DrainableIOBuffer> buffer_;
-  net::CancelableCompletionCallback write_packet_callback_;
   net::CompletionCallback pending_process_msg_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpMessageSender);
 };
 
 BlimpMessageSender::BlimpMessageSender(PacketWriter* writer)
     : writer_(writer),
       buffer_(new net::DrainableIOBuffer(
           new net::IOBuffer(kMaxPacketPayloadSizeBytes),
           kMaxPacketPayloadSizeBytes)) {
@@ skipping 11 matching lines @@
     return;
   }
 
   buffer_->SetOffset(0);
   if (!message->SerializeToArray(buffer_->data(), message->ByteSize())) {
     DLOG(ERROR) << "Failed to serialize message.";
     callback.Run(net::ERR_INVALID_ARGUMENT);
     return;
   }
 
-  write_packet_callback_.Reset(base::Bind(
-      &BlimpMessageSender::OnWritePacketComplete, base::Unretained(this)));
   pending_process_msg_callback_ = callback;
-  int result = writer_->WritePacket(buffer_, write_packet_callback_.callback());
-  if (result != net::ERR_IO_PENDING) {
-    base::MessageLoop::current()->PostTask(
-        FROM_HERE, base::Bind(write_packet_callback_.callback(), result));
-  }
+  writer_->WritePacket(buffer_,
+                       base::Bind(&BlimpMessageSender::OnWritePacketComplete,
+                                  base::Unretained(this)));
 }
 
 void BlimpMessageSender::OnWritePacketComplete(int result) {
   DCHECK_NE(net::ERR_IO_PENDING, result);
-  write_packet_callback_.Cancel();
   base::ResetAndReturn(&pending_process_msg_callback_).Run(result);
   if (result != net::OK) {
     error_observer_->OnConnectionError(result);
   }
 }
 
 }  // namespace
 
 BlimpConnection::BlimpConnection(scoped_ptr<PacketReader> reader,
                                  scoped_ptr<PacketWriter> writer)
@@ skipping 17 matching lines @@
 void BlimpConnection::SetIncomingMessageProcessor(
     BlimpMessageProcessor* processor) {
   message_pump_->SetMessageProcessor(processor);
 }
 
 BlimpMessageProcessor* BlimpConnection::GetOutgoingMessageProcessor() const {
   return outgoing_msg_processor_.get();
 }
 
 }  // namespace blimp