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 dc30c4581f59e2353c0018fd9eeca31a0f95020b..452f5e8969d82c0c87b21299c71e7031c8649716 100644
--- a/blimp/engine/session/blimp_engine_session.cc
+++ b/blimp/engine/session/blimp_engine_session.cc
@@ -279,25 +279,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_);
 }
 
@@ -440,11 +440,10 @@ 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(message->has_tab_control() || message->has_navigation());
 
   net::Error result = net::OK;
-  if (message->type() == BlimpMessage::TAB_CONTROL) {
+  if (message->has_tab_control()) {

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

Check the case instead

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

I added it in the DCHECK above

     switch (message->tab_control().type()) {
       case TabControlMessage::CREATE_TAB:
         if (!CreateWebContents(message->target_tab_id()))
@@ -461,7 +460,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/02 17:47:48]

ditto

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

Same as above.

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