Rework tree APIs to reflect Google style and more const-correctness....

views/layout/grid_layout_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 "testing/gtest/include/gtest/gtest.h"
 #include "views/layout/grid_layout.h"
 #include "views/view.h"
 
 using views::ColumnSet;
 using views::GridLayout;
@@ skipping 44 matching lines @@
  public:
   virtual void SetUp() {
     layout = new GridLayout(&host);
   }
 
   virtual void TearDown() {
     delete layout;
   }
 
   virtual void RemoveAll() {
-    for (int i = host.GetChildViewCount() - 1; i >= 0; i--) {
+    for (int i = host.child_count() - 1; i >= 0; i--)
       host.RemoveChildView(host.GetChildViewAt(i));
-    }
   }
 
   void GetPreferredSize() {
     pref = layout->GetPreferredSize(&host);
   }
 
   gfx::Size pref;
   gfx::Rect bounds;
   View host;
   GridLayout* layout;
 };
 
 class GridLayoutAlignmentTest : public testing::Test {
  public:
    GridLayoutAlignmentTest() :
        host(),
          v1(gfx::Size(10, 20)),
        layout(new GridLayout(&host)) {}
 
   virtual void SetUp() {
   }
 
   virtual void TearDown() {
     delete layout;
   }
 
   virtual void RemoveAll() {
-    for (int i = host.GetChildViewCount() - 1; i >= 0; i--) {
+    for (int i = host.child_count() - 1; i >= 0; i--)
       host.RemoveChildView(host.GetChildViewAt(i));
-    }
   }
 
   void TestAlignment(GridLayout::Alignment alignment, gfx::Rect* bounds) {
     ColumnSet* c1 = layout->AddColumnSet(0);
     c1->AddColumn(alignment, alignment, 1, GridLayout::USE_PREF, 0, 0);
     layout->StartRow(1, 0);
     layout->AddView(&v1);
     gfx::Size pref = layout->GetPreferredSize(&host);
     EXPECT_EQ(gfx::Size(10, 20), pref);
     host.SetBounds(0, 0, 100, 100);
@@ skipping 491 matching lines @@
   // ordering doesn't influence sizing behaviour.
   layout->StartRow(0, 2);
   View* view3 = new FlexibleView(40);
   layout->AddView(view3, 1, 1, GridLayout::FILL, GridLayout::LEADING);
 
   // We expect a height of 50: 30 from the variable width view in the first row
   // plus 20 from the statically sized view in the second row. The flexible
   // view in the third row should contribute no height.
   EXPECT_EQ(gfx::Size(20, 50), layout->GetPreferredSize(&host));
 }