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

chrome/browser/ui/views/bookmark_bar_view_test.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 "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ skipping 802 matching lines @@
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     first_menu_ = menu->GetSubmenu()->GetMenuItemAt(0);
     gfx::Point menu_loc;
     views::View::ConvertPointToScreen(first_menu_, &menu_loc);
     start_y_ = menu_loc.y();
 
     // Move the mouse over the scroll button.
-    views::View* scroll_container = menu->GetSubmenu()->GetParent();
+    views::View* scroll_container = menu->GetSubmenu()->parent();
     ASSERT_TRUE(scroll_container != NULL);
-    scroll_container = scroll_container->GetParent();
+    scroll_container = scroll_container->parent();
     ASSERT_TRUE(scroll_container != NULL);
     views::View* scroll_down_button = scroll_container->GetChildViewAt(1);
     ASSERT_TRUE(scroll_down_button);
     gfx::Point loc(scroll_down_button->width() / 2,
                    scroll_down_button->height() / 2);
     views::View::ConvertPointToScreen(scroll_down_button, &loc);
 
     // On linux, the sending one location isn't enough.
     ui_controls::SendMouseMove(loc.x() - 1 , loc.y() - 1);
     ui_controls::SendMouseMoveNotifyWhenDone(
@@ skipping 329 matching lines @@
   void Step3() {
     // Make sure the context menu is showing.
     views::MenuItemView* menu = bb_view_->GetContextMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu());
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     // Find the first separator.
     views::SubmenuView* submenu = menu->GetSubmenu();
     views::View* separator_view = NULL;
-    for (int i = 0; i < submenu->GetChildViewCount(); ++i) {
+    for (int i = 0; i < submenu->child_count(); ++i) {
       if (submenu->GetChildViewAt(i)->GetID() !=
           views::MenuItemView::kMenuItemViewID) {
         separator_view = submenu->GetChildViewAt(i);
         break;
       }
     }
     ASSERT_TRUE(separator_view);
 
     // Click on the separator. Clicking on the separator shouldn't visually
     // change anything.
@@ skipping 169 matching lines @@
     ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED);
 
     // Close the window.
     window_->Close();
     window_ = NULL;
   }
 };
 
 // Disabled, http://crbug.com/64303.
 VIEW_TEST(BookmarkBarViewTest16, DISABLED_DeleteMenu)