Consolidates view_manager typedefs

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 {
 namespace view_manager {
 namespace service {
 
-std::string NodeIdToString(TransportNodeId id) {
+std::string NodeIdToString(Id id) {
   return (id == 0) ? "null" :
       base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
 }
 
 namespace {
 
 std::string RectToString(const gfx::Rect& rect) {
   return base::StringPrintf("%d,%d %dx%d", rect.x(), rect.y(), rect.width(),
                             rect.height());
 }
@@ skipping 96 matching lines @@
 }
 
 TestChangeTracker::TestChangeTracker()
     : delegate_(NULL) {
 }
 
 TestChangeTracker::~TestChangeTracker() {
 }
 
 void TestChangeTracker::OnViewManagerConnectionEstablished(
-    TransportConnectionId connection_id,
-    TransportChangeId next_server_change_id,
+    ConnectionSpecificId connection_id,
+    Id next_server_change_id,
     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::OnRootsAdded(Array<INodePtr> nodes) {
   Change change;
   change.type = CHANGE_TYPE_ROOTS_ADDED;
   INodesToTestNodes(nodes, &change.nodes);
   AddChange(change);
 }
 
-void TestChangeTracker::OnServerChangeIdAdvanced(
-    TransportChangeId change_id) {
+void TestChangeTracker::OnServerChangeIdAdvanced(Id 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,
+void TestChangeTracker::OnNodeBoundsChanged(Id node_id,
                                             RectPtr old_bounds,
                                             RectPtr new_bounds) {
   Change change;
   change.type = CHANGE_TYPE_NODE_BOUNDS_CHANGED;
   change.node_id = node_id;
   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,
-    Array<INodePtr> nodes) {
+void TestChangeTracker::OnNodeHierarchyChanged(Id node_id,
+                                               Id new_parent_id,
+                                               Id old_parent_id,
+                                               Id server_change_id,
+                                               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);
 }
 
-void TestChangeTracker::OnNodeDeleted(
-    TransportNodeId node_id,
-    TransportChangeId server_change_id) {
+void TestChangeTracker::OnNodeDeleted(Id node_id, Id server_change_id) {
   Change change;
   change.type = CHANGE_TYPE_NODE_DELETED;
   change.node_id = node_id;
   change.change_id = server_change_id;
   AddChange(change);
 }
 
-void TestChangeTracker::OnViewDeleted(TransportViewId view_id) {
+void TestChangeTracker::OnViewDeleted(Id view_id) {
   Change change;
   change.type = CHANGE_TYPE_VIEW_DELETED;
   change.view_id = view_id;
   AddChange(change);
 }
 
-void TestChangeTracker::OnNodeViewReplaced(TransportNodeId node_id,
-                                           TransportViewId new_view_id,
-                                           TransportViewId old_view_id) {
+void TestChangeTracker::OnNodeViewReplaced(Id node_id,
+                                           Id new_view_id,
+                                           Id old_view_id) {
   Change change;
   change.type = CHANGE_TYPE_VIEW_REPLACED;
   change.node_id = node_id;
   change.view_id = new_view_id;
   change.view_id2 = old_view_id;
   AddChange(change);
 }
 
-void TestChangeTracker::OnViewInputEvent(TransportViewId view_id,
-                                         EventPtr event) {
+void TestChangeTracker::OnViewInputEvent(Id view_id, EventPtr event) {
   Change change;
   change.type = CHANGE_TYPE_INPUT_EVENT;
   change.view_id = view_id;
   change.event_action = event->action;
 }
 
 void TestChangeTracker::AddChange(const Change& change) {
   changes_.push_back(change);
   if (delegate_)
     delegate_->OnChangeAdded();
 }
 
 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