Used oneof in blimp_message.proto

blimp/net/blimp_message_output_buffer.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_output_buffer.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 117 matching lines @@
 void BlimpMessageOutputBuffer::WriteNextMessageIfReady() {
   DVLOG(3) << "WriteNextMessageIfReady";
   if (write_buffer_.empty()) {
     DVLOG(3) << "Nothing to write.";
     return;
   }
 
   std::unique_ptr<BlimpMessage> message_to_write(
       new BlimpMessage(*write_buffer_.front()->message));
   DVLOG(3) << "Writing message (id="
-           << write_buffer_.front()->message->message_id()
-           << ", type=" << message_to_write->type() << ")";
+           << write_buffer_.front()->message->message_id() << ", "

[Kevin M, 2016/05/20 18:28:16]

Nit: move the message_id logging portion into the common field extractors of
logging.cc so we are just logging *message_to_write.

[shaktisahu, 2016/05/20 22:29:42]

It might be too verbose in that case. I think we don't need the id everywhere to
be printed.
This is what it prints currently
BlimpMessage type=PROTOCOL_CONTROL subtype=CHECKPOINT_ACK checkpoint_id=1221117
byte_size=20

+           << *message_to_write << ")";
 
   output_processor_->ProcessMessage(std::move(message_to_write),
                                     write_complete_cb_.callback());
   DVLOG(3) << "Queue size: " << write_buffer_.size();
 }
 
 void BlimpMessageOutputBuffer::OnWriteComplete(int result) {
   DCHECK_LE(result, net::OK);
   VLOG(2) << "Write complete, result=" << result;
 
   if (result == net::OK) {
     ack_buffer_.push_back(std::move(write_buffer_.front()));
     write_buffer_.pop_front();
     WriteNextMessageIfReady();
   } else {
     // An error occurred while writing to the network connection.
     // Stop writing more messages until a new connection is established.
     DLOG(WARNING) << "Write error (result=" << result << ")";
   }
 }
 
 }  // namespace blimp