Used oneof in blimp_message.proto

blimp/client/feature/render_widget_feature.cc

 // Copyright 2015 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 "blimp/client/feature/render_widget_feature.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "blimp/common/create_blimp_message.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/common/proto/compositor.pb.h"
@@ skipping 65 matching lines @@
 void RenderWidgetFeature::RemoveDelegate(const int tab_id) {
   DelegateMap::iterator it = delegates_.find(tab_id);
   if (it != delegates_.end())
     delegates_.erase(it);
 }
 
 void RenderWidgetFeature::ProcessMessage(
     std::unique_ptr<BlimpMessage> message,
     const net::CompletionCallback& callback) {
   DCHECK(!callback.is_null());
-  DCHECK(message->type() == BlimpMessage::RENDER_WIDGET ||
-         message->type() == BlimpMessage::COMPOSITOR);
+  DCHECK(BlimpMessage::kRenderWidget == message->feature_case() ||
+         BlimpMessage::kCompositor == message->feature_case());

[Wez, 2016/05/18 01:53:31]

Suggest DCHECK(has_render_widget() || has_compositor()) here.

[shaktisahu, 2016/05/18 03:55:42]

ditto

 
   int target_tab_id = message->target_tab_id();
   RenderWidgetFeatureDelegate* delegate = FindDelegate(target_tab_id);
   DCHECK(delegate) << "RenderWidgetFeatureDelegate not found for "
       << target_tab_id;
 
-  switch (message->type()) {
-    case BlimpMessage::RENDER_WIDGET:
+  switch (message->feature_case()) {
+    case BlimpMessage::kRenderWidget:
       ProcessRenderWidgetMessage(delegate, message->render_widget());
       break;
-    case BlimpMessage::COMPOSITOR:
+    case BlimpMessage::kCompositor:
       ProcessCompositorMessage(delegate, message->compositor());
       break;
     default:
       NOTIMPLEMENTED();
   }
 
   callback.Run(net::OK);
 }
 
 void RenderWidgetFeature::ProcessRenderWidgetMessage(
@@ skipping 30 matching lines @@
 RenderWidgetFeature::RenderWidgetFeatureDelegate*
 RenderWidgetFeature::FindDelegate(const int tab_id) {
   DelegateMap::const_iterator it = delegates_.find(tab_id);
   if (it != delegates_.end())
     return it->second;
   return nullptr;
 }
 
 }  // namespace client
 }  // namespace blimp