Used oneof in blimp_message.proto

blimp/common/create_blimp_message.cc

Index: blimp/common/create_blimp_message.cc
diff --git a/blimp/common/create_blimp_message.cc b/blimp/common/create_blimp_message.cc
index 43d4377803623c65b5afcbb09a33391869ff370b..7ba7642c19ccf5cecaf3708093044bf3b1923b81 100644
--- a/blimp/common/create_blimp_message.cc
+++ b/blimp/common/create_blimp_message.cc
@@ -21,7 +21,6 @@ std::unique_ptr<BlimpMessage> CreateBlimpMessage(
     int target_tab_id) {
   DCHECK(compositor_message);
   std::unique_ptr<BlimpMessage> output(new BlimpMessage);
-  output->set_type(BlimpMessage::COMPOSITOR);
   output->set_target_tab_id(target_tab_id);
   *compositor_message = output->mutable_compositor();
   return output;
@@ -31,7 +30,6 @@ std::unique_ptr<BlimpMessage> CreateBlimpMessage(
     TabControlMessage** control_message) {
   DCHECK(control_message);
   std::unique_ptr<BlimpMessage> output(new BlimpMessage);
-  output->set_type(BlimpMessage::TAB_CONTROL);
   *control_message = output->mutable_tab_control();
   return output;
 }
@@ -39,7 +37,6 @@ std::unique_ptr<BlimpMessage> CreateBlimpMessage(
 std::unique_ptr<BlimpMessage> CreateBlimpMessage(InputMessage** input_message) {
   DCHECK(input_message);
   std::unique_ptr<BlimpMessage> output(new BlimpMessage);
-  output->set_type(BlimpMessage::INPUT);
   *input_message = output->mutable_input();
   return output;
 }
@@ -49,7 +46,6 @@ std::unique_ptr<BlimpMessage> CreateBlimpMessage(
     int target_tab_id) {
   DCHECK(navigation_message);
   std::unique_ptr<BlimpMessage> output(new BlimpMessage);
-  output->set_type(BlimpMessage::NAVIGATION);
   output->set_target_tab_id(target_tab_id);
   *navigation_message = output->mutable_navigation();
   return output;
@@ -59,7 +55,6 @@ std::unique_ptr<BlimpMessage> CreateBlimpMessage(ImeMessage** ime_message,
                                                  int target_tab_id) {
   DCHECK(ime_message);
   std::unique_ptr<BlimpMessage> output(new BlimpMessage);
-  output->set_type(BlimpMessage::IME);
   output->set_target_tab_id(target_tab_id);
   *ime_message = output->mutable_ime();
   return output;
@@ -70,7 +65,6 @@ std::unique_ptr<BlimpMessage> CreateBlimpMessage(
     int target_tab_id) {
   DCHECK(render_widget_message);
   std::unique_ptr<BlimpMessage> output(new BlimpMessage);
-  output->set_type(BlimpMessage::RENDER_WIDGET);
   output->set_target_tab_id(target_tab_id);
   *render_widget_message = output->mutable_render_widget();
   return output;
@@ -89,7 +83,6 @@ std::unique_ptr<BlimpMessage> CreateBlimpMessage(
     EngineSettingsMessage** engine_settings) {
   DCHECK(engine_settings);
   std::unique_ptr<BlimpMessage> output(new BlimpMessage);
-  output->set_type(BlimpMessage::SETTINGS);
   *engine_settings = output->mutable_settings()->mutable_engine_settings();
   return output;
 }
@@ -98,7 +91,6 @@ std::unique_ptr<BlimpMessage> CreateStartConnectionMessage(
     const std::string& client_token,
     int protocol_version) {
   std::unique_ptr<BlimpMessage> output(new BlimpMessage);
-  output->set_type(BlimpMessage::PROTOCOL_CONTROL);
 
   ProtocolControlMessage* control_message = output->mutable_protocol_control();
   control_message->set_type(ProtocolControlMessage::START_CONNECTION);
@@ -114,7 +106,6 @@ std::unique_ptr<BlimpMessage> CreateStartConnectionMessage(
 std::unique_ptr<BlimpMessage> CreateCheckpointAckMessage(
     int64_t checkpoint_id) {
   std::unique_ptr<BlimpMessage> output(new BlimpMessage);
-  output->set_type(BlimpMessage::PROTOCOL_CONTROL);
 
   ProtocolControlMessage* control_message = output->mutable_protocol_control();
   control_message->set_type(ProtocolControlMessage::CHECKPOINT_ACK);
@@ -126,4 +117,36 @@ std::unique_ptr<BlimpMessage> CreateCheckpointAckMessage(
   return output;
 }
 
+void SetBlimpMessageType(BlimpMessage* message,

[Kevin M, 2016/05/02 17:47:48]

The body of this function is trivial enough that I'm not sure if this is saving
the caller any effort. I would recommend not using a helper function.

[shaktisahu, 2016/05/16 20:19:02]

I agree that it looks a little weird. However, I still need this function in two
places, (blimp/net/blimp_message_multiplexer.cc and
blimp/net/thread_pipe_manager_unittest.cc)
Let me know if you strongly feel about it.

+                         BlimpMessage::FeatureCase type) {
+  switch (type) {
+    case BlimpMessage::kTabControl:
+      message->mutable_tab_control();
+      break;
+    case BlimpMessage::kNavigation:
+      message->mutable_navigation();
+      break;
+    case BlimpMessage::kRenderWidget:
+      message->mutable_render_widget();
+      break;
+    case BlimpMessage::kInput:
+      message->mutable_input();
+      break;
+    case BlimpMessage::kCompositor:
+      message->mutable_compositor();
+      break;
+    case BlimpMessage::kProtocolControl:
+      message->mutable_protocol_control();
+      break;
+    case BlimpMessage::kIme:
+      message->mutable_ime();
+      break;
+    case BlimpMessage::kSettings:
+      message->mutable_settings();
+      break;
+    default:
+      NOTREACHED();
+  }
+}
+
 }  // namespace blimp