views: Simplify View::RemoveAllChildViews() function implementation.

views/view_unittest.cc

 // Copyright (c) 2011 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 <map>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/clipboard/clipboard.h"
@@ skipping 1988 matching lines @@
     View::ConvertPointToView(&top_view, child, &point);
     EXPECT_EQ(-1, point.x());
     EXPECT_EQ(-1, point.y());
   }
 }
 
 // Verify if the child views added under the root are all deleted when
 // calling RemoveAllChildViews.
 // The tree looks like this:
 // root
-// |-- child
+// |-- child1
 // |   |-- foo
 // |       |-- bar0
 // |       |-- bar1
-// +-------|-- bar2
+// |       |-- bar2
+// |-- child2
+// +-- child3
 TEST_F(ViewTest, RemoveAllChildViews) {
   View root;
 
-  View* child = new View();
-  root.AddChildView(child);
+  View* child1 = new View();
+  root.AddChildView(child1);
+
+  for (int i = 0; i < 2; ++i)
+    root.AddChildView(new View());
 
   View* foo = new View();
-  child->AddChildView(foo);
+  child1->AddChildView(foo);
 
   // Add some nodes to |foo|.
   for (int i = 0; i < 3; ++i)
     foo->AddChildView(new View());
 
-  ASSERT_EQ(1, root.child_count());
-  ASSERT_EQ(1, child->child_count());
+  ASSERT_EQ(3, root.child_count());
+  ASSERT_EQ(1, child1->child_count());
   ASSERT_EQ(3, foo->child_count());
 
   // Now remove all child views from root.
   root.RemoveAllChildViews(true);
 
   ASSERT_EQ(0, root.child_count());
   ASSERT_FALSE(root.has_children());
 }
 
 TEST_F(ViewTest, Contains) {
@@ skipping 52 matching lines @@
   ASSERT_EQ(0, child1->GetIndexOf(foo1));
 
   ASSERT_EQ(-1, child2->GetIndexOf(NULL));
   ASSERT_EQ(-1, child2->GetIndexOf(&root));
   ASSERT_EQ(-1, child2->GetIndexOf(child2));
   ASSERT_EQ(-1, child2->GetIndexOf(child1));
   ASSERT_EQ(-1, child2->GetIndexOf(foo1));
 }
 
 }  // namespace views