Get most of the View Manager client lib tests to pass again.

mojo/services/public/cpp/view_manager/tests/view_tree_node_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 "mojo/services/public/cpp/view_manager/view_tree_node.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
@@ skipping 122 matching lines @@
   EXPECT_TRUE(o1.received_params().empty());
 
   TestViewTreeNode v11;
   TreeChangeObserver o11(&v11);
   EXPECT_TRUE(o11.received_params().empty());
 
   // Add.
 
   v1.AddChild(&v11);
 
-  EXPECT_EQ(1U, o1.received_params().size());
+  EXPECT_EQ(2U, o1.received_params().size());
   ViewTreeNodeObserver::TreeChangeParams p1;
   p1.target = &v11;
   p1.receiver = &v1;
   p1.old_parent = NULL;
   p1.new_parent = &v1;
   p1.phase = ViewTreeNodeObserver::DISPOSITION_CHANGED;
   EXPECT_TRUE(TreeChangeParamsMatch(p1, o1.received_params().back()));
 
   EXPECT_EQ(2U, o11.received_params().size());
   ViewTreeNodeObserver::TreeChangeParams p11 = p1;
   p11.receiver = &v11;
   p11.phase = ViewTreeNodeObserver::DISPOSITION_CHANGING;
   EXPECT_TRUE(TreeChangeParamsMatch(p11, o11.received_params().front()));
   p11.phase = ViewTreeNodeObserver::DISPOSITION_CHANGED;
   EXPECT_TRUE(TreeChangeParamsMatch(p11, o11.received_params().back()));
 
   o1.Reset();
   o11.Reset();
   EXPECT_TRUE(o1.received_params().empty());
   EXPECT_TRUE(o11.received_params().empty());
 
   // Remove.
 
   v1.RemoveChild(&v11);
 
-  EXPECT_EQ(1U, o1.received_params().size());
+  EXPECT_EQ(2U, o1.received_params().size());
   p1.target = &v11;
   p1.receiver = &v1;
   p1.old_parent = &v1;
   p1.new_parent = NULL;
   p1.phase = ViewTreeNodeObserver::DISPOSITION_CHANGING;
-  EXPECT_TRUE(TreeChangeParamsMatch(p1, o1.received_params().back()));
+  EXPECT_TRUE(TreeChangeParamsMatch(p1, o1.received_params().front()));
 
   EXPECT_EQ(2U, o11.received_params().size());
   p11 = p1;
   p11.receiver = &v11;
   EXPECT_TRUE(TreeChangeParamsMatch(p11, o11.received_params().front()));
   p11.phase = ViewTreeNodeObserver::DISPOSITION_CHANGED;
   EXPECT_TRUE(TreeChangeParamsMatch(p11, o11.received_params().back()));
 }
 
 // Creates these two trees:
@@ skipping 14 matching lines @@
   v111.AddChild(&v1112);
 
   TreeChangeObserver o1(&v1), o11(&v11), o111(&v111), o1111(&v1111),
       o1112(&v1112);
   ViewTreeNodeObserver::TreeChangeParams p1, p11, p111, p1111, p1112;
 
   // Add.
 
   v11.AddChild(&v111);
 
-  EXPECT_EQ(1U, o1.received_params().size());
+  EXPECT_EQ(2U, o1.received_params().size());
   p1.target = &v111;
   p1.receiver = &v1;
   p1.old_parent = NULL;
   p1.new_parent = &v11;
   p1.phase = ViewTreeNodeObserver::DISPOSITION_CHANGED;
   EXPECT_TRUE(TreeChangeParamsMatch(p1, o1.received_params().back()));
 
-  EXPECT_EQ(1U, o11.received_params().size());
+  EXPECT_EQ(2U, o11.received_params().size());
   p11 = p1;
   p11.receiver = &v11;
   EXPECT_TRUE(TreeChangeParamsMatch(p11, o11.received_params().back()));
 
   EXPECT_EQ(2U, o111.received_params().size());
   p111 = p11;
   p111.receiver = &v111;
   p111.phase = ViewTreeNodeObserver::DISPOSITION_CHANGING;
   EXPECT_TRUE(TreeChangeParamsMatch(p111, o111.received_params().front()));
   p111.phase = ViewTreeNodeObserver::DISPOSITION_CHANGED;
@@ skipping 22 matching lines @@
   o1111.Reset();
   o1112.Reset();
   EXPECT_TRUE(o1.received_params().empty());
   EXPECT_TRUE(o11.received_params().empty());
   EXPECT_TRUE(o111.received_params().empty());
   EXPECT_TRUE(o1111.received_params().empty());
   EXPECT_TRUE(o1112.received_params().empty());
 
   v11.RemoveChild(&v111);
 
-  EXPECT_EQ(1U, o1.received_params().size());
+  EXPECT_EQ(2U, o1.received_params().size());
   p1.target = &v111;
   p1.receiver = &v1;
   p1.old_parent = &v11;
   p1.new_parent = NULL;
   p1.phase = ViewTreeNodeObserver::DISPOSITION_CHANGING;
-  EXPECT_TRUE(TreeChangeParamsMatch(p1, o1.received_params().back()));
+  EXPECT_TRUE(TreeChangeParamsMatch(p1, o1.received_params().front()));
 
-  EXPECT_EQ(1U, o11.received_params().size());
+  EXPECT_EQ(2U, o11.received_params().size());
   p11 = p1;
   p11.receiver = &v11;
-  EXPECT_TRUE(TreeChangeParamsMatch(p11, o11.received_params().back()));
+  EXPECT_TRUE(TreeChangeParamsMatch(p11, o11.received_params().front()));
 
   EXPECT_EQ(2U, o111.received_params().size());
   p111 = p11;
   p111.receiver = &v111;
   p111.phase = ViewTreeNodeObserver::DISPOSITION_CHANGING;
   EXPECT_TRUE(TreeChangeParamsMatch(p111, o111.received_params().front()));
   p111.phase = ViewTreeNodeObserver::DISPOSITION_CHANGED;
   EXPECT_TRUE(TreeChangeParamsMatch(p111, o111.received_params().back()));
 
   EXPECT_EQ(2U, o1111.received_params().size());
@@ skipping 18 matching lines @@
   v1.AddChild(&v11);
   v1.AddChild(&v12);
   v11.AddChild(&v111);
 
   TreeChangeObserver o1(&v1), o11(&v11), o12(&v12), o111(&v111);
 
   // Reparent.
   v12.AddChild(&v111);
 
   // v1 (root) should see both changing and changed notifications.
-  EXPECT_EQ(2U, o1.received_params().size());
+  EXPECT_EQ(4U, o1.received_params().size());
   ViewTreeNodeObserver::TreeChangeParams p1;
   p1.target = &v111;
   p1.receiver = &v1;
   p1.old_parent = &v11;
   p1.new_parent = &v12;
   p1.phase = ViewTreeNodeObserver::DISPOSITION_CHANGING;
   EXPECT_TRUE(TreeChangeParamsMatch(p1, o1.received_params().front()));
   p1.phase = ViewTreeNodeObserver::DISPOSITION_CHANGED;
   EXPECT_TRUE(TreeChangeParamsMatch(p1, o1.received_params().back()));
 
   // v11 should see changing notifications.
-  EXPECT_EQ(1U, o11.received_params().size());
+  EXPECT_EQ(2U, o11.received_params().size());
   ViewTreeNodeObserver::TreeChangeParams p11;
   p11 = p1;
   p11.receiver = &v11;
   p11.phase = ViewTreeNodeObserver::DISPOSITION_CHANGING;
-  EXPECT_TRUE(TreeChangeParamsMatch(p11, o11.received_params().back()));
+  EXPECT_TRUE(TreeChangeParamsMatch(p11, o11.received_params().front()));
 
   // v12 should see changed notifications.
-  EXPECT_EQ(1U, o12.received_params().size());
+  EXPECT_EQ(2U, o12.received_params().size());
   ViewTreeNodeObserver::TreeChangeParams p12;
   p12 = p1;
   p12.receiver = &v12;
   p12.phase = ViewTreeNodeObserver::DISPOSITION_CHANGED;
   EXPECT_TRUE(TreeChangeParamsMatch(p12, o12.received_params().back()));
 
   // v111 should see both changing and changed notifications.
   EXPECT_EQ(2U, o111.received_params().size());
   ViewTreeNodeObserver::TreeChangeParams p111;
   p111 = p1;
@@ skipping 73 matching lines @@
         "node=0,1 old_bounds=0,0 0x0 new_bounds=0,0 100x100 phase=changing",
         changes[0]);
     EXPECT_EQ(
         "node=0,1 old_bounds=0,0 0x0 new_bounds=0,0 100x100 phase=changed",
         changes[1]);
   }
 }
 
 }  // namespace view_manager
 }  // namespace mojo