Mojo: more idiomatic C++ bindings

mojo/services/view_manager/type_converters.cc

Index: mojo/services/view_manager/type_converters.cc
diff --git a/mojo/services/view_manager/type_converters.cc b/mojo/services/view_manager/type_converters.cc
index 8f4c98c21794d495dbf524463ba44192568fd759..5808dcf41968a087fd743562e89fa895cbfd27fc 100644
--- a/mojo/services/view_manager/type_converters.cc
+++ b/mojo/services/view_manager/type_converters.cc
@@ -4,13 +4,13 @@
 
 #include "mojo/services/view_manager/type_converters.h"
 
-#include "mojo/public/cpp/bindings/buffer.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/services/view_manager/ids.h"
 #include "mojo/services/view_manager/node.h"
 #include "mojo/services/view_manager/view.h"
 
 using mojo::view_manager::INode;
+using mojo::view_manager::INodePtr;
 using mojo::view_manager::service::Node;
 using mojo::view_manager::service::NodeId;
 using mojo::view_manager::service::ViewId;
@@ -18,17 +18,16 @@ using mojo::view_manager::service::ViewId;
 namespace mojo {
 
 // static
-INode TypeConverter<INode, const Node*>::ConvertFrom(const Node* node,
-                                                     Buffer* buf) {
+INodePtr TypeConverter<INodePtr, const Node*>::ConvertFrom(const Node* node) {
   DCHECK(node);
 
-  INode::Builder builder(buf);
+  INodePtr result(INode::New());
   const Node* parent = node->GetParent();
-  builder.set_parent_id(NodeIdToTransportId(parent ? parent->id() : NodeId()));
-  builder.set_node_id(NodeIdToTransportId(node->id()));
-  builder.set_view_id(ViewIdToTransportId(
-                          node->view() ? node->view()->id() : ViewId()));
-  return builder.Finish();
+  result->parent_id = NodeIdToTransportId(parent ? parent->id() : NodeId());
+  result->node_id = NodeIdToTransportId(node->id());
+  result->view_id = ViewIdToTransportId(
+                        node->view() ? node->view()->id() : ViewId());
+  return result.Pass();
 }
 
 }  // namespace mojo