Used oneof in blimp_message.proto

blimp/net/blimp_message_checkpointer.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_checkpointer.h"
 
 #include "base/logging.h"
 #include "blimp/common/create_blimp_message.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/common/proto/protocol_control.pb.h"
@@ skipping 17 matching lines @@
   DCHECK(incoming_processor_);
   DCHECK(outgoing_processor_);
   DCHECK(checkpoint_observer_);
 }
 
 BlimpMessageCheckpointer::~BlimpMessageCheckpointer() {}
 
 void BlimpMessageCheckpointer::ProcessMessage(
     std::unique_ptr<BlimpMessage> message,
     const net::CompletionCallback& callback) {
-  if (message->type() == BlimpMessage::PROTOCOL_CONTROL &&
-      message->protocol_control().type() ==
-          ProtocolControlMessage::CHECKPOINT_ACK) {
+  if (message->has_protocol_control()) {

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

Check the feature case

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

Why? We are already doing that in the DCHECK above. And it is much cleaner.

     if (message->protocol_control().has_checkpoint_ack() &&

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

Check the case here too

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

Ditto

         message->protocol_control().checkpoint_ack().has_checkpoint_id()) {
       checkpoint_observer_->OnMessageCheckpoint(
           message->protocol_control().checkpoint_ack().checkpoint_id());
       callback.Run(net::OK);
     } else {
       DLOG(WARNING) << "Invalid checkpoint ACK. Dropping connection.";
       callback.Run(net::ERR_FAILED);
     }
 
     return;
@@ skipping 24 matching lines @@
     int result) {
   callback.Run(result);
 }
 
 void BlimpMessageCheckpointer::SendCheckpointAck() {
   outgoing_processor_->ProcessMessage(
       CreateCheckpointAckMessage(checkpoint_id_), net::CompletionCallback());
 }
 
 }  // namespace blimp