Used oneof in blimp_message.proto

blimp/common/logging_unittest.cc

Index: blimp/common/logging_unittest.cc
diff --git a/blimp/common/logging_unittest.cc b/blimp/common/logging_unittest.cc
index d14f748d64df7c7a4e0e5c357ee97d4b419fe120..df7d263ec5be4ce6a7d69386f90313c75e04c3bf 100644
--- a/blimp/common/logging_unittest.cc
+++ b/blimp/common/logging_unittest.cc
@@ -43,7 +43,7 @@ class LoggingTest : public testing::Test {
 
 TEST_F(LoggingTest, Compositor) {
   BlimpMessage base_msg;
-  base_msg.set_type(BlimpMessage::COMPOSITOR);
+  base_msg.mutable_compositor();
   base_msg.set_target_tab_id(kTargetTab);
   VerifyLogOutput("type=COMPOSITOR render_widget_id=0 target_tab_id=123",
                   base_msg);
@@ -55,7 +55,6 @@ TEST_F(LoggingTest, Input) {
       " target_tab_id=123";
 
   BlimpMessage base_msg;
-  base_msg.set_type(BlimpMessage::INPUT);
   base_msg.set_target_tab_id(kTargetTab);
   base_msg.mutable_input()->set_type(InputMessage::Type_GestureScrollBegin);
   base_msg.mutable_input()->set_render_widget_id(1);
@@ -102,7 +101,7 @@ TEST_F(LoggingTest, Input) {
 
 TEST_F(LoggingTest, Navigation) {
   BlimpMessage base_msg;
-  base_msg.set_type(BlimpMessage::NAVIGATION);
+  base_msg.mutable_navigation();

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

Why do this? |navigation| is already being created on line 108.

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

Done.

   base_msg.set_target_tab_id(kTargetTab);
 
   BlimpMessage navigation_state_msg = base_msg;
@@ -152,7 +151,7 @@ TEST_F(LoggingTest, Navigation) {
 
 TEST_F(LoggingTest, TabControl) {
   BlimpMessage base_msg;
-  base_msg.set_type(BlimpMessage::TAB_CONTROL);
+  base_msg.mutable_tab_control();
   base_msg.set_target_tab_id(kTargetTab);
 
   BlimpMessage create_tab_msg = base_msg;
@@ -177,7 +176,7 @@ TEST_F(LoggingTest, TabControl) {
 
 TEST_F(LoggingTest, ProtocolControl) {
   BlimpMessage base_msg;
-  base_msg.set_type(BlimpMessage::PROTOCOL_CONTROL);
+  base_msg.mutable_protocol_control();

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

Ditto

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

Done.

 
   BlimpMessage start_connection_msg = base_msg;
   start_connection_msg.mutable_protocol_control()->set_type(
@@ -207,7 +206,6 @@ TEST_F(LoggingTest, ProtocolControl) {
 
 TEST_F(LoggingTest, RenderWidget) {
   BlimpMessage base_msg;
-  base_msg.set_type(BlimpMessage::RENDER_WIDGET);
   base_msg.mutable_render_widget()->set_render_widget_id(123);

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

Ditto

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

Not here I think.

 
   BlimpMessage initialize_msg = base_msg;
@@ -230,7 +228,6 @@ TEST_F(LoggingTest, RenderWidget) {
 
 TEST_F(LoggingTest, Settings) {
   BlimpMessage message;
-  message.set_type(BlimpMessage::SETTINGS);
   message.mutable_settings()
       ->mutable_engine_settings()
       ->set_record_whole_document(true);