Make PacketReader/PacketWriter interfaces async-only.

blimp/net/blimp_message_pump.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_message_pump.h"
 
 #include "base/macros.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/net/blimp_message_processor.h"
 #include "blimp/net/common.h"
@@ skipping 22 matching lines @@
     buffer_->SetCapacity(kMaxPacketPayloadSizeBytes);
     ReadNextPacket();
   }
 }
 
 void BlimpMessagePump::ReadNextPacket() {
   DCHECK(processor_);
   buffer_->set_offset(0);
   read_packet_callback_.Reset(base::Bind(
       &BlimpMessagePump::OnReadPacketComplete, base::Unretained(this)));
-  int result =
-      reader_->ReadPacket(buffer_.get(), read_packet_callback_.callback());
-  if (result != net::ERR_IO_PENDING) {
-    // Read completed synchronously.
-    OnReadPacketComplete(result);
-  }
+  reader_->ReadPacket(buffer_.get(), read_packet_callback_.callback());

[Wez, 2015/11/30 21:33:24]

See my other comment re cancellable callbacks.

[Kevin M, 2015/12/01 01:50:27]

Done.

 }
 
 void BlimpMessagePump::OnReadPacketComplete(int result) {
-  if (result > 0) {
-    // The result is the size of the packet in bytes.
+  if (result == net::OK) {
     scoped_ptr<BlimpMessage> message(new BlimpMessage);
-    bool parse_result =
-        message->ParseFromArray(buffer_->StartOfBuffer(), result);
-    if (parse_result) {
+    if (message->ParseFromArray(buffer_->StartOfBuffer(), buffer_->offset())) {
       process_msg_callback_.Reset(base::Bind(
           &BlimpMessagePump::OnProcessMessageComplete, base::Unretained(this)));
       processor_->ProcessMessage(message.Pass(),
                                  process_msg_callback_.callback());
       return;
+    } else {

[Wez, 2015/11/30 21:33:24]

Never use constructs of the form if (condition) { ... return; } else { } - the
else ends up being redundant since if |condition| is true it can never be
reached, so it just obfuscates the code a little. :P

[Kevin M, 2015/12/01 01:50:27]

Done.

+      result = net::ERR_FAILED;
     }
-    result = net::ERR_FAILED;
   }
+
+  // Error reporting.
+  DCHECK_NE(net::OK, result);
   if (error_observer_)
     error_observer_->OnConnectionError(result);
 }
 
 void BlimpMessagePump::OnProcessMessageComplete(int result) {
   // No error is expected from the message receiver.
-  DCHECK_EQ(result, net::OK);
+  DCHECK_EQ(net::OK, result);
   ReadNextPacket();
 }
 
 }  // namespace blimp