Used oneof in blimp_message.proto

blimp/net/blimp_message_multiplexer.cc

Index: blimp/net/blimp_message_multiplexer.cc
diff --git a/blimp/net/blimp_message_multiplexer.cc b/blimp/net/blimp_message_multiplexer.cc
index 0e53f3ed2c6cf4d3371d66d240d0b6333add5555..e92ea94fa5817937e9b9e84948c9bf1be52710a3 100644
--- a/blimp/net/blimp_message_multiplexer.cc
+++ b/blimp/net/blimp_message_multiplexer.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
+#include "blimp/common/create_blimp_message.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/net/blimp_message_processor.h"
 
@@ -15,7 +16,7 @@ namespace {
 class MultiplexedSender : public BlimpMessageProcessor {
  public:
   MultiplexedSender(base::WeakPtr<BlimpMessageProcessor> output_processor,
-                    BlimpMessage::Type type);
+                    BlimpMessage::FeatureCase type);
   ~MultiplexedSender() override;
 
   // BlimpMessageProcessor implementation.
@@ -25,14 +26,14 @@ class MultiplexedSender : public BlimpMessageProcessor {
 
  private:
   base::WeakPtr<BlimpMessageProcessor> output_processor_;
-  BlimpMessage::Type type_;
+  BlimpMessage::FeatureCase type_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiplexedSender);
 };
 
 MultiplexedSender::MultiplexedSender(
     base::WeakPtr<BlimpMessageProcessor> output_processor,
-    BlimpMessage::Type type)
+    BlimpMessage::FeatureCase type)
     : output_processor_(output_processor), type_(type) {}
 
 MultiplexedSender::~MultiplexedSender() {}
@@ -40,10 +41,10 @@ MultiplexedSender::~MultiplexedSender() {}
 void MultiplexedSender::ProcessMessage(
     std::unique_ptr<BlimpMessage> message,
     const net::CompletionCallback& callback) {
-  if (message->has_type()) {
-    DCHECK_EQ(type_, message->type());
+  if (message->feature_case() != BlimpMessage::FEATURE_NOT_SET) {
+    DCHECK_EQ(type_, message->feature_case());
   } else {
-    message->set_type(type_);
+    SetBlimpMessageType(message.get(), type_);

[Kevin M, 2016/05/16 22:58:02]

We should probably standardize on what message format is acceptable. Instead of
coercing a message to the appropriate type, can we just DCHECK if the
message->feature_case() == type_ and require that callers only provide well
formed messages?

[shaktisahu, 2016/05/17 01:21:32]

Done.

   }
   output_processor_->ProcessMessage(std::move(message), callback);
 }
@@ -57,7 +58,7 @@ BlimpMessageMultiplexer::BlimpMessageMultiplexer(
 BlimpMessageMultiplexer::~BlimpMessageMultiplexer() {}
 
 std::unique_ptr<BlimpMessageProcessor>
-BlimpMessageMultiplexer::CreateSenderForType(BlimpMessage::Type type) {
+BlimpMessageMultiplexer::CreateSenderForType(BlimpMessage::FeatureCase type) {
   return base::WrapUnique(
       new MultiplexedSender(output_weak_factory_.GetWeakPtr(), type));
 }