Used oneof in blimp_message.proto

blimp/common/logging_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sstream>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/strings/stringprintf.h"
 #include "blimp/common/logging.h"
@@ skipping 25 matching lines @@
   LoggingTest() {}
   ~LoggingTest() override {}
 
  private:
   // Deletes the singleton on test termination.
   base::ShadowingAtExitManager at_exit_;
 };
 
 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);
 }
 
 TEST_F(LoggingTest, Input) {
   const char* fragment_format =
       "type=INPUT render_widget_id=1 timestamp_seconds=2.000000 subtype=%s"
       " 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);
   base_msg.mutable_input()->set_timestamp_seconds(2);
   VerifyLogOutput(base::StringPrintf(fragment_format, "GestureScrollBegin"),
                   base_msg);
 
   base_msg.mutable_input()->set_type(InputMessage::Type_GestureScrollEnd);
   VerifyLogOutput(base::StringPrintf(fragment_format, "GestureScrollEnd"),
                   base_msg);
@@ skipping 26 matching lines @@
       ->mutable_gesture_fling_cancel()
       ->set_prevent_boosting(true);
   VerifyLogOutput(
       "type=INPUT render_widget_id=1 timestamp_seconds=2.000000 "
       "subtype=GestureFlingCancel prevent_boosting=true target_tab_id=123",
       base_msg);
 }
 
 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;
   navigation_state_msg.mutable_navigation()->set_type(
       NavigationMessage::NAVIGATION_STATE_CHANGED);
   navigation_state_msg.mutable_navigation()
       ->mutable_navigation_state_changed()
       ->set_url("http://foo.com");
   navigation_state_msg.mutable_navigation()
       ->mutable_navigation_state_changed()
@@ skipping 29 matching lines @@
                   go_forward_msg);
 
   BlimpMessage reload_msg = base_msg;
   reload_msg.mutable_navigation()->set_type(NavigationMessage::RELOAD);
   VerifyLogOutput("type=NAVIGATION subtype=RELOAD target_tab_id=123",
                   reload_msg);
 }
 
 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;
   create_tab_msg.mutable_tab_control()->set_type(TabControlMessage::CREATE_TAB);
   VerifyLogOutput("type=TAB_CONTROL subtype=CREATE_TAB target_tab_id=123",
                   create_tab_msg);
 
   BlimpMessage close_tab_msg = base_msg;
   close_tab_msg.mutable_tab_control()->set_type(TabControlMessage::CLOSE_TAB);
   VerifyLogOutput("type=TAB_CONTROL subtype=CLOSE_TAB target_tab_id=123",
                   close_tab_msg);
 
   BlimpMessage size_msg = base_msg;
   size_msg.mutable_tab_control()->set_type(TabControlMessage::SIZE);
   size_msg.mutable_tab_control()->mutable_size()->set_width(640);
   size_msg.mutable_tab_control()->mutable_size()->set_height(480);
   size_msg.mutable_tab_control()->mutable_size()->set_device_pixel_ratio(2);
   VerifyLogOutput(
       "type=TAB_CONTROL subtype=SIZE size=640x480:2.00 target_tab_id=123",
       size_msg);
 }
 
 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(
       ProtocolControlMessage::START_CONNECTION);
   start_connection_msg.mutable_protocol_control()
       ->mutable_start_connection()
       ->set_client_token("token");
   start_connection_msg.mutable_protocol_control()
       ->mutable_start_connection()
       ->set_protocol_version(2);
   VerifyLogOutput(
       "type=PROTOCOL_CONTROL subtype=START_CONNECTION "
       "client_token=\"token\" protocol_version=2",
       start_connection_msg);
 
   BlimpMessage checkpoint_msg = base_msg;
   start_connection_msg.mutable_protocol_control()->set_type(
       ProtocolControlMessage::CHECKPOINT_ACK);
   start_connection_msg.mutable_protocol_control()
       ->mutable_checkpoint_ack()
       ->set_checkpoint_id(123);
   VerifyLogOutput(
       "type=PROTOCOL_CONTROL subtype=CHECKPOINT_ACK "
       "checkpoint_id=123",
       start_connection_msg);
 }
 
 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;
   initialize_msg.mutable_render_widget()->set_type(
       RenderWidgetMessage::INITIALIZE);
   VerifyLogOutput("type=RENDER_WIDGET subtype=INITIALIZE render_widget_id=123",
                   initialize_msg);
 
   BlimpMessage created_msg = base_msg;
   created_msg.mutable_render_widget()->set_type(
       RenderWidgetMessage::CREATED);
   VerifyLogOutput("type=RENDER_WIDGET subtype=CREATED render_widget_id=123",
                   created_msg);
 
   BlimpMessage deleted_msg = base_msg;
   deleted_msg.mutable_render_widget()->set_type(RenderWidgetMessage::DELETED);
   VerifyLogOutput("type=RENDER_WIDGET subtype=DELETED render_widget_id=123",
                   deleted_msg);
 }
 
 TEST_F(LoggingTest, Settings) {
   BlimpMessage message;
-  message.set_type(BlimpMessage::SETTINGS);
   message.mutable_settings()
       ->mutable_engine_settings()
       ->set_record_whole_document(true);
   message.mutable_settings()->mutable_engine_settings()->set_client_os_info(
       "wibble");
   VerifyLogOutput(
       "type=SETTINGS subtype=ENGINE_SETTINGS record_whole_document=true "
       "client_os_info=\"wibble\"",
       message);
 }
 
 }  // namespace
 }  // namespace blimp