Used oneof in blimp_message.proto

blimp/net/blimp_message_demultiplexer.cc

Index: blimp/net/blimp_message_demultiplexer.cc
diff --git a/blimp/net/blimp_message_demultiplexer.cc b/blimp/net/blimp_message_demultiplexer.cc
index ab67c84fe3b1f39c496c304c4dcd8f7f10b92477..22ce7cda86c2912656b149721d1ef1e4d90982f7 100644
--- a/blimp/net/blimp_message_demultiplexer.cc
+++ b/blimp/net/blimp_message_demultiplexer.cc
@@ -17,13 +17,15 @@ BlimpMessageDemultiplexer::BlimpMessageDemultiplexer() {}
 
 BlimpMessageDemultiplexer::~BlimpMessageDemultiplexer() {}
 
-void BlimpMessageDemultiplexer::AddProcessor(BlimpMessage::Type type,
-                                             BlimpMessageProcessor* receiver) {
+void BlimpMessageDemultiplexer::AddProcessor(
+    BlimpMessage::FeatureCase feature_case,
+    BlimpMessageProcessor* receiver) {
   DCHECK(receiver);
-  if (feature_receiver_map_.find(type) == feature_receiver_map_.end()) {
-    feature_receiver_map_.insert(std::make_pair(type, receiver));
+  if (feature_receiver_map_.find(feature_case) == feature_receiver_map_.end()) {
+    feature_receiver_map_.insert(std::make_pair(feature_case, receiver));
   } else {
-    DLOG(FATAL) << "Handler already registered for type=" << type << ".";
+    DLOG(FATAL) << "Handler already registered for type=" << feature_case

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

"feature="

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

Done.

+                << ".";
   }
 }
 
@@ -31,7 +33,7 @@ void BlimpMessageDemultiplexer::ProcessMessage(
     std::unique_ptr<BlimpMessage> message,
     const net::CompletionCallback& callback) {
   DVLOG(2) << "ProcessMessage : " << *message;
-  auto receiver_iter = feature_receiver_map_.find(message->type());
+  auto receiver_iter = feature_receiver_map_.find(message->feature_case());
   if (receiver_iter == feature_receiver_map_.end()) {
     DLOG(ERROR) << "No registered receiver for " << *message << ".";
     if (!callback.is_null()) {