Used oneof in blimp_message.proto

blimp/engine/session/blimp_engine_session.cc

Index: blimp/engine/session/blimp_engine_session.cc
diff --git a/blimp/engine/session/blimp_engine_session.cc b/blimp/engine/session/blimp_engine_session.cc
index 037f3e809d30393841b0a99c16204d2f07593f35..15f4f0f1dcd15bdbe6209bcdb24826ce53c3c052 100644
--- a/blimp/engine/session/blimp_engine_session.cc
+++ b/blimp/engine/session/blimp_engine_session.cc
@@ -293,25 +293,25 @@ void BlimpEngineSession::RegisterFeatures() {
 
   // Register features' message senders and receivers.
   tab_control_message_sender_ =
-      thread_pipe_manager_->RegisterFeature(BlimpMessage::TAB_CONTROL, this);
+      thread_pipe_manager_->RegisterFeature(BlimpMessage::kTabControl, this);
   navigation_message_sender_ =
-      thread_pipe_manager_->RegisterFeature(BlimpMessage::NAVIGATION, this);
+      thread_pipe_manager_->RegisterFeature(BlimpMessage::kNavigation, this);
   render_widget_feature_.set_render_widget_message_sender(
-      thread_pipe_manager_->RegisterFeature(BlimpMessage::RENDER_WIDGET,
+      thread_pipe_manager_->RegisterFeature(BlimpMessage::kRenderWidget,
                                             &render_widget_feature_));
   render_widget_feature_.set_input_message_sender(
-      thread_pipe_manager_->RegisterFeature(BlimpMessage::INPUT,
+      thread_pipe_manager_->RegisterFeature(BlimpMessage::kInput,
                                             &render_widget_feature_));
   render_widget_feature_.set_compositor_message_sender(
-      thread_pipe_manager_->RegisterFeature(BlimpMessage::COMPOSITOR,
+      thread_pipe_manager_->RegisterFeature(BlimpMessage::kCompositor,
                                             &render_widget_feature_));
   render_widget_feature_.set_ime_message_sender(
-      thread_pipe_manager_->RegisterFeature(BlimpMessage::IME,
+      thread_pipe_manager_->RegisterFeature(BlimpMessage::kIme,
                                             &render_widget_feature_));
 
   // The Settings feature does not need an outgoing message processor, since we
   // don't send any messages to the client right now.
-  thread_pipe_manager_->RegisterFeature(BlimpMessage::SETTINGS,
+  thread_pipe_manager_->RegisterFeature(BlimpMessage::kSettings,
                                         &settings_feature_);
 }
 
@@ -454,11 +454,11 @@ void BlimpEngineSession::ProcessMessage(
   TRACE_EVENT1("blimp", "BlimpEngineSession::ProcessMessage", "TabId",
                message->target_tab_id());
   DCHECK(!callback.is_null());
-  DCHECK(message->type() == BlimpMessage::TAB_CONTROL ||
-         message->type() == BlimpMessage::NAVIGATION);
+  DCHECK(BlimpMessage::kTabControl == message->feature_case() ||
+         BlimpMessage::kNavigation == message->feature_case());
 
   net::Error result = net::OK;
-  if (message->type() == BlimpMessage::TAB_CONTROL) {
+  if (message->has_tab_control()) {

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

Check the feature case

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

Why? We are already doing that in the DCHECK above. And it is much cleaner.

[Kevin M, 2016/05/21 00:32:05]

Consistency in how we are checking the type. In some places, we check
feature_case(), and in others, we check has_x(). I don't feel strongly about
this point, however.

     switch (message->tab_control().type()) {
       case TabControlMessage::CREATE_TAB:
         if (!CreateWebContents(message->target_tab_id()))
@@ -475,7 +475,7 @@ void BlimpEngineSession::ProcessMessage(
         NOTIMPLEMENTED();
         result = net::ERR_NOT_IMPLEMENTED;
     }
-  } else if (message->type() == BlimpMessage::NAVIGATION && web_contents_) {
+  } else if (message->has_navigation() && web_contents_) {

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

Check the feature case

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

Ditto

     switch (message->navigation().type()) {
       case NavigationMessage::LOAD_URL:
         LoadUrl(message->target_tab_id(),