Makes IViewManager::DeleteNode take the server_change_id

mojo/services/view_manager/view_manager_service_impl.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_service_impl.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
@@ skipping 543 matching lines @@
     callback.Run(false);
     return;
   }
   node_map_[node_id.node_id] = new Node(this, node_id);
   known_nodes_.insert(transport_node_id);
   callback.Run(true);
 }
 
 void ViewManagerServiceImpl::DeleteNode(
     Id transport_node_id,
+    Id server_change_id,
     const Callback<void(bool)>& callback) {
   const NodeId node_id(NodeIdFromTransportId(transport_node_id));
-  bool did_delete = CanDeleteNode(node_id);
-  if (did_delete) {
+  bool success = false;
+  if (server_change_id == root_node_manager_->next_server_change_id() &&
+      CanDeleteNode(node_id)) {
     ViewManagerServiceImpl* connection = root_node_manager_->GetConnection(
         node_id.connection_id);
-    did_delete = connection && connection->DeleteNodeImpl(this, node_id);
+    success = connection && connection->DeleteNodeImpl(this, node_id);
   }
-  callback.Run(did_delete);
+  callback.Run(success);
 }
 
 void ViewManagerServiceImpl::AddNode(
     Id parent_id,
     Id child_id,
     Id server_change_id,
     const Callback<void(bool)>& callback) {
   bool success = false;
   if (server_change_id == root_node_manager_->next_server_change_id()) {
     Node* parent = GetNode(NodeIdFromTransportId(parent_id));
@@ skipping 204 matching lines @@
   client()->OnViewManagerConnectionEstablished(
       id_,
       creator_url_,
       root_node_manager_->next_server_change_id(),
       NodesToNodeDatas(to_send));
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo