Makes IViewManager::DeleteNode take the server_change_id

mojo/services/view_manager/view_manager_unittest.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 <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 144 matching lines @@
   bool Embed(const std::vector<Id>& nodes) {
     changes_.clear();
     base::AutoReset<bool> auto_reset(&in_embed_, true);
     bool result = false;
     view_manager_->Embed(kTestServiceURL, Array<Id>::From(nodes),
                          base::Bind(&ViewManagerProxy::GotResult,
                                     base::Unretained(this), &result));
     RunMainLoop();
     return result;
   }
-  bool DeleteNode(Id node_id) {
+  bool DeleteNode(Id node_id, Id server_change_id) {
     changes_.clear();
     bool result = false;
     view_manager_->DeleteNode(node_id,
+                              server_change_id,
                               base::Bind(&ViewManagerProxy::GotResult,
                                          base::Unretained(this), &result));
     RunMainLoop();
     return result;
   }
   bool DeleteView(Id view_id) {
     changes_.clear();
     bool result = false;
     view_manager_->DeleteView(view_id,
                               base::Bind(&ViewManagerProxy::GotResult,
@@ skipping 692 matching lines @@
     ASSERT_TRUE(connection_->AddNode(BuildNodeId(1, 1), BuildNodeId(1, 2), 1));
     connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("HierarchyChanged change_id=1 node=1,2 new_parent=1,1 "
               "old_parent=null", changes[0]);
   }
 
   // Delete 2.
   {
-    ASSERT_TRUE(connection_->DeleteNode(BuildNodeId(1, 2)));
+    ASSERT_TRUE(connection_->DeleteNode(BuildNodeId(1, 2), 2));
     EXPECT_TRUE(connection_->changes().empty());
 
     connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("NodeDeleted change_id=2 node=1,2", changes[0]);
   }
 }
 
 // Verifies DeleteNode isn't allowed from a separate connection.
 TEST_F(ViewManagerTest, DeleteNodeFromAnotherConnectionDisallowed) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
-  EXPECT_FALSE(connection2_->DeleteNode(BuildNodeId(1, 1)));
+  EXPECT_FALSE(connection2_->DeleteNode(BuildNodeId(1, 1), 1));
 }
 
 // Verifies DeleteView isn't allowed from a separate connection.
 TEST_F(ViewManagerTest, DeleteViewFromAnotherConnectionDisallowed) {
   ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 1)));
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   EXPECT_FALSE(connection2_->DeleteView(BuildViewId(1, 1)));
 }
 
 // Verifies if a node was deleted and then reused that other clients are
@@ skipping 10 matching lines @@
     const Changes changes(ChangesToDescription1(connection2_->changes()));
     EXPECT_EQ(
         "HierarchyChanged change_id=1 node=1,2 new_parent=1,1 old_parent=null",
         changes[0]);
     EXPECT_EQ("[node=1,2 parent=1,1 view=null]",
               ChangeNodeDescription(connection2_->changes()));
   }
 
   // Delete 2.
   {
-    ASSERT_TRUE(connection_->DeleteNode(BuildNodeId(1, 2)));
+    ASSERT_TRUE(connection_->DeleteNode(BuildNodeId(1, 2), 2));
 
     connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("NodeDeleted change_id=2 node=1,2", changes[0]);
   }
 
   // Create 2 again, and add it back to 1. Should get the same notification.
   ASSERT_TRUE(connection_->CreateNode(BuildNodeId(1, 2)));
   {
@@ skipping 55 matching lines @@
   ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 11)));
 
   // Set view 11 on node 2.
   ASSERT_TRUE(connection_->SetView(BuildNodeId(1, 2), BuildViewId(1, 11)));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
 
   // Delete node 2. The second connection should not see this because the node
   // was not known to it.
   {
-    ASSERT_TRUE(connection_->DeleteNode(BuildNodeId(1, 2)));
+    ASSERT_TRUE(connection_->DeleteNode(BuildNodeId(1, 2), 1));
 
     connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("ServerChangeIdAdvanced 2", changes[0]);
   }
 
   // Parent 3 to 1.
   ASSERT_TRUE(connection_->AddNode(BuildNodeId(1, 1), BuildNodeId(1, 3), 2));
   connection2_->DoRunLoopUntilChangesCount(1);
 
   // Set view 11 on node 3.
   {
     ASSERT_TRUE(connection_->SetView(BuildNodeId(1, 3), BuildViewId(1, 11)));
 
     connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("ViewReplaced node=1,3 new_view=1,11 old_view=null", changes[0]);
   }
 
   // Delete 3.
   {
-    ASSERT_TRUE(connection_->DeleteNode(BuildNodeId(1, 3)));
+    ASSERT_TRUE(connection_->DeleteNode(BuildNodeId(1, 3), 3));
 
     connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("NodeDeleted change_id=3 node=1,3", changes[0]);
   }
 }
 
 // Sets view from one connection on another.
 TEST_F(ViewManagerTest, SetViewFromSecondConnection) {
@@ skipping 146 matching lines @@
     ASSERT_TRUE(connection_->AddNode(BuildNodeId(1, 2), BuildNodeId(1, 4), 4));
     connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("NodeDeleted change_id=4 node=1,4", changes[0]);
   }
 
   // Delete 4, client shouldn't receive a delete since it should no longer know
   // about 4.
   {
-    ASSERT_TRUE(connection_->DeleteNode(BuildNodeId(1, 4)));
+    ASSERT_TRUE(connection_->DeleteNode(BuildNodeId(1, 4), 5));
 
     connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("ServerChangeIdAdvanced 6", changes[0]);
   }
 }
 
 // Verify AddNode fails when trying to manipulate nodes in other roots.
 TEST_F(ViewManagerTest, CantMoveNodesFromOtherRoot) {
@@ skipping 129 matching lines @@
 // TODO(sky): add coverage of test that destroys connections and ensures other
 // connections get deletion notification (or advanced server id).
 
 // TODO(sky): need to better track changes to initial connection. For example,
 // that SetBounsdNodes/AddNode and the like don't result in messages to the
 // originating connection.
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo