Revert of Makes change_id unsigned

mojo/services/view_manager/view_manager_connection.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/view_manager_connection.h"
 
 #include "base/stl_util.h"
 #include "mojo/services/view_manager/node.h"
 #include "mojo/services/view_manager/root_node_manager.h"
 #include "mojo/services/view_manager/view.h"
@@ skipping 48 matching lines @@
     ViewMap::const_iterator i = view_map_.find(id.view_id);
     return i == view_map_.end() ? NULL : i->second;
   }
   return context()->GetView(id);
 }
 
 void ViewManagerConnection::NotifyNodeHierarchyChanged(
     const NodeId& node,
     const NodeId& new_parent,
     const NodeId& old_parent,
-    ChangeId change_id) {
+    int32_t change_id) {
   client()->OnNodeHierarchyChanged(NodeIdToTransportId(node),
                                    NodeIdToTransportId(new_parent),
                                    NodeIdToTransportId(old_parent),
                                    change_id);
 }
 
 void ViewManagerConnection::NotifyNodeViewReplaced(const NodeId& node,
                                                    const ViewId& new_view_id,
                                                    const ViewId& old_view_id,
-                                                   ChangeId change_id) {
+                                                   int32_t change_id) {
   client()->OnNodeViewReplaced(NodeIdToTransportId(node),
                                ViewIdToTransportId(new_view_id),
                                ViewIdToTransportId(old_view_id),
                                change_id);
 }
 
 bool ViewManagerConnection::DeleteNodeImpl(ViewManagerConnection* source,
                                            const NodeId& node_id,
-                                           ChangeId change_id) {
+                                           int32_t change_id) {
   DCHECK_EQ(node_id.connection_id, id_);
   Node* node = GetNode(node_id);
   if (!node)
     return false;
   RootNodeManager::ScopedChange change(source, context(), change_id);
   if (node->GetParent())
     node->GetParent()->Remove(node);
   std::vector<Node*> children(node->GetChildren());
   for (size_t i = 0; i < children.size(); ++i)
     node->Remove(children[i]);
   DCHECK(node->GetChildren().empty());
   node_map_.erase(node_id.node_id);
   delete node;
   return true;
 }
 
 bool ViewManagerConnection::DeleteViewImpl(ViewManagerConnection* source,
                                            const ViewId& view_id,
-                                           ChangeId change_id) {
+                                           int32_t change_id) {
   DCHECK_EQ(view_id.connection_id, id_);
   View* view = GetView(view_id);
   if (!view)
     return false;
   RootNodeManager::ScopedChange change(source, context(), change_id);
   if (view->node())
     view->node()->SetView(NULL);
   view_map_.erase(view_id.view_id);
   delete view;
   return true;
 }
 
 bool ViewManagerConnection::SetViewImpl(const NodeId& node_id,
                                         const ViewId& view_id,
-                                        ChangeId change_id) {
+                                        int32_t change_id) {
   Node* node = GetNode(node_id);
   if (!node)
     return false;
   View* view = GetView(view_id);
   if (!view && view_id != ViewId())
     return false;
   RootNodeManager::ScopedChange change(this, context(), change_id);
   node->SetView(view);
   return true;
 }
 
 void ViewManagerConnection::CreateNode(
     uint16_t node_id,
     const Callback<void(bool)>& callback) {
   // Negative values are reserved.
   if (node_map_.find(node_id) != node_map_.end()) {
     callback.Run(false);
     return;
   }
   node_map_[node_id] = new Node(this, NodeId(id_, node_id));
   callback.Run(true);
 }
 
 void ViewManagerConnection::DeleteNode(
     uint32_t transport_node_id,
-    ChangeId change_id,
+    int32_t change_id,
     const mojo::Callback<void(bool)>& callback) {
   const NodeId node_id(NodeIdFromTransportId(transport_node_id));
   ViewManagerConnection* connection = context()->GetConnection(
       node_id.connection_id);
   callback.Run(connection &&
                connection->DeleteNodeImpl(this, node_id, change_id));
 }
 
 void ViewManagerConnection::AddNode(
     uint32_t parent_id,
     uint32_t child_id,
-    ChangeId change_id,
+    int32_t change_id,
     const Callback<void(bool)>& callback) {
   Node* parent = GetNode(NodeIdFromTransportId(parent_id));
   Node* child = GetNode(NodeIdFromTransportId(child_id));
   const bool success = parent && child && parent != child;
   if (success) {
     RootNodeManager::ScopedChange change(this, context(), change_id);
     parent->Add(child);
   }
   callback.Run(success);
 }
 
 void ViewManagerConnection::RemoveNodeFromParent(
       uint32_t node_id,
-      ChangeId change_id,
+      int32_t change_id,
       const Callback<void(bool)>& callback) {
   Node* node = GetNode(NodeIdFromTransportId(node_id));
   const bool success = (node && node->GetParent());
   if (success) {
     RootNodeManager::ScopedChange change(this, context(), change_id);
     node->GetParent()->Remove(node);
   }
   callback.Run(success);
 }
 
 void ViewManagerConnection::CreateView(
     uint16_t view_id,
     const mojo::Callback<void(bool)>& callback) {
   if (view_map_.count(view_id)) {
     callback.Run(false);
     return;
   }
   view_map_[view_id] = new View(ViewId(id_, view_id));
   callback.Run(true);
 }
 
 void ViewManagerConnection::DeleteView(
     uint32_t transport_view_id,
-    ChangeId change_id,
+    int32_t change_id,
     const mojo::Callback<void(bool)>& callback) {
   const ViewId view_id(ViewIdFromTransportId(transport_view_id));
   ViewManagerConnection* connection = context()->GetConnection(
       view_id.connection_id);
   callback.Run(connection &&
                connection->DeleteViewImpl(this, view_id, change_id));
 }
 
 void ViewManagerConnection::SetView(
     uint32_t transport_node_id,
     uint32_t transport_view_id,
-    ChangeId change_id,
+    int32_t change_id,
     const mojo::Callback<void(bool)>& callback) {
   const NodeId node_id(NodeIdFromTransportId(transport_node_id));
   callback.Run(SetViewImpl(node_id, ViewIdFromTransportId(transport_view_id),
                            change_id));
 }
 
 void ViewManagerConnection::OnNodeHierarchyChanged(const NodeId& node,
                                                    const NodeId& new_parent,
                                                    const NodeId& old_parent) {
   context()->NotifyNodeHierarchyChanged(node, new_parent, old_parent);
 }
 
 void ViewManagerConnection::OnNodeViewReplaced(const NodeId& node,
                                                const ViewId& new_view_id,
                                                const ViewId& old_view_id) {
   context()->NotifyNodeViewReplaced(node, new_view_id, old_view_id);
 }
 
 }  // namespace view_manager
 }  // namespace services
 }  // namespace mojo