Fixes bug where IViewManagerClient could be messaged unnecessarily

mojo/services/view_manager/view_manager_connection_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/auto_reset.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 902 matching lines @@
     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)));
     EXPECT_TRUE(connection_->changes().empty());
 
-    // TODO(sky): fix this, client should not get ServerChangeIdAdvanced.
-    connection2_->DoRunLoopUntilChangesCount(2);
+    connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
-    ASSERT_EQ(2u, changes.size());
+    ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("NodeDeleted change_id=2 node=1,2", changes[0]);
-    EXPECT_EQ("ServerChangeIdAdvanced 3", changes[1]);
   }
 }
 
 // Verifies DeleteNode isn't allowed from a separate connection.
 TEST_F(ViewManagerConnectionTest, DeleteNodeFromAnotherConnectionDisallowed) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   EXPECT_FALSE(connection2_->DeleteNode(BuildNodeId(1, 1)));
 }
 
 // Verifies DeleteView isn't allowed from a separate connection.
@@ skipping 19 matching lines @@
         "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)));
 
-    // TODO(sky): fix this, shouldn't get ServerChangeIdAdvanced.
-    connection2_->DoRunLoopUntilChangesCount(2);
+    connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
-    ASSERT_EQ(2u, changes.size());
+    ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("NodeDeleted change_id=2 node=1,2", changes[0]);
-    EXPECT_EQ("ServerChangeIdAdvanced 3", changes[1]);
   }
 
   // Create 2 again, and add it back to 1. Should get the same notification.
   ASSERT_TRUE(connection_->CreateNode(BuildNodeId(1, 2)));
   {
     ASSERT_TRUE(connection_->AddNode(BuildNodeId(1, 1), BuildNodeId(1, 2), 3));
 
     connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
     EXPECT_EQ(
@@ skipping 76 matching lines @@
     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)));
 
-    // TODO(sky): shouldn't get ServerChangeIdAdvanced here.
-    connection2_->DoRunLoopUntilChangesCount(2);
+    connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
-    ASSERT_EQ(2u, changes.size());
+    ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("NodeDeleted change_id=3 node=1,3", changes[0]);
-    EXPECT_EQ("ServerChangeIdAdvanced 4", changes[1]);
   }
 }
 
 // Sets view from one connection on another.
 TEST_F(ViewManagerConnectionTest, SetViewFromSecondConnection) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
 
   ASSERT_TRUE(connection_->CreateNode(BuildNodeId(1, 2)));
 
   // Create a view in the second connection.
@@ skipping 261 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