Mojo: more idiomatic C++ bindings

mojo/services/view_manager/test_change_tracker.cc

 // Copyright 2014 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 "mojo/services/view_manager/test_change_tracker.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 
 namespace mojo {
-
-// TODO(sky): remove this when Darin is done with cleanup.
-template <typename T>
-class MOJO_COMMON_EXPORT TypeConverter<T, T> {
- public:
-  static T ConvertFrom(T input, Buffer* buf) {
-    return input;
-  }
-  static T ConvertTo(T input) {
-    return input;
-  }
-
-  MOJO_ALLOW_IMPLICIT_TYPE_CONVERSION();
-};
-
 namespace view_manager {
 namespace service {
 
 std::string NodeIdToString(TransportNodeId id) {
   return (id == 0) ? "null" :
       base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
 }
 
 namespace {
 
-void INodesToTestNodes(const Array<INode>& data,
+void INodesToTestNodes(const Array<INodePtr>& data,
                        std::vector<TestNode>* test_nodes) {
   for (size_t i = 0; i < data.size(); ++i) {
     TestNode node;
-    node.parent_id = data[i].parent_id();
-    node.node_id = data[i].node_id();
-    node.view_id = data[i].view_id();
+    node.parent_id = data[i]->parent_id;
+    node.node_id = data[i]->node_id;
+    node.view_id = data[i]->view_id;
     test_nodes->push_back(node);
   }
 }
 
 std::string RectToString(const gfx::Rect& rect) {
   return base::StringPrintf("%d,%d %dx%d", rect.x(), rect.y(), rect.width(),
                             rect.height());
 }
 
 std::string ChangeToDescription1(const Change& change) {
@@ skipping 75 matching lines @@
 TestChangeTracker::TestChangeTracker()
     : delegate_(NULL) {
 }
 
 TestChangeTracker::~TestChangeTracker() {
 }
 
 void TestChangeTracker::OnViewManagerConnectionEstablished(
     TransportConnectionId connection_id,
     TransportChangeId next_server_change_id,
-    const Array<INode>& nodes) {
+    Array<INodePtr> nodes) {
   Change change;
   change.type = CHANGE_TYPE_CONNECTION_ESTABLISHED;
   change.connection_id = connection_id;
   change.change_id = next_server_change_id;
   INodesToTestNodes(nodes, &change.nodes);
   AddChange(change);
 }
 
 void TestChangeTracker::OnServerChangeIdAdvanced(
     TransportChangeId change_id) {
   Change change;
   change.type = CHANGE_TYPE_SERVER_CHANGE_ID_ADVANCED;
   change.change_id = change_id;
   AddChange(change);
 }
 
 void TestChangeTracker::OnNodeBoundsChanged(TransportNodeId node_id,
-                                            const Rect& old_bounds,
-                                            const Rect& new_bounds) {
+                                            RectPtr old_bounds,
+                                            RectPtr new_bounds) {
   Change change;
   change.type = CHANGE_TYPE_NODE_BOUNDS_CHANGED;
   change.node_id = node_id;
-  change.bounds = old_bounds;
-  change.bounds2 = new_bounds;
+  change.bounds = old_bounds.To<gfx::Rect>();
+  change.bounds2 = new_bounds.To<gfx::Rect>();
   AddChange(change);
 }
 
 void TestChangeTracker::OnNodeHierarchyChanged(
     TransportNodeId node_id,
     TransportNodeId new_parent_id,
     TransportNodeId old_parent_id,
     TransportChangeId server_change_id,
-    const Array<INode>& nodes) {
+    Array<INodePtr> nodes) {
   Change change;
   change.type = CHANGE_TYPE_NODE_HIERARCHY_CHANGED;
   change.node_id = node_id;
   change.node_id2 = new_parent_id;
   change.node_id3 = old_parent_id;
   change.change_id = server_change_id;
   INodesToTestNodes(nodes, &change.nodes);
   AddChange(change);
 }
 
@@ skipping 34 matching lines @@
 std::string TestNode::ToString() const {
   return base::StringPrintf("node=%s parent=%s view=%s",
                             NodeIdToString(node_id).c_str(),
                             NodeIdToString(parent_id).c_str(),
                             NodeIdToString(view_id).c_str());
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo