Mojo: more idiomatic C++ bindings

mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc

Index: mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
index 54fabb7a989d7d4da8d04a264830daed6c7b72a9..2ae13781cbd808b6bc33e4f972ffd1f1cf6b4ca9 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
@@ -56,23 +56,23 @@ ViewTreeNode* AddNodeToViewManager(ViewManager* manager,
 }
 
 ViewTreeNode* BuildNodeTree(ViewManager* manager,
-                            const Array<INode>& nodes) {
+                            const Array<INodePtr>& nodes) {
   std::vector<ViewTreeNode*> parents;
   ViewTreeNode* root = NULL;
   ViewTreeNode* last_node = NULL;
   for (size_t i = 0; i < nodes.size(); ++i) {
-    if (last_node && nodes[i].parent_id() == last_node->id()) {
+    if (last_node && nodes[i]->parent_id == last_node->id()) {
       parents.push_back(last_node);
     } else if (!parents.empty()) {
-      while (parents.back()->id() != nodes[i].parent_id())
+      while (parents.back()->id() != nodes[i]->parent_id)
         parents.pop_back();
     }
     ViewTreeNode* node = AddNodeToViewManager(
         manager,
         !parents.empty() ? parents.back() : NULL,
-        nodes[i].node_id(),
-        nodes[i].view_id(),
-        nodes[i].bounds());
+        nodes[i]->node_id,
+        nodes[i]->view_id,
+        nodes[i]->bounds.To<gfx::Rect>());
     if (!last_node)
       root = node;
     last_node = node;
@@ -327,8 +327,8 @@ class SetBoundsTransaction : public ViewManagerTransaction {
  private:
   // Overridden from ViewManagerTransaction:
   virtual void DoCommit() OVERRIDE {
-    AllocationScope scope;
-    service()->SetNodeBounds(node_id_, bounds_, ActionCompletedCallback());
+    service()->SetNodeBounds(
+        node_id_, Rect::From(bounds_), ActionCompletedCallback());
   }
   virtual void DoActionCompleted(bool success) OVERRIDE {
     // TODO(beng): recovery?
@@ -367,7 +367,6 @@ class SetViewContentsTransaction : public ViewManagerTransaction {
 
     memcpy(memory, &data[0], data.size());
 
-    AllocationScope scope;
     service()->SetViewContents(view_id_, duped.Pass(),
                                static_cast<uint32_t>(data.size()),
                                ActionCompletedCallback());
@@ -524,7 +523,7 @@ void ViewManagerSynchronizer::SetViewContents(TransportViewId view_id,
 void ViewManagerSynchronizer::OnViewManagerConnectionEstablished(
     TransportConnectionId connection_id,
     TransportChangeId next_server_change_id,
-    const Array<INode>& nodes) {
+    mojo::Array<INodePtr> nodes) {
   connected_ = true;
   connection_id_ = connection_id;
   next_server_change_id_ = next_server_change_id;
@@ -543,10 +542,11 @@ void ViewManagerSynchronizer::OnServerChangeIdAdvanced(
 }
 
 void ViewManagerSynchronizer::OnNodeBoundsChanged(uint32 node_id,
-                                                  const Rect& old_bounds,
-                                                  const Rect& new_bounds) {
+                                                  RectPtr old_bounds,
+                                                  RectPtr new_bounds) {
   ViewTreeNode* node = view_manager_->GetNodeById(node_id);
-  ViewTreeNodePrivate(node).LocalSetBounds(old_bounds, new_bounds);
+  ViewTreeNodePrivate(node).LocalSetBounds(old_bounds.To<gfx::Rect>(),
+                                           new_bounds.To<gfx::Rect>());
 }
 
 void ViewManagerSynchronizer::OnNodeHierarchyChanged(
@@ -554,7 +554,7 @@ void ViewManagerSynchronizer::OnNodeHierarchyChanged(
     uint32_t new_parent_id,
     uint32_t old_parent_id,
     TransportChangeId server_change_id,
-    const Array<INode>& nodes) {
+    mojo::Array<INodePtr> nodes) {
   // TODO: deal with |nodes|.
   next_server_change_id_ = server_change_id + 1;