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..69dd9d3f09e99898a1f6fdd569eb1b29d1786868 100644
--- a/blimp/common/create_blimp_message.cc
+++ b/blimp/common/create_blimp_message.cc
@@ -19,9 +19,7 @@ namespace blimp {
 std::unique_ptr<BlimpMessage> CreateBlimpMessage(
     CompositorMessage** compositor_message,
     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;
@@ -29,17 +27,13 @@ std::unique_ptr<BlimpMessage> CreateBlimpMessage(
 
 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;
 }
 
 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;
 }
@@ -47,9 +41,7 @@ std::unique_ptr<BlimpMessage> CreateBlimpMessage(InputMessage** input_message) {
 std::unique_ptr<BlimpMessage> CreateBlimpMessage(
     NavigationMessage** navigation_message,
     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;
@@ -57,9 +49,7 @@ std::unique_ptr<BlimpMessage> CreateBlimpMessage(
 
 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;
@@ -68,9 +58,7 @@ std::unique_ptr<BlimpMessage> CreateBlimpMessage(ImeMessage** ime_message,
 std::unique_ptr<BlimpMessage> CreateBlimpMessage(
     RenderWidgetMessage** render_widget_message,
     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;
@@ -87,9 +75,7 @@ std::unique_ptr<BlimpMessage> CreateBlimpMessage(SizeMessage** size_message) {
 
 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,10 +84,9 @@ 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);
+  control_message->mutable_start_connection();
 
   StartConnectionMessage* start_connection_message =
       control_message->mutable_start_connection();
@@ -114,10 +99,9 @@ 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);
+  control_message->mutable_checkpoint_ack();
 
   CheckpointAckMessage* checkpoint_ack_message =
       control_message->mutable_checkpoint_ack();