Rename TreeNode::GetChildCount to TreeNode::child_count. Part 3.

This is part of a serie of patches to make the TreeNode API more closer to style
used in the Views Tree API (see views/view.h for reference).

BUG=None
TEST=existing unit_tests.

Review URL: http://codereview.chromium.org/6639015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77592 0039d316-1c4b-4281-b951-d872f2087c98

57 files changed, 388 insertions, 396 deletions

diff --git a/chrome/browser/accessibility/browser_accessibility.cc b/chrome/browser/accessibility/browser_accessibility.cc
index 7d869e1..88d2648 100644
--- a/chrome/browser/accessibility/browser_accessibility.cc
+++ b/chrome/browser/accessibility/browser_accessibility.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -97,14 +97,6 @@ bool BrowserAccessibility::IsDescendantOf(
   return false;
 }
 
-BrowserAccessibility* BrowserAccessibility::parent() {
-  return parent_;
-}
-
-uint32 BrowserAccessibility::GetChildCount() {
-  return children_.size();
-}
-
 BrowserAccessibility* BrowserAccessibility::GetChild(uint32 child_index) {
   DCHECK(child_index < children_.size());
   return children_[child_index];
diff --git a/chrome/browser/accessibility/browser_accessibility.h b/chrome/browser/accessibility/browser_accessibility.h
index 4085e32..e75b9cb 100644
--- a/chrome/browser/accessibility/browser_accessibility.h
+++ b/chrome/browser/accessibility/browser_accessibility.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -75,10 +75,10 @@ class BrowserAccessibility {
   bool IsDescendantOf(BrowserAccessibility* ancestor);
 
   // Returns the parent of this object, or NULL if it's the root.
-  BrowserAccessibility* parent();
+  BrowserAccessibility* parent() { return parent_; }
 
   // Returns the number of children of this object.
-  uint32 GetChildCount();
+  uint32 child_count() const { return children_.size(); }
 
   // Return a pointer to the child with the given index.
   BrowserAccessibility* GetChild(uint32 child_index);
diff --git a/chrome/browser/accessibility/browser_accessibility_cocoa.mm b/chrome/browser/accessibility/browser_accessibility_cocoa.mm
index 81f82ca..d412eea 100644
--- a/chrome/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/chrome/browser/accessibility/browser_accessibility_cocoa.mm
@@ -93,9 +93,9 @@ bool GetState(BrowserAccessibility* accessibility, int state) {
 - (NSArray*)children {
   if (!children_.get()) {
     children_.reset([[NSMutableArray alloc]
-        initWithCapacity:browserAccessibility_->GetChildCount()] );
+        initWithCapacity:browserAccessibility_->child_count()] );
     for (uint32 index = 0;
-         index < browserAccessibility_->GetChildCount();
+         index < browserAccessibility_->child_count();
          ++index) {
       BrowserAccessibilityCocoa* child =
           browserAccessibility_->GetChild(index)->toBrowserAccessibilityCocoa();
diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc
index d662c28..fc9c3d9 100644
--- a/chrome/browser/bookmarks/bookmark_codec.cc
+++ b/chrome/browser/bookmarks/bookmark_codec.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -107,7 +107,7 @@ Value* BookmarkCodec::EncodeNode(const BookmarkNode* node) {
 
     ListValue* child_values = new ListValue();
     value->Set(kChildrenKey, child_values);
-    for (int i = 0; i < node->GetChildCount(); ++i)
+    for (int i = 0; i < node->child_count(); ++i)
       child_values->Append(EncodeNode(node->GetChild(i)));
   }
   return value;
@@ -247,7 +247,7 @@ bool BookmarkCodec::DecodeNode(const DictionaryValue& value,
       return false;  // Node invalid.
 
     if (parent)
-      parent->Add(parent->GetChildCount(), node);
+      parent->Add(parent->child_count(), node);
     node->set_type(BookmarkNode::URL);
     UpdateChecksumWithUrlNode(id_string, title, url_string);
   } else {
@@ -275,7 +275,7 @@ bool BookmarkCodec::DecodeNode(const DictionaryValue& value,
     node->set_date_group_modified(Time::FromInternalValue(internal_time));
 
     if (parent)
-      parent->Add(parent->GetChildCount(), node);
+      parent->Add(parent->child_count(), node);
 
     UpdateChecksumWithFolderNode(id_string, title);
 
@@ -299,7 +299,7 @@ void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node,
 void BookmarkCodec::ReassignIDsHelper(BookmarkNode* node) {
   DCHECK(node);
   node->set_id(++maximum_id_);
-  for (int i = 0; i < node->GetChildCount(); ++i)
+  for (int i = 0; i < node->child_count(); ++i)
     ReassignIDsHelper(node->GetChild(i));
 }
 
diff --git a/chrome/browser/bookmarks/bookmark_codec_unittest.cc b/chrome/browser/bookmarks/bookmark_codec_unittest.cc
index 905b55a..204d66a 100644
--- a/chrome/browser/bookmarks/bookmark_codec_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_codec_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -153,7 +153,7 @@ class BookmarkCodecTest : public testing::Test {
     int64 node_id = node->id();
     EXPECT_TRUE(assigned_ids->find(node_id) == assigned_ids->end());
     assigned_ids->insert(node_id);
-    for (int i = 0; i < node->GetChildCount(); ++i)
+    for (int i = 0; i < node->child_count(); ++i)
       CheckIDs(node->GetChild(i), assigned_ids);
   }
 
@@ -221,7 +221,7 @@ TEST_F(BookmarkCodecTest, ChecksumManualEditIDsTest) {
 
   // The test depends on existence of multiple children under bookmark bar, so
   // make sure that's the case.
-  int bb_child_count = model_to_encode->GetBookmarkBarNode()->GetChildCount();
+  int bb_child_count = model_to_encode->GetBookmarkBarNode()->child_count();
   ASSERT_GT(bb_child_count, 1);
 
   std::string enc_checksum;
@@ -270,10 +270,10 @@ TEST_F(BookmarkCodecTest, PersistIDsTest) {
   // ID persistence is working properly.
   const BookmarkNode* bookmark_bar = decoded_model.GetBookmarkBarNode();
   decoded_model.AddURL(
-      bookmark_bar, bookmark_bar->GetChildCount(), ASCIIToUTF16(kUrl3Title),
+      bookmark_bar, bookmark_bar->child_count(), ASCIIToUTF16(kUrl3Title),
       GURL(kUrl3Url));
   const BookmarkNode* group2_node = decoded_model.AddGroup(
-      bookmark_bar, bookmark_bar->GetChildCount(), ASCIIToUTF16(kGroup2Title));
+      bookmark_bar, bookmark_bar->child_count(), ASCIIToUTF16(kGroup2Title));
   decoded_model.AddURL(group2_node, 0, ASCIIToUTF16(kUrl4Title),
                        GURL(kUrl4Url));
 
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
index 059c16d..963b4d3 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
@@ -299,11 +299,11 @@ TEST_F(BookmarkContextMenuControllerTest, CutCopyPasteNode) {
 
   controller.reset(new BookmarkContextMenuController(
       NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes));
-  int old_count = model_->GetBookmarkBarNode()->GetChildCount();
+  int old_count = model_->GetBookmarkBarNode()->child_count();
   controller->ExecuteCommand(IDC_PASTE);
 
   ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_url());
-  ASSERT_EQ(old_count + 1, model_->GetBookmarkBarNode()->GetChildCount());
+  ASSERT_EQ(old_count + 1, model_->GetBookmarkBarNode()->child_count());
   ASSERT_EQ(model_->GetBookmarkBarNode()->GetChild(0)->GetURL(),
             model_->GetBookmarkBarNode()->GetChild(1)->GetURL());
 
@@ -313,5 +313,5 @@ TEST_F(BookmarkContextMenuControllerTest, CutCopyPasteNode) {
   controller->ExecuteCommand(IDC_CUT);
   ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(0)->is_url());
   ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_folder());
-  ASSERT_EQ(old_count, model_->GetBookmarkBarNode()->GetChildCount());
+  ASSERT_EQ(old_count, model_->GetBookmarkBarNode()->child_count());
 }
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 7b7cd47..2ed2153 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -406,7 +406,7 @@ void BookmarkFaviconFetcher::ExtractUrls(const BookmarkNode* node) {
       bookmark_urls_.push_back(url);
     }
   } else {
-    for (int i = 0; i < node->GetChildCount(); ++i) {
+    for (int i = 0; i < node->child_count(); ++i) {
       ExtractUrls(node->GetChild(i));
     }
   }
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 15c4101..f7185a7 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -428,7 +428,7 @@ const BookmarkNode* BookmarkModel::AddURLWithCreationTime(
 
 void BookmarkModel::SortChildren(const BookmarkNode* parent) {
   if (!parent || !parent->is_folder() || is_root(parent) ||
-      parent->GetChildCount() <= 1) {
+      parent->child_count() <= 1) {
     return;
   }
 
@@ -463,7 +463,7 @@ void BookmarkModel::SetURLStarred(const GURL& url,
   if (is_starred) {
     // Create a bookmark.
     const BookmarkNode* parent = GetParentForNewNodes();
-    AddURL(parent, parent->GetChildCount(), title, url);
+    AddURL(parent, parent->child_count(), title, url);
   } else {
     // Remove all the bookmarks.
     for (size_t i = 0; i < bookmarks.size(); ++i) {
@@ -538,7 +538,7 @@ void BookmarkModel::RemoveNode(BookmarkNode* node,
   CancelPendingFavIconLoadRequests(node);
 
   // Recurse through children.
-  for (int i = node->GetChildCount() - 1; i >= 0; --i)
+  for (int i = node->child_count() - 1; i >= 0; --i)
     RemoveNode(node->GetChild(i), removed_urls);
 }
 
@@ -689,7 +689,7 @@ const BookmarkNode* BookmarkModel::GetNodeByID(const BookmarkNode* node,
   if (node->id() == id)
     return node;
 
-  for (int i = 0, child_count = node->GetChildCount(); i < child_count; ++i) {
+  for (int i = 0, child_count = node->child_count(); i < child_count; ++i) {
     const BookmarkNode* result = GetNodeByID(node->GetChild(i), id);
     if (result)
       return result;
@@ -701,8 +701,8 @@ bool BookmarkModel::IsValidIndex(const BookmarkNode* parent,
                                  int index,
                                  bool allow_end) {
   return (parent && parent->is_folder() &&
-          (index >= 0 && (index < parent->GetChildCount() ||
-                          (allow_end && index == parent->GetChildCount()))));
+          (index >= 0 && (index < parent->child_count() ||
+                          (allow_end && index == parent->child_count()))));
 }
 
 BookmarkNode* BookmarkModel::CreateBookmarkNode() {
@@ -811,7 +811,7 @@ void BookmarkModel::PopulateNodesByURL(BookmarkNode* node) {
   // explicitly grab the lock.
   if (node->is_url())
     nodes_ordered_by_url_set_.insert(node);
-  for (int i = 0; i < node->GetChildCount(); ++i)
+  for (int i = 0; i < node->child_count(); ++i)
     PopulateNodesByURL(node->GetChild(i));
 }
 
diff --git a/chrome/browser/bookmarks/bookmark_model_test_utils.cc b/chrome/browser/bookmarks/bookmark_model_test_utils.cc
index e5b2a70..a8503d7 100644
--- a/chrome/browser/bookmarks/bookmark_model_test_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_model_test_utils.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -23,8 +23,8 @@ void BookmarkModelTestUtils::AssertNodesEqual(const BookmarkNode* expected,
   } else {
     EXPECT_TRUE(expected->date_group_modified() ==
                 actual->date_group_modified());
-    ASSERT_EQ(expected->GetChildCount(), actual->GetChildCount());
-    for (int i = 0; i < expected->GetChildCount(); ++i)
+    ASSERT_EQ(expected->child_count(), actual->child_count());
+    for (int i = 0; i < expected->child_count(); ++i)
       AssertNodesEqual(expected->GetChild(i), actual->GetChild(i), check_ids);
   }
 }
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 2cf7898..9f8c779 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -170,12 +170,12 @@ class BookmarkModelTest : public TestingBrowserProcessTest,
 TEST_F(BookmarkModelTest, InitialState) {
   const BookmarkNode* bb_node = model.GetBookmarkBarNode();
   ASSERT_TRUE(bb_node != NULL);
-  EXPECT_EQ(0, bb_node->GetChildCount());
+  EXPECT_EQ(0, bb_node->child_count());
   EXPECT_EQ(BookmarkNode::BOOKMARK_BAR, bb_node->type());
 
   const BookmarkNode* other_node = model.other_node();
   ASSERT_TRUE(other_node != NULL);
-  EXPECT_EQ(0, other_node->GetChildCount());
+  EXPECT_EQ(0, other_node->child_count());
   EXPECT_EQ(BookmarkNode::OTHER_NODE, other_node->type());
 
   EXPECT_TRUE(bb_node->id() != other_node->id());
@@ -190,7 +190,7 @@ TEST_F(BookmarkModelTest, AddURL) {
   AssertObserverCount(1, 0, 0, 0, 0);
   observer_details.AssertEquals(root, NULL, 0, -1);
 
-  ASSERT_EQ(1, root->GetChildCount());
+  ASSERT_EQ(1, root->child_count());
   ASSERT_EQ(title, new_node->GetTitle());
   ASSERT_TRUE(url == new_node->GetURL());
   ASSERT_EQ(BookmarkNode::URL, new_node->type());
@@ -208,7 +208,7 @@ TEST_F(BookmarkModelTest, AddGroup) {
   AssertObserverCount(1, 0, 0, 0, 0);
   observer_details.AssertEquals(root, NULL, 0, -1);
 
-  ASSERT_EQ(1, root->GetChildCount());
+  ASSERT_EQ(1, root->child_count());
   ASSERT_EQ(title, new_node->GetTitle());
   ASSERT_EQ(BookmarkNode::FOLDER, new_node->type());
 
@@ -230,7 +230,7 @@ TEST_F(BookmarkModelTest, RemoveURL) {
   ClearCounts();
 
   model.Remove(root, 0);
-  ASSERT_EQ(0, root->GetChildCount());
+  ASSERT_EQ(0, root->child_count());
   AssertObserverCount(0, 0, 1, 0, 0);
   observer_details.AssertEquals(root, NULL, 0, -1);
 
@@ -253,7 +253,7 @@ TEST_F(BookmarkModelTest, RemoveGroup) {
 
   // Now remove the group.
   model.Remove(root, 0);
-  ASSERT_EQ(0, root->GetChildCount());
+  ASSERT_EQ(0, root->child_count());
   AssertObserverCount(0, 0, 1, 0, 0);
   observer_details.AssertEquals(root, NULL, 0, -1);
 
@@ -304,9 +304,9 @@ TEST_F(BookmarkModelTest, Move) {
   AssertObserverCount(0, 1, 0, 0, 0);
   observer_details.AssertEquals(root, group1, 1, 0);
   EXPECT_TRUE(group1 == node->parent());
-  EXPECT_EQ(1, root->GetChildCount());
+  EXPECT_EQ(1, root->child_count());
   EXPECT_EQ(group1, root->GetChild(0));
-  EXPECT_EQ(1, group1->GetChildCount());
+  EXPECT_EQ(1, group1->child_count());
   EXPECT_EQ(node, group1->GetChild(0));
 
   // And remove the group.
@@ -315,7 +315,7 @@ TEST_F(BookmarkModelTest, Move) {
   AssertObserverCount(0, 0, 1, 0, 0);
   observer_details.AssertEquals(root, NULL, 0, -1);
   EXPECT_TRUE(model.GetMostRecentlyAddedNodeForURL(url) == NULL);
-  EXPECT_EQ(0, root->GetChildCount());
+  EXPECT_EQ(0, root->child_count());
 }
 
 TEST_F(BookmarkModelTest, Copy) {
@@ -587,7 +587,7 @@ static void PopulateNodeImpl(const std::vector<std::string>& description,
       TestNode* new_node =
           new TestNode(base::IntToString16(next_group_id++),
                        BookmarkNode::FOLDER);
-      parent->Add(parent->GetChildCount(), new_node);
+      parent->Add(parent->child_count(), new_node);
       PopulateNodeImpl(description, index, new_node);
     } else if (element == "]") {
       // End the current group.
@@ -599,7 +599,7 @@ static void PopulateNodeImpl(const std::vector<std::string>& description,
       // likely means a space was forgotten.
       DCHECK(element.find('[') == std::string::npos);
       DCHECK(element.find(']') == std::string::npos);
-      parent->Add(parent->GetChildCount(),
+      parent->Add(parent->child_count(),
                   new TestNode(UTF8ToUTF16(element), BookmarkNode::URL));
     }
   }
@@ -634,7 +634,7 @@ static void PopulateNodeFromString(const std::string& description,
 static void PopulateBookmarkNode(TestNode* parent,
                                  BookmarkModel* model,
                                  const BookmarkNode* bb_node) {
-  for (int i = 0; i < parent->GetChildCount(); ++i) {
+  for (int i = 0; i < parent->child_count(); ++i) {
     TestNode* child = parent->GetChild(i);
     if (child->value == BookmarkNode::FOLDER) {
       const BookmarkNode* new_bb_node =
@@ -671,8 +671,8 @@ class BookmarkModelTestWithProfile : public TestingBrowserProcessTest,
   // Verifies the contents of the bookmark bar node match the contents of the
   // TestNode.
   void VerifyModelMatchesNode(TestNode* expected, const BookmarkNode* actual) {
-    ASSERT_EQ(expected->GetChildCount(), actual->GetChildCount());
-    for (int i = 0; i < expected->GetChildCount(); ++i) {
+    ASSERT_EQ(expected->child_count(), actual->child_count());
+    for (int i = 0; i < expected->child_count(); ++i) {
       TestNode* expected_child = expected->GetChild(i);
       const BookmarkNode* actual_child = actual->GetChild(i);
       ASSERT_EQ(expected_child->GetTitle(), actual_child->GetTitle());
@@ -818,7 +818,7 @@ class BookmarkModelTestWithProfile2 : public BookmarkModelTestWithProfile {
     //   OF1
     //   http://www.google.com/intl/en/about.html - About Google
     const BookmarkNode* bbn = bb_model_->GetBookmarkBarNode();
-    ASSERT_EQ(2, bbn->GetChildCount());
+    ASSERT_EQ(2, bbn->child_count());
 
     const BookmarkNode* child = bbn->GetChild(0);
     ASSERT_EQ(BookmarkNode::URL, child->type());
@@ -828,7 +828,7 @@ class BookmarkModelTestWithProfile2 : public BookmarkModelTestWithProfile {
     child = bbn->GetChild(1);
     ASSERT_TRUE(child->is_folder());
     ASSERT_EQ(ASCIIToUTF16("F1"), child->GetTitle());
-    ASSERT_EQ(2, child->GetChildCount());
+    ASSERT_EQ(2, child->child_count());
 
     const BookmarkNode* parent = child;
     child = parent->GetChild(0);
@@ -839,7 +839,7 @@ class BookmarkModelTestWithProfile2 : public BookmarkModelTestWithProfile {
     child = parent->GetChild(1);
     ASSERT_TRUE(child->is_folder());
     ASSERT_EQ(ASCIIToUTF16("F11"), child->GetTitle());
-    ASSERT_EQ(1, child->GetChildCount());
+    ASSERT_EQ(1, child->child_count());
 
     parent = child;
     child = parent->GetChild(0);
@@ -848,12 +848,12 @@ class BookmarkModelTestWithProfile2 : public BookmarkModelTestWithProfile {
     ASSERT_TRUE(child->GetURL() == GURL("http://www.google.com/services/"));
 
     parent = bb_model_->other_node();
-    ASSERT_EQ(2, parent->GetChildCount());
+    ASSERT_EQ(2, parent->child_count());
 
     child = parent->GetChild(0);
     ASSERT_TRUE(child->is_folder());
     ASSERT_EQ(ASCIIToUTF16("OF1"), child->GetTitle());
-    ASSERT_EQ(0, child->GetChildCount());
+    ASSERT_EQ(0, child->child_count());
 
     child = parent->GetChild(1);
     ASSERT_EQ(BookmarkNode::URL, child->type());
@@ -883,7 +883,7 @@ class BookmarkModelTestWithProfile2 : public BookmarkModelTestWithProfile {
       return;
     }
     ids->insert(node->id());
-    for (int i = 0; i < node->GetChildCount(); ++i) {
+    for (int i = 0; i < node->child_count(); ++i) {
       VerifyUniqueIDImpl(node->GetChild(i), ids, has_unique);
       if (!*has_unique)
         return;
diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc
index 5c00445..ed2d38c 100644
--- a/chrome/browser/bookmarks/bookmark_node_data.cc
+++ b/chrome/browser/bookmarks/bookmark_node_data.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -33,7 +33,7 @@ BookmarkNodeData::Element::Element(const BookmarkNode* node)
       url(node->GetURL()),
       title(node->GetTitle()),
       id_(node->id()) {
-  for (int i = 0; i < node->GetChildCount(); ++i)
+  for (int i = 0; i < node->child_count(); ++i)
     children.push_back(Element(node->GetChild(i)));
 }
 
diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc
index 8900ba1..9d00988 100644
--- a/chrome/browser/bookmarks/bookmark_storage.cc
+++ b/chrome/browser/bookmarks/bookmark_storage.cc
@@ -99,7 +99,7 @@ class BookmarkStorage::LoadTask : public Task {
       if (node->GetURL().is_valid())
         details_->index()->Add(node);
     } else {
-      for (int i = 0; i < node->GetChildCount(); ++i)
+      for (int i = 0; i < node->child_count(); ++i)
         AddBookmarksToIndex(node->GetChild(i));
     }
   }
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 2b8a27d..652aca8 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -105,7 +105,7 @@ void CloneBookmarkNodeImpl(BookmarkModel* model,
 // Returns the number of descendants of node that are of type url.
 int DescendantURLCount(const BookmarkNode* node) {
   int result = 0;
-  for (int i = 0; i < node->GetChildCount(); ++i) {
+  for (int i = 0; i < node->child_count(); ++i) {
     const BookmarkNode* child = node->GetChild(i);
     if (child->is_url())
       result++;
@@ -147,7 +147,7 @@ void OpenAllImpl(const BookmarkNode* node,
     }
   } else {
     // Group, recurse through children.
-    for (int i = 0; i < node->GetChildCount(); ++i) {
+    for (int i = 0; i < node->child_count(); ++i) {
       OpenAllImpl(node->GetChild(i), initial_disposition, navigator,
                   opened_url);
     }
@@ -420,7 +420,7 @@ void PasteFromClipboard(BookmarkModel* model,
     return;
 
   if (index == -1)
-    index = parent->GetChildCount();
+    index = parent->child_count();
   bookmark_utils::CloneBookmarkNode(
       model, bookmark_data.elements, parent, index);
 }
@@ -546,11 +546,11 @@ static const BookmarkNode* CreateNewNode(BookmarkModel* model,
     const string16& new_title, const GURL& new_url) {
   const BookmarkNode* node;
   if (details.type == BookmarkEditor::EditDetails::NEW_URL) {
-    node = model->AddURL(parent, parent->GetChildCount(), new_title, new_url);
+    node = model->AddURL(parent, parent->child_count(), new_title, new_url);
   } else if (details.type == BookmarkEditor::EditDetails::NEW_FOLDER) {
-    node = model->AddGroup(parent, parent->GetChildCount(), new_title);
+    node = model->AddGroup(parent, parent->child_count(), new_title);
     for (size_t i = 0; i < details.urls.size(); ++i) {
-      model->AddURL(node, node->GetChildCount(), details.urls[i].second,
+      model->AddURL(node, node->child_count(), details.urls[i].second,
                     details.urls[i].first);
     }
     model->SetDateGroupModified(parent, Time::Now());
@@ -592,7 +592,7 @@ const BookmarkNode* ApplyEditsWithPossibleGroupChange(BookmarkModel* model,
   DCHECK(node);
 
   if (new_parent != node->parent())
-    model->Move(node, new_parent, new_parent->GetChildCount());
+    model->Move(node, new_parent, new_parent->child_count());
   if (node->is_url())
     model->SetURL(node, new_url);
   model->SetTitle(node, new_title);
@@ -653,10 +653,10 @@ const BookmarkNode* GetParentForNewNodes(
       if (*index == 0) {
         // Node doesn't exist in parent, add to end.
         NOTREACHED();
-        *index = real_parent->GetChildCount();
+        *index = real_parent->child_count();
       }
     } else {
-      *index = real_parent->GetChildCount();
+      *index = real_parent->child_count();
     }
   }
 
@@ -669,7 +669,7 @@ bool NodeHasURLs(const BookmarkNode* node) {
   if (node->is_url())
     return true;
 
-  for (int i = 0; i < node->GetChildCount(); ++i) {
+  for (int i = 0; i < node->child_count(); ++i) {
     if (NodeHasURLs(node->GetChild(i)))
       return true;
   }
diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc
index a31e903..21b52e8 100644
--- a/chrome/browser/cookies_tree_model.cc
+++ b/chrome/browser/cookies_tree_model.cc
@@ -631,7 +631,7 @@ void CookiesTreeModel::DeleteAllStoredObjects() {
   NotifyObserverBeginBatch();
   CookieTreeNode* root = GetRoot();
   root->DeleteStoredObjects();
-  int num_children = root->GetChildCount();
+  int num_children = root->child_count();
   for (int i = num_children - 1; i >= 0; --i)
     delete Remove(root, i);
   NotifyObserverTreeNodeChanged(root);
@@ -646,13 +646,13 @@ void CookiesTreeModel::DeleteCookieNode(CookieTreeNode* cookie_node) {
   CookieTreeNode* parent_node = cookie_node->parent();
   int cookie_node_index = parent_node->GetIndexOf(cookie_node);
   delete Remove(parent_node, cookie_node_index);
-  if (parent_node->GetChildCount() == 0)
+  if (parent_node->child_count() == 0)
     DeleteCookieNode(parent_node);
 }
 
 void CookiesTreeModel::UpdateSearchResults(const std::wstring& filter) {
   CookieTreeNode* root = GetRoot();
-  int num_children = root->GetChildCount();
+  int num_children = root->child_count();
   NotifyObserverBeginBatch();
   for (int i = num_children - 1; i >= 0; --i)
     delete Remove(root, i);
diff --git a/chrome/browser/cookies_tree_model_unittest.cc b/chrome/browser/cookies_tree_model_unittest.cc
index cfab323..d2e9f30 100644
--- a/chrome/browser/cookies_tree_model_unittest.cc
+++ b/chrome/browser/cookies_tree_model_unittest.cc
@@ -105,9 +105,9 @@ class CookiesTreeModelTest : public testing::Test {
   std::string GetNodesOfChildren(
       const CookieTreeNode* node,
       CookieTreeNode::DetailedInfo::NodeType node_type) {
-    if (node->GetChildCount()) {
+    if (node->child_count()) {
       std::string retval;
-      for (int i = 0; i < node->GetChildCount(); ++i) {
+      for (int i = 0; i < node->child_count(); ++i) {
         retval += GetNodesOfChildren(node->GetChild(i), node_type);
       }
       return retval;
@@ -260,7 +260,7 @@ TEST_F(CookiesTreeModelTest, RemoveAll) {
   {
     SCOPED_TRACE("After removing");
     EXPECT_EQ(1, cookies_model->GetRoot()->GetTotalNodeCount());
-    EXPECT_EQ(0, cookies_model->GetRoot()->GetChildCount());
+    EXPECT_EQ(0, cookies_model->GetRoot()->child_count());
     EXPECT_EQ(std::string(""), GetMonsterCookies(monster));
     EXPECT_EQ(GetMonsterCookies(monster),
               GetDisplayedCookies(cookies_model.get()));
@@ -666,7 +666,7 @@ TEST_F(CookiesTreeModelTest, ContentSettings) {
       static_cast<CookieTreeRootNode*>(cookies_model.GetRoot());
   CookieTreeOriginNode* origin = root->GetOrCreateOriginNode(host);
 
-  EXPECT_EQ(1, origin->GetChildCount());
+  EXPECT_EQ(1, origin->child_count());
   EXPECT_TRUE(origin->CanCreateContentException());
   origin->CreateContentException(
       content_settings, CONTENT_SETTING_SESSION_ONLY);
diff --git a/chrome/browser/extensions/extension_bookmark_helpers.cc b/chrome/browser/extensions/extension_bookmark_helpers.cc
index eeceed8..047cb99 100644
--- a/chrome/browser/extensions/extension_bookmark_helpers.cc
+++ b/chrome/browser/extensions/extension_bookmark_helpers.cc
@@ -45,7 +45,7 @@ DictionaryValue* GetNodeDictionary(const BookmarkNode* node,
   }
 
   if (recurse && node->is_folder()) {
-    int childCount = node->GetChildCount();
+    int childCount = node->child_count();
     ListValue* children = new ListValue();
     for (int i = 0; i < childCount; ++i) {
       const BookmarkNode* child = node->GetChild(i);
@@ -95,7 +95,7 @@ bool RemoveNode(BookmarkModel* model,
     *error = keys::kModifySpecialError;
     return false;
   }
-  if (node->is_folder() && node->GetChildCount() > 0 && !recursive) {
+  if (node->is_folder() && node->child_count() > 0 && !recursive) {
     *error = keys::kFolderNotEmptyError;
     return false;
   }
diff --git a/chrome/browser/extensions/extension_bookmark_manager_api.cc b/chrome/browser/extensions/extension_bookmark_manager_api.cc
index d351739..0e0d074 100644
--- a/chrome/browser/extensions/extension_bookmark_manager_api.cc
+++ b/chrome/browser/extensions/extension_bookmark_manager_api.cc
@@ -89,7 +89,7 @@ void AddNodeToList(ListValue* list, const BookmarkNode& node) {
   dict->SetString(keys::kTitleKey, node.GetTitle());
 
   ListValue* children = new ListValue();
-  for (int i = 0; i < node.GetChildCount(); ++i)
+  for (int i = 0; i < node.child_count(); ++i)
     AddNodeToList(children, *node.GetChild(i));
   dict->Set(keys::kChildrenKey, children);
 
@@ -391,7 +391,7 @@ bool DropBookmarkManagerFunction::RunImpl() {
   if (args_->GetSize() == 2)
     EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(1, &drop_index));
   else
-    drop_index = drop_parent->GetChildCount();
+    drop_index = drop_parent->child_count();
 
   if (dispatcher()->render_view_host()->delegate()->GetRenderViewType() ==
       ViewType::TAB_CONTENTS) {
diff --git a/chrome/browser/extensions/extension_bookmarks_module.cc b/chrome/browser/extensions/extension_bookmarks_module.cc
index 8616457..6ca4a2b 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.cc
+++ b/chrome/browser/extensions/extension_bookmarks_module.cc
@@ -227,7 +227,7 @@ void ExtensionBookmarkEventRouter::BookmarkNodeChildrenReordered(
     BookmarkModel* model, const BookmarkNode* node) {
   ListValue args;
   args.Append(new StringValue(base::Int64ToString(node->id())));
-  int childCount = node->GetChildCount();
+  int childCount = node->child_count();
   ListValue* children = new ListValue();
   for (int i = 0; i < childCount; ++i) {
     const BookmarkNode* child = node->GetChild(i);
@@ -318,7 +318,7 @@ bool GetBookmarkChildrenFunction::RunImpl() {
     error_ = keys::kNoNodeError;
     return false;
   }
-  int child_count = node->GetChildCount();
+  int child_count = node->child_count();
   for (int i = 0; i < child_count; ++i) {
     const BookmarkNode* child = node->GetChild(i);
     extension_bookmark_helpers::AddNode(child, json.get(), false);
@@ -443,10 +443,10 @@ bool CreateBookmarkFunction::RunImpl() {
 
   int index;
   if (!json->HasKey(keys::kIndexKey)) {  // Optional (defaults to end).
-    index = parent->GetChildCount();
+    index = parent->child_count();
   } else {
     EXTENSION_FUNCTION_VALIDATE(json->GetInteger(keys::kIndexKey, &index));
-    if (index > parent->GetChildCount() || index < 0) {
+    if (index > parent->child_count() || index < 0) {
       error_ = keys::kInvalidIndexError;
       return false;
     }
@@ -542,12 +542,12 @@ bool MoveBookmarkFunction::RunImpl() {
   if (destination->HasKey(keys::kIndexKey)) {  // Optional (defaults to end).
     EXTENSION_FUNCTION_VALIDATE(destination->GetInteger(keys::kIndexKey,
                                                         &index));
-    if (index > parent->GetChildCount() || index < 0) {
+    if (index > parent->child_count() || index < 0) {
       error_ = keys::kInvalidIndexError;
       return false;
     }
   } else {
-    index = parent->GetChildCount();
+    index = parent->child_count();
   }
 
   model->Move(node, parent, index);
diff --git a/chrome/browser/history/starred_url_database.cc b/chrome/browser/history/starred_url_database.cc
index ba8b27d..439e92e32 100644
--- a/chrome/browser/history/starred_url_database.cc
+++ b/chrome/browser/history/starred_url_database.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -361,7 +361,7 @@ bool StarredURLDatabase::BuildStarNodes(
         StarredNode* parent =
             group_id_to_node_map[star_entries[i].parent_group_id];
         StarredNode* node = new StarredNode(star_entries[i]);
-        parent->Add(parent->GetChildCount(), node);
+        parent->Add(parent->child_count(), node);
       }
     } else if (groups_with_duplicate_ids->find(star_entries[i].id) ==
                groups_with_duplicate_ids->end()) {
@@ -378,7 +378,7 @@ bool StarredURLDatabase::BuildStarNodes(
             group_id_to_node_map[star_entries[i].parent_group_id];
         StarredNode* node = group_id_to_node_map[star_entries[i].group_id];
         if (!node->HasAncestor(parent) && !parent->HasAncestor(node)) {
-          parent->Add(parent->GetChildCount(), node);
+          parent->Add(parent->child_count(), node);
         } else {
           // The node has a cycle. Add it to the list of roots so the cycle is
           // broken.
@@ -403,7 +403,7 @@ StarredURLDatabase::StarredNode* StarredURLDatabase::GetNodeByType(
 
 bool StarredURLDatabase::EnsureVisualOrder(
     StarredURLDatabase::StarredNode* node) {
-  for (int i = 0; i < node->GetChildCount(); ++i) {
+  for (int i = 0; i < node->child_count(); ++i) {
     if (node->GetChild(i)->value.visual_order != i) {
       StarredEntry& entry = node->GetChild(i)->value;
       entry.visual_order = i;
@@ -521,7 +521,7 @@ bool StarredURLDatabase::EnsureStarredIntegrityImpl(
 
 bool StarredURLDatabase::Move(StarredNode* source, StarredNode* new_parent) {
   history::StarredEntry& entry = source->value;
-  entry.visual_order = new_parent->GetChildCount();
+  entry.visual_order = new_parent->child_count();
   entry.parent_group_id = new_parent->value.group_id;
   if (!UpdateStarredEntryRow(entry.id, entry.title,
                              entry.parent_group_id, entry.visual_order,
@@ -529,7 +529,7 @@ bool StarredURLDatabase::Move(StarredNode* source, StarredNode* new_parent) {
     NOTREACHED() << "Unable to move folder";
     return false;
   }
-  new_parent->Add(new_parent->GetChildCount(), source);
+  new_parent->Add(new_parent->child_count(), source);
   return true;
 }
 
@@ -611,7 +611,7 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
     // Add the node to its parent. |entries| is ordered by parent then
     // visual order so that we know we maintain visual order by always adding
     // to the end.
-    parent->Add(parent->GetChildCount(), node);
+    parent->Add(parent->child_count(), node);
   }
 
   // Save to file.
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
index 99d9d49..d84a920 100644
--- a/chrome/browser/importer/profile_writer.cc
+++ b/chrome/browser/importer/profile_writer.cc
@@ -105,7 +105,7 @@ void ProfileWriter::AddBookmarkEntry(
       const std::wstring& folder_name = (!import_to_bookmark_bar &&
           !it->in_toolbar && (i == it->path.begin())) ? real_first_folder : *i;
 
-      for (int index = 0; index < parent->GetChildCount(); ++index) {
+      for (int index = 0; index < parent->child_count(); ++index) {
         const BookmarkNode* node = parent->GetChild(index);
         if ((node->type() == BookmarkNode::BOOKMARK_BAR ||
              node->type() == BookmarkNode::FOLDER) &&
@@ -115,16 +115,16 @@ void ProfileWriter::AddBookmarkEntry(
         }
       }
       if (child == NULL)
-        child = model->AddGroup(parent, parent->GetChildCount(),
+        child = model->AddGroup(parent, parent->child_count(),
                                 WideToUTF16Hack(folder_name));
       parent = child;
     }
     groups_added_to.insert(parent);
     if (it->is_folder) {
-      model->AddGroup(parent, parent->GetChildCount(),
+      model->AddGroup(parent, parent->child_count(),
                       WideToUTF16Hack(it->title));
     } else {
-      model->AddURLWithCreationTime(parent, parent->GetChildCount(),
+      model->AddURLWithCreationTime(parent, parent->child_count(),
           WideToUTF16Hack(it->title), it->url, it->creation_time);
     }
 
@@ -298,7 +298,7 @@ std::wstring ProfileWriter::GenerateUniqueFolderName(
   std::set<std::wstring> other_folder_names;
   const BookmarkNode* other = model->other_node();
 
-  for (int i = 0, child_count = other->GetChildCount(); i < child_count; ++i) {
+  for (int i = 0, child_count = other->child_count(); i < child_count; ++i) {
     const BookmarkNode* node = other->GetChild(i);
     if (node->is_folder())
       other_folder_names.insert(UTF16ToWideHack(node->GetTitle()));
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index a09ebf2..f490bd5 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -1763,7 +1763,7 @@ static void CountBookmarks(const BookmarkNode* node,
     (*bookmarks)++;
   else
     (*folders)++;
-  for (int i = 0; i < node->GetChildCount(); ++i)
+  for (int i = 0; i < node->child_count(); ++i)
     CountBookmarks(node->GetChild(i), bookmarks, folders);
 }
 
diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc
index 6ff25f6..6de33fe 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc
@@ -109,7 +109,7 @@ void BookmarkChangeProcessor::RemoveSyncNodeHierarchy(
     // The top of |index_stack| should always be |node|'s index.
     DCHECK(!node->parent() || (node->parent()->GetIndexOf(node) ==
       index_stack.top()));
-    if (index == node->GetChildCount()) {
+    if (index == node->child_count()) {
       // If we've processed all of |node|'s children, delete |node| and move
       // on to its successor.
       RemoveOneSyncNode(&trans, node);
@@ -119,7 +119,7 @@ void BookmarkChangeProcessor::RemoveSyncNodeHierarchy(
     } else {
       // If |node| has an unprocessed child, process it next after pushing the
       // current state onto the stack.
-      DCHECK_LT(index, node->GetChildCount());
+      DCHECK_LT(index, node->child_count());
       index_stack.push(index);
       node = node->GetChild(index);
       index = 0;
@@ -262,7 +262,7 @@ void BookmarkChangeProcessor::BookmarkNodeChildrenReordered(
 
   // The given node's children got reordered. We need to reorder all the
   // children of the corresponding sync node.
-  for (int i = 0; i < node->GetChildCount(); ++i) {
+  for (int i = 0; i < node->child_count(); ++i) {
     sync_api::WriteNode sync_child(&trans);
     if (!model_associator_->InitSyncNodeFromChromeId(node->GetChild(i)->id(),
                                                      &sync_child)) {
@@ -397,18 +397,18 @@ void BookmarkChangeProcessor::ApplyChangesFromSyncModel(
       // reparented by a later change record.  Move them to a temporary place.
       DCHECK(dst) << "Could not find node to be deleted";
       const BookmarkNode* parent = dst->parent();
-      if (dst->GetChildCount()) {
+      if (dst->child_count()) {
         if (!foster_parent) {
           foster_parent = model->AddGroup(model->other_node(),
-                                          model->other_node()->GetChildCount(),
+                                          model->other_node()->child_count(),
                                           string16());
         }
-        for (int i = dst->GetChildCount() - 1; i >= 0; --i) {
+        for (int i = dst->child_count() - 1; i >= 0; --i) {
           model->Move(dst->GetChild(i), foster_parent,
-                      foster_parent->GetChildCount());
+                      foster_parent->child_count());
         }
       }
-      DCHECK_EQ(dst->GetChildCount(), 0) << "Node being deleted has children";
+      DCHECK_EQ(dst->child_count(), 0) << "Node being deleted has children";
       model_associator_->Disassociate(changes[i].id);
       model->Remove(parent, parent->GetIndexOf(dst));
       dst = NULL;
@@ -430,7 +430,7 @@ void BookmarkChangeProcessor::ApplyChangesFromSyncModel(
   // Clean up the temporary node.
   if (foster_parent) {
     // There should be no nodes left under the foster parent.
-    DCHECK_EQ(foster_parent->GetChildCount(), 0);
+    DCHECK_EQ(foster_parent->child_count(), 0);
     model->Remove(foster_parent->parent(),
                   foster_parent->parent()->GetIndexOf(foster_parent));
     foster_parent = NULL;
@@ -487,7 +487,7 @@ const BookmarkNode* BookmarkChangeProcessor::CreateBookmarkNode(
     BookmarkModel* model,
     int index) {
   DCHECK(parent);
-  DCHECK(index >= 0 && index <= parent->GetChildCount());
+  DCHECK(index >= 0 && index <= parent->child_count());
 
   const BookmarkNode* node;
   if (sync_node->GetIsFolder()) {
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index 743623d..fe92cf9 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -86,7 +86,7 @@ class BookmarkNodeFinder {
 
 BookmarkNodeFinder::BookmarkNodeFinder(const BookmarkNode* parent_node)
     : parent_node_(parent_node) {
-  for (int i = 0; i < parent_node_->GetChildCount(); ++i) {
+  for (int i = 0; i < parent_node_->child_count(); ++i) {
     child_nodes_.insert(parent_node_->GetChild(i));
   }
 }
@@ -146,7 +146,7 @@ void BookmarkNodeIdIndex::AddAll(const BookmarkNode* node) {
   if (!node->is_folder())
     return;
 
-  for (int i = 0; i < node->GetChildCount(); ++i)
+  for (int i = 0; i < node->child_count(); ++i)
     AddAll(node->GetChild(i));
 }
 
@@ -407,7 +407,7 @@ bool BookmarkModelAssociator::BuildAssociations() {
     // the right positions: from 0 to index - 1.
     // So the children starting from index in the parent bookmark node are the
     // ones that are not present in the parent sync node. So create them.
-    for (int i = index; i < parent_node->GetChildCount(); ++i) {
+    for (int i = index; i < parent_node->child_count(); ++i) {
       sync_child_id = BookmarkChangeProcessor::CreateSyncNode(
           parent_node, model, i, &trans, this, sync_service_);
       if (parent_node->GetChild(i)->is_folder())
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 927b0d5..fdaf322 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -404,7 +404,7 @@ class ProfileSyncServiceTest : public testing::Test {
       EXPECT_EQ(gnode.GetPredecessorId(), gprev.GetId());
       EXPECT_EQ(gnode.GetParentId(), gprev.GetParentId());
     }
-    if (browser_index == bnode->parent()->GetChildCount() - 1) {
+    if (browser_index == bnode->parent()->child_count() - 1) {
       EXPECT_EQ(gnode.GetSuccessorId(), 0);
     } else {
       const BookmarkNode* bnext =
@@ -415,7 +415,7 @@ class ProfileSyncServiceTest : public testing::Test {
       EXPECT_EQ(gnode.GetSuccessorId(), gnext.GetId());
       EXPECT_EQ(gnode.GetParentId(), gnext.GetParentId());
     }
-    if (bnode->GetChildCount()) {
+    if (bnode->child_count()) {
       EXPECT_TRUE(gnode.GetFirstChildId());
     }
   }
@@ -772,7 +772,7 @@ TEST_F(ProfileSyncServiceTest, ServerChangeWithNonCanonicalURL) {
 
     adds.ApplyPendingChanges(change_processor());
 
-    EXPECT_TRUE(model_->other_node()->GetChildCount() == 1);
+    EXPECT_TRUE(model_->other_node()->child_count() == 1);
     ExpectModelMatch(&trans);
   }
 
@@ -782,7 +782,7 @@ TEST_F(ProfileSyncServiceTest, ServerChangeWithNonCanonicalURL) {
   StartSyncService();
 
   // There should still be just the one bookmark.
-  EXPECT_TRUE(model_->other_node()->GetChildCount() == 1);
+  EXPECT_TRUE(model_->other_node()->child_count() == 1);
   ExpectModelMatch();
 }
 
@@ -806,7 +806,7 @@ TEST_F(ProfileSyncServiceTest, DISABLED_ServerChangeWithInvalidURL) {
     // We're lenient about what should happen -- the model could wind up with
     // the node or without it; but things should be consistent, and we
     // shouldn't crash.
-    child_count = model_->other_node()->GetChildCount();
+    child_count = model_->other_node()->child_count();
     EXPECT_TRUE(child_count == 0 || child_count == 1);
     ExpectModelMatch(&trans);
   }
@@ -817,7 +817,7 @@ TEST_F(ProfileSyncServiceTest, DISABLED_ServerChangeWithInvalidURL) {
   StartSyncService();
 
   // Things ought not to have changed.
-  EXPECT_EQ(model_->other_node()->GetChildCount(), child_count);
+  EXPECT_EQ(model_->other_node()->child_count(), child_count);
   ExpectModelMatch();
 }
 
@@ -853,7 +853,7 @@ TEST_F(ProfileSyncServiceTest, CornerCaseNames) {
   }
 
   // Verify that the browser model matches the sync model.
-  EXPECT_TRUE(model_->other_node()->GetChildCount() == 2*arraysize(names));
+  EXPECT_TRUE(model_->other_node()->child_count() == 2*arraysize(names));
   ExpectModelMatch();
 }
 
@@ -889,7 +889,7 @@ TEST_F(ProfileSyncServiceTest, RepeatedMiddleInsertion) {
   }
 
   // Verify that the browser model matches the sync model.
-  EXPECT_EQ(model_->other_node()->GetChildCount(), count);
+  EXPECT_EQ(model_->other_node()->child_count(), count);
   ExpectModelMatch();
 }
 
@@ -949,13 +949,13 @@ TEST_F(ProfileSyncServiceTest, MergeDuplicates) {
   model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("Dup"),
                  GURL("http://dup.com/"));
 
-  EXPECT_EQ(2, model_->other_node()->GetChildCount());
+  EXPECT_EQ(2, model_->other_node()->child_count());
 
   // Restart the sync service to trigger model association.
   StopSyncService(SAVE_TO_STORAGE);
   StartSyncService();
 
-  EXPECT_EQ(2, model_->other_node()->GetChildCount());
+  EXPECT_EQ(2, model_->other_node()->child_count());
   ExpectModelMatch();
 }
 
@@ -1282,7 +1282,7 @@ void ProfileSyncServiceTestWithData::WriteTestDataToBookmarkModel() {
                        kBookmarkBarChildren,
                        arraysize(kBookmarkBarChildren));
 
-  ASSERT_GE(bookmarks_bar_node->GetChildCount(), 4);
+  ASSERT_GE(bookmarks_bar_node->child_count(), 4);
   const BookmarkNode* f1_node = bookmarks_bar_node->GetChild(1);
   PopulateFromTestData(f1_node, kF1Children, arraysize(kF1Children));
   const BookmarkNode* f2_node = bookmarks_bar_node->GetChild(3);
@@ -1293,7 +1293,7 @@ void ProfileSyncServiceTestWithData::WriteTestDataToBookmarkModel() {
                        kOtherBookmarkChildren,
                        arraysize(kOtherBookmarkChildren));
 
-  ASSERT_GE(other_bookmarks_node->GetChildCount(), 6);
+  ASSERT_GE(other_bookmarks_node->child_count(), 6);
   const BookmarkNode* f3_node = other_bookmarks_node->GetChild(0);
   PopulateFromTestData(f3_node, kF3Children, arraysize(kF3Children));
   const BookmarkNode* f4_node = other_bookmarks_node->GetChild(3);
@@ -1312,7 +1312,7 @@ void ProfileSyncServiceTestWithData::ExpectBookmarkModelMatchesTestData() {
                       kBookmarkBarChildren,
                       arraysize(kBookmarkBarChildren));
 
-  ASSERT_GE(bookmark_bar_node->GetChildCount(), 4);
+  ASSERT_GE(bookmark_bar_node->child_count(), 4);
   const BookmarkNode* f1_node = bookmark_bar_node->GetChild(1);
   CompareWithTestData(f1_node, kF1Children, arraysize(kF1Children));
   const BookmarkNode* f2_node = bookmark_bar_node->GetChild(3);
@@ -1323,7 +1323,7 @@ void ProfileSyncServiceTestWithData::ExpectBookmarkModelMatchesTestData() {
                       kOtherBookmarkChildren,
                       arraysize(kOtherBookmarkChildren));
 
-  ASSERT_GE(other_bookmarks_node->GetChildCount(), 6);
+  ASSERT_GE(other_bookmarks_node->child_count(), 6);
   const BookmarkNode* f3_node = other_bookmarks_node->GetChild(0);
   CompareWithTestData(f3_node, kF3Children, arraysize(kF3Children));
   const BookmarkNode* f4_node = other_bookmarks_node->GetChild(3);
@@ -1394,8 +1394,8 @@ TEST_F(ProfileSyncServiceTestWithData, MergeWithEmptyBookmarkModel) {
 
   // Blow away the bookmark model -- it should be empty afterwards.
   LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
-  EXPECT_EQ(model_->GetBookmarkBarNode()->GetChildCount(), 0);
-  EXPECT_EQ(model_->other_node()->GetChildCount(), 0);
+  EXPECT_EQ(model_->GetBookmarkBarNode()->child_count(), 0);
+  EXPECT_EQ(model_->other_node()->child_count(), 0);
 
   // Now restart the sync service.  Starting it should populate the bookmark
   // model -- test for consistency.
@@ -1427,7 +1427,7 @@ TEST_F(ProfileSyncServiceTestWithData, MergeExpectedIdenticalModels) {
   ExpectBookmarkModelMatchesTestData();
   const BookmarkNode* bookmark_bar = model_->GetBookmarkBarNode();
   ASSERT_TRUE(bookmark_bar);
-  ASSERT_GT(bookmark_bar->GetChildCount(), 1);
+  ASSERT_GT(bookmark_bar->child_count(), 1);
   model_->Move(bookmark_bar->GetChild(0), bookmark_bar, 1);
   StartSyncService();
   ExpectModelMatch();
@@ -1444,26 +1444,26 @@ TEST_F(ProfileSyncServiceTestWithData, MergeModelsWithSomeExtras) {
   // Remove some nodes and reorder some nodes.
   const BookmarkNode* bookmark_bar_node = model_->GetBookmarkBarNode();
   int remove_index = 2;
-  ASSERT_GT(bookmark_bar_node->GetChildCount(), remove_index);
+  ASSERT_GT(bookmark_bar_node->child_count(), remove_index);
   const BookmarkNode* child_node = bookmark_bar_node->GetChild(remove_index);
   ASSERT_TRUE(child_node);
   ASSERT_TRUE(child_node->is_url());
   model_->Remove(bookmark_bar_node, remove_index);
-  ASSERT_GT(bookmark_bar_node->GetChildCount(), remove_index);
+  ASSERT_GT(bookmark_bar_node->child_count(), remove_index);
   child_node = bookmark_bar_node->GetChild(remove_index);
   ASSERT_TRUE(child_node);
   ASSERT_TRUE(child_node->is_folder());
   model_->Remove(bookmark_bar_node, remove_index);
 
   const BookmarkNode* other_node = model_->other_node();
-  ASSERT_GE(other_node->GetChildCount(), 1);
+  ASSERT_GE(other_node->child_count(), 1);
   const BookmarkNode* f3_node = other_node->GetChild(0);
   ASSERT_TRUE(f3_node);
   ASSERT_TRUE(f3_node->is_folder());
   remove_index = 2;
-  ASSERT_GT(f3_node->GetChildCount(), remove_index);
+  ASSERT_GT(f3_node->child_count(), remove_index);
   model_->Remove(f3_node, remove_index);
-  ASSERT_GT(f3_node->GetChildCount(), remove_index);
+  ASSERT_GT(f3_node->child_count(), remove_index);
   model_->Remove(f3_node, remove_index);
 
   StartSyncService();
@@ -1477,32 +1477,32 @@ TEST_F(ProfileSyncServiceTestWithData, MergeModelsWithSomeExtras) {
   // Remove some nodes and reorder some nodes.
   bookmark_bar_node = model_->GetBookmarkBarNode();
   remove_index = 0;
-  ASSERT_GT(bookmark_bar_node->GetChildCount(), remove_index);
+  ASSERT_GT(bookmark_bar_node->child_count(), remove_index);
   child_node = bookmark_bar_node->GetChild(remove_index);
   ASSERT_TRUE(child_node);
   ASSERT_TRUE(child_node->is_url());
   model_->Remove(bookmark_bar_node, remove_index);
-  ASSERT_GT(bookmark_bar_node->GetChildCount(), remove_index);
+  ASSERT_GT(bookmark_bar_node->child_count(), remove_index);
   child_node = bookmark_bar_node->GetChild(remove_index);
   ASSERT_TRUE(child_node);
   ASSERT_TRUE(child_node->is_folder());
   model_->Remove(bookmark_bar_node, remove_index);
 
-  ASSERT_GE(bookmark_bar_node->GetChildCount(), 2);
+  ASSERT_GE(bookmark_bar_node->child_count(), 2);
   model_->Move(bookmark_bar_node->GetChild(0), bookmark_bar_node, 1);
 
   other_node = model_->other_node();
-  ASSERT_GE(other_node->GetChildCount(), 1);
+  ASSERT_GE(other_node->child_count(), 1);
   f3_node = other_node->GetChild(0);
   ASSERT_TRUE(f3_node);
   ASSERT_TRUE(f3_node->is_folder());
   remove_index = 0;
-  ASSERT_GT(f3_node->GetChildCount(), remove_index);
+  ASSERT_GT(f3_node->child_count(), remove_index);
   model_->Remove(f3_node, remove_index);
-  ASSERT_GT(f3_node->GetChildCount(), remove_index);
+  ASSERT_GT(f3_node->child_count(), remove_index);
   model_->Remove(f3_node, remove_index);
 
-  ASSERT_GE(other_node->GetChildCount(), 4);
+  ASSERT_GE(other_node->child_count(), 4);
   model_->Move(other_node->GetChild(0), other_node, 1);
   model_->Move(other_node->GetChild(2), other_node, 3);
 
diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm
index 40d84b2..0e2c6d2 100644
--- a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm
+++ b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -17,9 +17,9 @@
 
 - (NSArray*)bookmarkFolders {
   NSMutableArray* bookmarkFolders = [NSMutableArray
-      arrayWithCapacity:bookmarkNode_->GetChildCount()];
+      arrayWithCapacity:bookmarkNode_->child_count()];
 
-  for (int i = 0; i < bookmarkNode_->GetChildCount(); ++i) {
+  for (int i = 0; i < bookmarkNode_->child_count(); ++i) {
     const BookmarkNode* node = bookmarkNode_->GetChild(i);
 
     if (!node->is_folder())
@@ -45,7 +45,7 @@
     return;
 
   const BookmarkNode* node = model->AddGroup(bookmarkNode_,
-                                             bookmarkNode_->GetChildCount(),
+                                             bookmarkNode_->child_count(),
                                              string16());
   if (!node) {
     AppleScript::SetError(AppleScript::errCreateBookmarkFolder);
@@ -89,9 +89,9 @@
 
 - (NSArray*)bookmarkItems {
   NSMutableArray* bookmarkItems = [NSMutableArray
-      arrayWithCapacity:bookmarkNode_->GetChildCount()];
+      arrayWithCapacity:bookmarkNode_->child_count()];
 
-  for (int i = 0; i < bookmarkNode_->GetChildCount(); ++i) {
+  for (int i = 0; i < bookmarkNode_->child_count(); ++i) {
     const BookmarkNode* node = bookmarkNode_->GetChild(i);
 
     if (!node->is_url())
@@ -124,7 +124,7 @@
   }
 
   const BookmarkNode* node = model->AddURL(bookmarkNode_,
-                                           bookmarkNode_->GetChildCount(),
+                                           bookmarkNode_->child_count(),
                                            string16(),
                                            url);
   if (!node) {
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm
index 67095d2..2705b91 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -61,7 +61,7 @@
                     [NSCharacterSet newlineCharacterSet]];
   std::wstring newTitle = base::SysNSStringToWide(name);
   const BookmarkNode* newParentNode = [self selectedNode];
-  int newIndex = newParentNode->GetChildCount();
+  int newIndex = newParentNode->child_count();
   // Create the new folder which will contain all of the tab URLs.
   NSString* newFolderName = [self displayName];
   string16 newFolderString = base::SysNSStringToUTF16(newFolderName);
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm
index 9f8a7d8..17bee24 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -75,8 +75,8 @@ TEST_F(BookmarkAllTabsControllerTest, BookmarkAllTabs) {
   [controller_ selectTestNodeInBrowser:group_a_];
   [controller_ setDisplayName:@"ALL MY TABS"];
   [controller_ ok:nil];
-  EXPECT_EQ(4, group_a_->GetChildCount());
+  EXPECT_EQ(4, group_a_->child_count());
   const BookmarkNode* folderChild = group_a_->GetChild(3);
   EXPECT_EQ(folderChild->GetTitle(), ASCIIToUTF16("ALL MY TABS"));
-  EXPECT_EQ(3, folderChild->GetChildCount());
+  EXPECT_EQ(3, folderChild->child_count());
 }
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index 2aa37d1..ddde6e4 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -644,7 +644,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
     if (node != bookmarkModel_->GetBookmarkBarNode() && !node->is_folder()) {
       const BookmarkNode* parent = node->parent();
       index = parent->GetIndexOf(node) + 1;
-      if (index > parent->GetChildCount())
+      if (index > parent->child_count())
         index = -1;
       node = parent;
     }
@@ -716,7 +716,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
       type == BookmarkNode::OTHER_NODE ||
       type == BookmarkNode::FOLDER) {
     parent = senderNode;
-    newIndex = parent->GetChildCount();
+    newIndex = parent->child_count();
   } else {
     parent = senderNode->parent();
     newIndex = parent->GetIndexOf(senderNode) + 1;
@@ -779,7 +779,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
   [[offTheSideButton_ cell] setStartingChildIndex:displayedButtonCount_];
   [[offTheSideButton_ cell]
    setBookmarkNode:bookmarkModel_->GetBookmarkBarNode()];
-  int bookmarkChildren = bookmarkModel_->GetBookmarkBarNode()->GetChildCount();
+  int bookmarkChildren = bookmarkModel_->GetBookmarkBarNode()->child_count();
   if (bookmarkChildren > displayedButtonCount_) {
     [offTheSideButton_ setHidden:NO];
   } else {
@@ -924,7 +924,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
   if (menu == [[self view] menu]) {
     thingsToDo = [buttons_ count] ? YES : NO;
   } else {
-    if (node && node->is_folder() && node->GetChildCount()) {
+    if (node && node->is_folder() && node->child_count()) {
       thingsToDo = YES;
     }
   }
@@ -1008,7 +1008,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
   if (child->is_folder()) {
     NSMenu* submenu = [[[NSMenu alloc] initWithTitle:title] autorelease];
     [menu setSubmenu:submenu forItem:item];
-    if (child->GetChildCount()) {
+    if (child->child_count()) {
       [self addFolderNode:child toMenu:submenu];  // potentially recursive
     } else {
       [self tagEmptyMenu:submenu];
@@ -1040,7 +1040,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
 // Add the children of the given bookmark node (and their children...)
 // to menu, one menu item per node.
 - (void)addFolderNode:(const BookmarkNode*)node toMenu:(NSMenu*)menu {
-  for (int i = 0; i < node->GetChildCount(); i++) {
+  for (int i = 0; i < node->child_count(); i++) {
     const BookmarkNode* child = node->GetChild(i);
     [self addNode:child toMenu:menu];
   }
@@ -1083,7 +1083,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
 // appropriate) the "no items" container (text which says "bookmarks
 // go here").
 - (void)showOrHideNoItemContainerForNode:(const BookmarkNode*)node {
-  BOOL hideNoItemWarning = node->GetChildCount() > 0;
+  BOOL hideNoItemWarning = node->child_count() > 0;
   [[buttonView_ noItemContainer] setHidden:hideNoItemWarning];
 }
 
@@ -1095,7 +1095,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
 
   CGFloat maxViewX = NSMaxX([[self view] bounds]);
   int xOffset = 0;
-  for (int i = 0; i < node->GetChildCount(); i++) {
+  for (int i = 0; i < node->child_count(); i++) {
     const BookmarkNode* child = node->GetChild(i);
     BookmarkButton* button = [self buttonForNode:child xOffset:&xOffset];
     if (NSMinX([button frame]) >= maxViewX)
@@ -1393,7 +1393,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
 
 - (void)redistributeButtonsOnBarAsNeeded {
   const BookmarkNode* node = bookmarkModel_->GetBookmarkBarNode();
-  NSInteger barCount = node->GetChildCount();
+  NSInteger barCount = node->child_count();
 
   // Determine the current maximum extent of the visible buttons.
   CGFloat maxViewX = NSMaxX([[self view] bounds]);
@@ -1781,7 +1781,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
   if ([button isFolder]) {
     destParent = [button bookmarkNode];
     // Drop it at the end.
-    destIndex = [button bookmarkNode]->GetChildCount();
+    destIndex = [button bookmarkNode]->child_count();
   } else {
     // Else we're dropping somewhere on the bar, so find the right spot.
     destParent = bookmarkModel_->GetBookmarkBarNode();
@@ -2354,7 +2354,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
   if ([button isFolder]) {
     destParent = [button bookmarkNode];
     // Drop it at the end.
-    destIndex = [button bookmarkNode]->GetChildCount();
+    destIndex = [button bookmarkNode]->child_count();
   } else {
     // Else we're dropping somewhere on the bar, so find the right spot.
     destParent = bookmarkModel_->GetBookmarkBarNode();
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index 7ff8540..0033e0b 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -323,7 +323,7 @@ class BookmarkBarControllerTest : public BookmarkBarControllerTestBase {
   NSMenuItem* ItemForBookmarkBarMenu(GURL& gurl) {
     BookmarkModel* model = helper_.profile()->GetBookmarkModel();
     const BookmarkNode* parent = model->GetBookmarkBarNode();
-    const BookmarkNode* node = model->AddURL(parent, parent->GetChildCount(),
+    const BookmarkNode* node = model->AddURL(parent, parent->child_count(),
                                              ASCIIToUTF16("A title"), gurl);
     [menu_ setRepresentedObject:[NSNumber numberWithLongLong:node->id()]];
     return menu_item_;
@@ -519,7 +519,7 @@ TEST_F(BookmarkBarControllerTest, NoItemContainerGoesAway) {
   DCHECK(noItemContainer);
 
   EXPECT_FALSE([noItemContainer isHidden]);
-  const BookmarkNode* node = model->AddURL(bar, bar->GetChildCount(),
+  const BookmarkNode* node = model->AddURL(bar, bar->child_count(),
                                            ASCIIToUTF16("title"),
                                            GURL("http://www.google.com"));
   EXPECT_TRUE([noItemContainer isHidden]);
@@ -528,7 +528,7 @@ TEST_F(BookmarkBarControllerTest, NoItemContainerGoesAway) {
 
   // Now try it using a bookmark from the Other Bookmarks.
   const BookmarkNode* otherBookmarks = model->other_node();
-  node = model->AddURL(otherBookmarks, otherBookmarks->GetChildCount(),
+  node = model->AddURL(otherBookmarks, otherBookmarks->child_count(),
                        ASCIIToUTF16("TheOther"),
                        GURL("http://www.other.com"));
   EXPECT_FALSE([noItemContainer isHidden]);
@@ -556,7 +556,7 @@ TEST_F(BookmarkBarControllerTest, OffTheSideButtonHidden) {
 
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   for (int i = 0; i < 20; i++) {
-    model->AddURL(parent, parent->GetChildCount(),
+    model->AddURL(parent, parent->child_count(),
                   ASCIIToUTF16("super duper wide title"),
                   GURL("http://superfriends.hall-of-justice.edu"));
   }
@@ -572,12 +572,12 @@ TEST_F(BookmarkBarControllerTest, OffTheSideButtonHidden) {
   BookmarkBarFolderController* bbfc = [bar_ folderController];
   EXPECT_TRUE(bbfc);
   [bbfc setIgnoreAnimations:YES];
-  while (parent->GetChildCount()) {
+  while (parent->child_count()) {
     // We've completed the job so we're done.
     if ([bar_ offTheSideButtonIsHidden])
       break;
     // Delete the last button.
-    model->Remove(parent, parent->GetChildCount()-1);
+    model->Remove(parent, parent->child_count()-1);
     // If last one make sure the menu is closed and the button is hidden.
     // Else make sure menu stays open.
     if ([bar_ offTheSideButtonIsHidden]) {
@@ -601,7 +601,7 @@ TEST_F(BookmarkBarControllerTest, DeleteFromOffTheSideWhileItIsOpen) {
   for (int i = 0; i < 100; i++) {
     std::ostringstream title;
     title << "super duper wide title " << i;
-    model->AddURL(parent, parent->GetChildCount(), ASCIIToUTF16(title.str()),
+    model->AddURL(parent, parent->child_count(), ASCIIToUTF16(title.str()),
                   GURL("http://superfriends.hall-of-justice.edu"));
   }
   EXPECT_FALSE([bar_ offTheSideButtonIsHidden]);
@@ -616,9 +616,9 @@ TEST_F(BookmarkBarControllerTest, DeleteFromOffTheSideWhileItIsOpen) {
   // Start deleting items; try and delete randomish ones in case it
   // makes a difference.
   int indices[] = { 2, 4, 5, 1, 7, 9, 2, 0, 10, 9 };
-  while (parent->GetChildCount()) {
+  while (parent->child_count()) {
     for (unsigned int i = 0; i < arraysize(indices); i++) {
-      if (indices[i] < parent->GetChildCount()) {
+      if (indices[i] < parent->child_count()) {
         // First we mouse-enter the button to make things harder.
         NSArray* buttons = [bbfc buttons];
         for (BookmarkButton* button in buttons) {
@@ -710,11 +710,11 @@ TEST_F(BookmarkBarControllerTest, MenuForFolderNode) {
   // Test with an actual folder as well
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   const BookmarkNode* folder = model->AddGroup(parent,
-                                               parent->GetChildCount(),
+                                               parent->child_count(),
                                                ASCIIToUTF16("group"));
-  model->AddURL(folder, folder->GetChildCount(),
+  model->AddURL(folder, folder->child_count(),
                 ASCIIToUTF16("f1"), GURL("http://framma-lamma.com"));
-  model->AddURL(folder, folder->GetChildCount(),
+  model->AddURL(folder, folder->child_count(),
                 ASCIIToUTF16("f2"), GURL("http://framma-lamma-ding-dong.com"));
   menu = [bar_ menuForFolderNode:model->GetBookmarkBarNode()];
   EXPECT_EQ([menu numberOfItems], 3);
@@ -823,7 +823,7 @@ TEST_F(BookmarkBarControllerTest, TestButtonLimits) {
   EXPECT_EQ(0U, [[bar_ buttons] count]);
   // Add one; make sure we see it.
   const BookmarkNode* parent = model->GetBookmarkBarNode();
-  model->AddURL(parent, parent->GetChildCount(),
+  model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("title"), GURL("http://www.google.com"));
   EXPECT_EQ(1U, [[bar_ buttons] count]);
 
@@ -832,7 +832,7 @@ TEST_F(BookmarkBarControllerTest, TestButtonLimits) {
   model->Remove(parent, 0);
   EXPECT_EQ(0U, [[bar_ buttons] count]);
   for (int i=0; i<30; i++) {
-    model->AddURL(parent, parent->GetChildCount(),
+    model->AddURL(parent, parent->child_count(),
                   ASCIIToUTF16("title"), GURL("http://www.google.com"));
   }
   int count = [[bar_ buttons] count];
@@ -913,15 +913,15 @@ TEST_F(BookmarkBarControllerTest, DeleteBookmark) {
                          "http://www.foo-bar-baz.com/" };
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   for (unsigned int i = 0; i < arraysize(urls); i++) {
-    model->AddURL(parent, parent->GetChildCount(),
+    model->AddURL(parent, parent->child_count(),
                   ASCIIToUTF16("title"), GURL(urls[i]));
   }
-  EXPECT_EQ(3, parent->GetChildCount());
+  EXPECT_EQ(3, parent->child_count());
   const BookmarkNode* middle_node = parent->GetChild(1);
 
   NSMenuItem* item = ItemForBookmarkBarMenu(middle_node);
   [bar_ deleteBookmark:item];
-  EXPECT_EQ(2, parent->GetChildCount());
+  EXPECT_EQ(2, parent->child_count());
   EXPECT_EQ(parent->GetChild(0)->GetURL(), GURL(urls[0]));
   // node 2 moved into spot 1
   EXPECT_EQ(parent->GetChild(1)->GetURL(), GURL(urls[2]));
@@ -935,7 +935,7 @@ TEST_F(BookmarkBarControllerTest, Cell) {
   [bar_ loaded:model];
 
   const BookmarkNode* parent = model->GetBookmarkBarNode();
-  model->AddURL(parent, parent->GetChildCount(),
+  model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("supertitle"),
                 GURL("http://superfriends.hall-of-justice.edu"));
   const BookmarkNode* node = parent->GetChild(0);
@@ -985,7 +985,7 @@ TEST_F(BookmarkBarControllerTest, HidesHelpMessageWithBookmark) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
 
   const BookmarkNode* parent = model->GetBookmarkBarNode();
-  model->AddURL(parent, parent->GetChildCount(),
+  model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("title"), GURL("http://one.com"));
 
   [bar_ loaded:model];
@@ -996,7 +996,7 @@ TEST_F(BookmarkBarControllerTest, BookmarkButtonSizing) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
 
   const BookmarkNode* parent = model->GetBookmarkBarNode();
-  model->AddURL(parent, parent->GetChildCount(),
+  model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("title"), GURL("http://one.com"));
 
   [bar_ loaded:model];
@@ -1037,8 +1037,8 @@ TEST_F(BookmarkBarControllerTest, DropBookmarks) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   [bar_ addURLs:nsurls withTitles:nstitles at:NSZeroPoint];
-  EXPECT_EQ(4, parent->GetChildCount());
-  for (int i = 0; i < parent->GetChildCount(); ++i) {
+  EXPECT_EQ(4, parent->child_count());
+  for (int i = 0; i < parent->child_count(); ++i) {
     GURL gurl = parent->GetChild(i)->GetURL();
     if (gurl.scheme() == "http" ||
         gurl.scheme() == "javascript") {
@@ -1087,7 +1087,7 @@ TEST_F(BookmarkBarControllerTest, TestMenuNodeAndDisable) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   const BookmarkNode* folder = model->AddGroup(parent,
-                                               parent->GetChildCount(),
+                                               parent->child_count(),
                                                ASCIIToUTF16("group"));
   NSButton* button = [[bar_ buttons] objectAtIndex:0];
   EXPECT_TRUE(button);
@@ -1104,7 +1104,7 @@ TEST_F(BookmarkBarControllerTest, TestMenuNodeAndDisable) {
   EXPECT_FALSE([bar_ validateUserInterfaceItem:item]);
 
   // Now add a child and make sure the item would be enabled.
-  model->AddURL(folder, folder->GetChildCount(),
+  model->AddURL(folder, folder->child_count(),
                 ASCIIToUTF16("super duper wide title"),
                 GURL("http://superfriends.hall-of-justice.edu"));
   EXPECT_TRUE([bar_ validateUserInterfaceItem:item]);
@@ -1169,7 +1169,7 @@ TEST_F(BookmarkBarControllerTest, TestDragButton) {
   model->AddURL(folder, 0, ASCIIToUTF16("already"),
                 GURL("http://www.google.com"));
   EXPECT_EQ(arraysize(titles) + 1, [[bar_ buttons] count]);
-  EXPECT_EQ(1, folder->GetChildCount());
+  EXPECT_EQ(1, folder->child_count());
   x = NSMidX([[[bar_ buttons] objectAtIndex:0] frame]);
   x += [[bar_ view] frame].origin.x;
   string16 title = [[[bar_ buttons] objectAtIndex:2] bookmarkNode]->GetTitle();
@@ -1179,7 +1179,7 @@ TEST_F(BookmarkBarControllerTest, TestDragButton) {
   // Gone from the bar
   EXPECT_EQ(arraysize(titles), [[bar_ buttons] count]);
   // In the folder
-  EXPECT_EQ(2, folder->GetChildCount());
+  EXPECT_EQ(2, folder->child_count());
   // At the end
   EXPECT_EQ(title, folder->GetChild(1)->GetTitle());
 }
@@ -1279,11 +1279,11 @@ TEST_F(BookmarkBarControllerTest, TestFolders) {
   // Create some folder buttons.
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   const BookmarkNode* folder = model->AddGroup(parent,
-                                               parent->GetChildCount(),
+                                               parent->child_count(),
                                                ASCIIToUTF16("group"));
-  model->AddURL(folder, folder->GetChildCount(),
+  model->AddURL(folder, folder->child_count(),
                 ASCIIToUTF16("f1"), GURL("http://framma-lamma.com"));
-  folder = model->AddGroup(parent, parent->GetChildCount(),
+  folder = model->AddGroup(parent, parent->child_count(),
                            ASCIIToUTF16("empty"));
 
   EXPECT_EQ([[bar_ buttons] count], 2U);
@@ -1329,7 +1329,7 @@ TEST_F(BookmarkBarControllerTest, TestFolderButtons) {
 
   // Add a real bookmark so we can click on it.
   const BookmarkNode* folder = root->GetChild(3);
-  model.AddURL(folder, folder->GetChildCount(), ASCIIToUTF16("CLICK ME"),
+  model.AddURL(folder, folder->child_count(), ASCIIToUTF16("CLICK ME"),
                GURL("http://www.google.com/"));
 
   // Click on a folder button.
@@ -1392,14 +1392,14 @@ TEST_F(BookmarkBarControllerTest, OffTheSideFolder) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   for (int x = 0; x < 30; x++) {
-    model->AddURL(parent, parent->GetChildCount(),
+    model->AddURL(parent, parent->child_count(),
                   ASCIIToUTF16("medium-size-title"),
                   GURL("http://framma-lamma.com"));
   }
   // Add a couple more so we can delete one and make sure its button goes away.
-  model->AddURL(parent, parent->GetChildCount(),
+  model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("DELETE_ME"), GURL("http://ashton-tate.com"));
-  model->AddURL(parent, parent->GetChildCount(),
+  model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("medium-size-title"),
                 GURL("http://framma-lamma.com"));
 
@@ -1429,7 +1429,7 @@ TEST_F(BookmarkBarControllerTest, OffTheSideFolder) {
   // Delete a bookmark in the off-the-side and verify it's gone.
   BookmarkButton* button = [bbfc buttonWithTitleEqualTo:@"DELETE_ME"];
   EXPECT_TRUE(button);
-  model->Remove(parent, parent->GetChildCount() - 2);
+  model->Remove(parent, parent->child_count() - 2);
   button = [bbfc buttonWithTitleEqualTo:@"DELETE_ME"];
   EXPECT_FALSE(button);
 }
@@ -1470,8 +1470,8 @@ TEST_F(BookmarkBarControllerTest, DropDestination) {
   // Make some buttons.
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->GetBookmarkBarNode();
-  model->AddGroup(parent, parent->GetChildCount(), ASCIIToUTF16("group 1"));
-  model->AddGroup(parent, parent->GetChildCount(), ASCIIToUTF16("group 2"));
+  model->AddGroup(parent, parent->child_count(), ASCIIToUTF16("group 1"));
+  model->AddGroup(parent, parent->child_count(), ASCIIToUTF16("group 2"));
   EXPECT_EQ([[bar_ buttons] count], 2U);
 
   // Confirm "off to left" and "off to right" match nothing.
@@ -1511,7 +1511,7 @@ TEST_F(BookmarkBarControllerTest, NodeDeletedWhileMenuIsOpen) {
 
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   const BookmarkNode* initialNode = model->AddURL(
-      parent, parent->GetChildCount(),
+      parent, parent->child_count(),
       ASCIIToUTF16("initial"),
       GURL("http://www.google.com"));
 
@@ -1550,9 +1550,9 @@ TEST_F(BookmarkBarControllerTest, NodeDeletedWhileContextMenuIsOpen) {
 
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   const BookmarkNode* folder = model->AddGroup(parent,
-                                               parent->GetChildCount(),
+                                               parent->child_count(),
                                                ASCIIToUTF16("group"));
-  const BookmarkNode* framma = model->AddURL(folder, folder->GetChildCount(),
+  const BookmarkNode* framma = model->AddURL(folder, folder->child_count(),
                                              ASCIIToUTF16("f1"),
                                              GURL("http://framma-lamma.com"));
 
@@ -1574,13 +1574,13 @@ TEST_F(BookmarkBarControllerTest, CloseFolderOnAnimate) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   const BookmarkNode* folder = model->AddGroup(parent,
-                                               parent->GetChildCount(),
+                                               parent->child_count(),
                                                ASCIIToUTF16("group"));
-  model->AddGroup(parent, parent->GetChildCount(),
+  model->AddGroup(parent, parent->child_count(),
                   ASCIIToUTF16("sibbling group"));
-  model->AddURL(folder, folder->GetChildCount(), ASCIIToUTF16("title a"),
+  model->AddURL(folder, folder->child_count(), ASCIIToUTF16("title a"),
                 GURL("http://www.google.com/a"));
-  model->AddURL(folder, folder->GetChildCount(),
+  model->AddURL(folder, folder->child_count(),
       ASCIIToUTF16("title super duper long long whoa momma title you betcha"),
       GURL("http://www.google.com/b"));
   BookmarkButton* button = [[bar_ buttons] objectAtIndex:0];
@@ -1697,15 +1697,15 @@ public:
     BookmarkModel* model = helper_.profile()->GetBookmarkModel();
     parent_ = model->GetBookmarkBarNode();
     // { one, { two-one, two-two }, three }
-    model->AddURL(parent_, parent_->GetChildCount(), ASCIIToUTF16("title"),
+    model->AddURL(parent_, parent_->child_count(), ASCIIToUTF16("title"),
                   GURL("http://one.com"));
-    folder_ = model->AddGroup(parent_, parent_->GetChildCount(),
+    folder_ = model->AddGroup(parent_, parent_->child_count(),
                               ASCIIToUTF16("group"));
-    model->AddURL(folder_, folder_->GetChildCount(),
+    model->AddURL(folder_, folder_->child_count(),
                   ASCIIToUTF16("title"), GURL("http://two-one.com"));
-    model->AddURL(folder_, folder_->GetChildCount(),
+    model->AddURL(folder_, folder_->child_count(),
                   ASCIIToUTF16("title"), GURL("http://two-two.com"));
-    model->AddURL(parent_, parent_->GetChildCount(),
+    model->AddURL(parent_, parent_->child_count(),
                   ASCIIToUTF16("title"), GURL("https://three.com"));
   }
   const BookmarkNode* parent_;  // Weak
@@ -1875,7 +1875,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragMoveBarBookmarkToOffTheSide) {
 
   // Remember how many buttons are showing and are available.
   int oldDisplayedButtons = [bar_ displayedButtonCount];
-  int oldChildCount = root->GetChildCount();
+  int oldChildCount = root->child_count();
 
   // Pop up the off-the-side menu.
   BookmarkButton* otsButton = (BookmarkButton*)[bar_ offTheSideButton];
@@ -1899,7 +1899,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragMoveBarBookmarkToOffTheSide) {
   // There should still be the same number of buttons in the bar
   // and off-the-side should have one more.
   int newDisplayedButtons = [bar_ displayedButtonCount];
-  int newChildCount = root->GetChildCount();
+  int newChildCount = root->child_count();
   int newOTSCount = (int)[[otsController buttons] count];
   EXPECT_EQ(oldDisplayedButtons, newDisplayedButtons);
   EXPECT_EQ(oldChildCount + 1, newChildCount);
@@ -1933,8 +1933,8 @@ TEST_F(BookmarkBarControllerDragDropTest, DragOffTheSideToOther) {
 
   // Remember how many buttons are showing and are available.
   int oldDisplayedButtons = [bar_ displayedButtonCount];
-  int oldRootCount = root->GetChildCount();
-  int oldOtherCount = other->GetChildCount();
+  int oldRootCount = root->child_count();
+  int oldOtherCount = other->child_count();
 
   // Pop up the off-the-side menu.
   BookmarkButton* otsButton = (BookmarkButton*)[bar_ offTheSideButton];
@@ -1956,9 +1956,9 @@ TEST_F(BookmarkBarControllerDragDropTest, DragOffTheSideToOther) {
 
   // There should one less button in the bar, one less in off-the-side,
   // and one more in other bookmarks.
-  int newRootCount = root->GetChildCount();
+  int newRootCount = root->child_count();
   int newOTSCount = (int)[[otsController buttons] count];
-  int newOtherCount = other->GetChildCount();
+  int newOtherCount = other->child_count();
   EXPECT_EQ(oldRootCount - 1, newRootCount);
   EXPECT_EQ(oldOTSCount - 1, newOTSCount);
   EXPECT_EQ(oldOtherCount + 1, newOtherCount);
@@ -1982,7 +1982,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkData) {
   EXPECT_EQ(other_string, actual);
 
   // Remember the little ones.
-  int oldChildCount = root->GetChildCount();
+  int oldChildCount = root->child_count();
 
   BookmarkButton* targetButton = [bar_ buttonWithTitleEqualTo:@"3b"];
   ASSERT_TRUE(targetButton);
@@ -1995,7 +1995,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkData) {
   [bar_ dragBookmarkData:(id<NSDraggingInfo>)dragInfo.get()];
 
   // There should one more button in the bar.
-  int newChildCount = root->GetChildCount();
+  int newChildCount = root->child_count();
   EXPECT_EQ(oldChildCount + 1, newChildCount);
   // Verify the model.
   const std::string expected("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
@@ -2014,7 +2014,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkData) {
   [dragInfo setDropLocation:targetPoint];
   [bar_ dragBookmarkData:(id<NSDraggingInfo>)dragInfo.get()];
 
-  newChildCount = root->GetChildCount();
+  newChildCount = root->child_count();
   EXPECT_EQ(oldChildCount, newChildCount);
   // Verify the model.
   const std::string expected1("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
@@ -2036,7 +2036,7 @@ TEST_F(BookmarkBarControllerDragDropTest, AddURLs) {
   EXPECT_EQ(model_string, actual);
 
   // Remember the children.
-  int oldChildCount = root->GetChildCount();
+  int oldChildCount = root->child_count();
 
   BookmarkButton* targetButton = [bar_ buttonWithTitleEqualTo:@"3b"];
   ASSERT_TRUE(targetButton);
@@ -2047,7 +2047,7 @@ TEST_F(BookmarkBarControllerDragDropTest, AddURLs) {
   [bar_ addURLs:urls withTitles:titles at:[targetButton center]];
 
   // There should two more nodes in the bar.
-  int newChildCount = root->GetChildCount();
+  int newChildCount = root->child_count();
   EXPECT_EQ(oldChildCount + 2, newChildCount);
   // Verify the model.
   const std::string expected("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
@@ -2108,7 +2108,7 @@ TEST_F(BookmarkBarControllerDragDropTest, PulseButton) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* root = model->GetBookmarkBarNode();
   GURL gurl("http://www.google.com");
-  const BookmarkNode* node = model->AddURL(root, root->GetChildCount(),
+  const BookmarkNode* node = model->AddURL(root, root->child_count(),
                                            ASCIIToUTF16("title"), gurl);
 
   BookmarkButton* button = [[bar_ buttons] objectAtIndex:0];
@@ -2150,7 +2150,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkDataToTrash) {
   std::string actual = model_test_utils::ModelStringFromNode(root);
   EXPECT_EQ(model_string, actual);
 
-  int oldChildCount = root->GetChildCount();
+  int oldChildCount = root->child_count();
 
   // Drag a button to the trash.
   BookmarkButton* buttonToDelete = [bar_ buttonWithTitleEqualTo:@"3b"];
@@ -2159,7 +2159,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkDataToTrash) {
   [bar_ didDragBookmarkToTrash:buttonToDelete];
 
   // There should be one less button in the bar.
-  int newChildCount = root->GetChildCount();
+  int newChildCount = root->child_count();
   EXPECT_EQ(oldChildCount - 1, newChildCount);
   // Verify the model.
   const std::string expected("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
index 76b7dca..b74b2cf 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
@@ -730,9 +730,9 @@ struct LayoutMetrics {
   const BookmarkNode* node = [parentButton_ bookmarkNode];
   DCHECK(node);
   int startingIndex = [[parentButton_ cell] startingChildIndex];
-  DCHECK_LE(startingIndex, node->GetChildCount());
+  DCHECK_LE(startingIndex, node->child_count());
   // Must have at least 1 button (for "empty")
-  int buttons = std::max(node->GetChildCount() - startingIndex, 1);
+  int buttons = std::max(node->child_count() - startingIndex, 1);
 
   // Prelim height of the window.  We'll trim later as needed.
   int height = [self menuHeightForButtonCount:buttons];
@@ -751,7 +751,7 @@ struct LayoutMetrics {
   // TODO(jrg): combine with addNodesToButtonList: code from
   // bookmark_bar_controller.mm (but use y offset)
   // http://crbug.com/35966
-  if (!node->GetChildCount()) {
+  if (!node->child_count()) {
     // If no children we are the empty button.
     BookmarkButton* button = [self makeButtonForNode:nil
                                                frame:buttonsOuterFrame];
@@ -759,7 +759,7 @@ struct LayoutMetrics {
     [folderView_ addSubview:button];
   } else {
     for (int i = startingIndex;
-         i < node->GetChildCount();
+         i < node->child_count();
          i++) {
       const BookmarkNode* child = node->GetChild(i);
       BookmarkButton* button = [self makeButtonForNode:child
@@ -1177,7 +1177,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
   if ([button isFolder]) {
     destParent = [button bookmarkNode];
     // Drop it at the end.
-    destIndex = [button bookmarkNode]->GetChildCount();
+    destIndex = [button bookmarkNode]->child_count();
   } else {
     // Else we're dropping somewhere in the folder, so find the right spot.
     destParent = [parentButton_ bookmarkNode];
@@ -1478,7 +1478,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
   // placeholder button. This can be detected by checking for a parent
   // child count of 1.
   const BookmarkNode* parentNode = node->parent();
-  if (parentNode->GetChildCount() == 1) {
+  if (parentNode->child_count() == 1) {
     BookmarkButton* emptyButton = [buttons_ lastObject];
     newButtonFrame = [emptyButton frame];
     [emptyButton setDelegate:nil];
@@ -1525,7 +1525,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
   if ([button isFolder]) {
     destParent = [button bookmarkNode];
     // Drop it at the end.
-    destIndex = [button bookmarkNode]->GetChildCount();
+    destIndex = [button bookmarkNode]->child_count();
   } else {
     // Else we're dropping somewhere in the folder, so find the right spot.
     destParent = [parentButton_ bookmarkNode];
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
index ee9686d..27ad718 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
@@ -132,24 +132,24 @@ class BookmarkBarFolderControllerTest : public CocoaTest {
     BookmarkModel* model = helper_.profile()->GetBookmarkModel();
     const BookmarkNode* parent = model->GetBookmarkBarNode();
     const BookmarkNode* folderA = model->AddGroup(parent,
-                                                  parent->GetChildCount(),
+                                                  parent->child_count(),
                                                   ASCIIToUTF16("group"));
     folderA_ = folderA;
-    model->AddGroup(parent, parent->GetChildCount(),
+    model->AddGroup(parent, parent->child_count(),
                     ASCIIToUTF16("sibbling group"));
     const BookmarkNode* folderB = model->AddGroup(folderA,
-                                                  folderA->GetChildCount(),
+                                                  folderA->child_count(),
                                                   ASCIIToUTF16("subgroup 1"));
     model->AddGroup(folderA,
-                    folderA->GetChildCount(),
+                    folderA->child_count(),
                     ASCIIToUTF16("subgroup 2"));
-    model->AddURL(folderA, folderA->GetChildCount(), ASCIIToUTF16("title a"),
+    model->AddURL(folderA, folderA->child_count(), ASCIIToUTF16("title a"),
                   GURL("http://www.google.com/a"));
     longTitleNode_ = model->AddURL(
-      folderA, folderA->GetChildCount(),
+      folderA, folderA->child_count(),
       ASCIIToUTF16("title super duper long long whoa momma title you betcha"),
       GURL("http://www.google.com/b"));
-    model->AddURL(folderB, folderB->GetChildCount(), ASCIIToUTF16("t"),
+    model->AddURL(folderB, folderB->child_count(), ASCIIToUTF16("t"),
                   GURL("http://www.google.com/c"));
 
     bar_.reset(
@@ -183,7 +183,7 @@ class BookmarkBarFolderControllerTest : public CocoaTest {
   int AddLotsOfNodes() {
     BookmarkModel* model = helper_.profile()->GetBookmarkModel();
     for (int i = 0; i < kLotsOfNodesCount; i++) {
-      model->AddURL(folderA_, folderA_->GetChildCount(),
+      model->AddURL(folderA_, folderA_->child_count(),
                     ASCIIToUTF16("repeated title"),
                     GURL("http://www.google.com/repeated/url"));
     }
@@ -1169,7 +1169,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) {
 
   const BookmarkNode* parent = model.GetBookmarkBarNode();
   const BookmarkNode* folder = model.AddGroup(parent,
-                                              parent->GetChildCount(),
+                                              parent->child_count(),
                                               ASCIIToUTF16("BIG"));
 
   // Pop open the new folder window and verify it has one (empty) item.
@@ -1189,7 +1189,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) {
   EXPECT_FALSE([folderController canScrollDown]);
 
   // Now add a real bookmark and reopen.
-  model.AddURL(folder, folder->GetChildCount(), ASCIIToUTF16("a"),
+  model.AddURL(folder, folder->child_count(), ASCIIToUTF16("a"),
                GURL("http://a.com/"));
   folderController = [bar_ folderController];
   EXPECT_TRUE(folderController);
@@ -1215,7 +1215,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) {
   EXPECT_LT(scrollerWidth, NSWidth([folderView frame]));
 
   // Add a wider bookmark and make sure the button widths match.
-  int reallyWideButtonNumber = folder->GetChildCount();
+  int reallyWideButtonNumber = folder->child_count();
   model.AddURL(folder, reallyWideButtonNumber,
                ASCIIToUTF16("A really, really, really, really, really, "
                             "really long name"),
@@ -1230,7 +1230,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) {
   // for a scroll up arrow.
   NSUInteger tripWire = 0;  // Prevent a runaway.
   while (![folderController canScrollUp] && ++tripWire < 1000) {
-    model.AddURL(folder, folder->GetChildCount(), ASCIIToUTF16("B"),
+    model.AddURL(folder, folder->child_count(), ASCIIToUTF16("B"),
                  GURL("http://b.com/"));
   }
   EXPECT_TRUE([folderController canScrollUp]);
@@ -1256,10 +1256,10 @@ TEST_F(BookmarkBarFolderControllerMenuTest, HoverThenDeleteBookmark) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
   const BookmarkNode* root = model.GetBookmarkBarNode();
   const BookmarkNode* folder = model.AddGroup(root,
-                                              root->GetChildCount(),
+                                              root->child_count(),
                                               ASCIIToUTF16("BIG"));
   for (int i = 0; i < kLotsOfNodesCount; i++)
-    model.AddURL(folder, folder->GetChildCount(), ASCIIToUTF16("kid"),
+    model.AddURL(folder, folder->child_count(), ASCIIToUTF16("kid"),
                   GURL("http://kid.com/smile"));
 
   // Pop open the new folder window and hover one of its kids.
@@ -1391,7 +1391,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkDataToTrash) {
   EXPECT_EQ(model_string, actual);
 
   const BookmarkNode* folderNode = root->GetChild(1);
-  int oldFolderChildCount = folderNode->GetChildCount();
+  int oldFolderChildCount = folderNode->child_count();
 
   // Pop open a folder.
   BookmarkButton* button = [bar_ buttonWithTitleEqualTo:@"2f"];
@@ -1409,7 +1409,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkDataToTrash) {
   [folderController didDragBookmarkToTrash:buttonToDelete];
 
   // There should be one less button in the folder.
-  int newFolderChildCount = folderNode->GetChildCount();
+  int newFolderChildCount = folderNode->child_count();
   EXPECT_EQ(oldFolderChildCount - 1, newFolderChildCount);
   // Verify the model.
   const std::string expected("1b 2f:[ 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
index 4ab54b1..d7f3d6c 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
@@ -343,7 +343,7 @@ void BookmarkBubbleNotificationBridge::Observe(
       static_cast<const BookmarkNode*>([representedObject pointerValue]);
   DCHECK(newParent);
   if (oldParent != newParent) {
-    int index = newParent->GetChildCount();
+    int index = newParent->child_count();
     model_->Move(node_, newParent, index);
     UserMetrics::RecordAction(UserMetricsAction("BookmarkBubble_ChangeParent"),
                               model_->profile());
@@ -395,7 +395,7 @@ void BookmarkBubbleNotificationBridge::Observe(
     [item setIndentationLevel:indentation];
     ++indentation;
   }
-  for (int i = 0; i < parent->GetChildCount(); i++) {
+  for (int i = 0; i < parent->child_count(); i++) {
     const BookmarkNode* child = parent->GetChild(i);
     if (child->is_folder())
       [self addFolderNodes:child
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm
index 6460ebf..472ba54 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -160,7 +160,7 @@ TEST_F(BookmarkButtonCellTest, Awake) {
 TEST_F(BookmarkButtonCellTest, FolderArrow) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* bar = model->GetBookmarkBarNode();
-  const BookmarkNode* node = model->AddURL(bar, bar->GetChildCount(),
+  const BookmarkNode* node = model->AddURL(bar, bar->child_count(),
                                            ASCIIToUTF16("title"),
                                            GURL("http://www.google.com"));
   scoped_nsobject<BookmarkButtonCell> cell(
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
index 8d4f312..6d39cf4 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -392,7 +392,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
 
 - (NSMutableArray*)addChildFoldersFromNode:(const BookmarkNode*)node {
   NSMutableArray* childFolders = nil;
-  int childCount = node->GetChildCount();
+  int childCount = node->child_count();
   for (int i = 0; i < childCount; ++i) {
     const BookmarkNode* childNode = node->GetChild(i);
     if (childNode->type() != BookmarkNode::URL) {
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
index 1df1697..50a30f6 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -89,49 +89,49 @@ class BookmarkEditorBaseControllerTest : public CocoaTest {
 TEST_F(BookmarkEditorBaseControllerTest, VerifyBookmarkTestModel) {
   BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
   const BookmarkNode& root(*model.GetBookmarkBarNode());
-  EXPECT_EQ(4, root.GetChildCount());
+  EXPECT_EQ(4, root.child_count());
   // a
   const BookmarkNode* child = root.GetChild(0);
-  EXPECT_EQ(3, child->GetChildCount());
+  EXPECT_EQ(3, child->child_count());
   const BookmarkNode* subchild = child->GetChild(0);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(1);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(2);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   // b
   child = root.GetChild(1);
-  EXPECT_EQ(5, child->GetChildCount());
+  EXPECT_EQ(5, child->child_count());
   subchild = child->GetChild(0);
-  EXPECT_EQ(1, subchild->GetChildCount());
+  EXPECT_EQ(1, subchild->child_count());
   const BookmarkNode* subsubchild = subchild->GetChild(0);
-  EXPECT_EQ(0, subsubchild->GetChildCount());
+  EXPECT_EQ(0, subsubchild->child_count());
   subchild = child->GetChild(1);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(2);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(3);
-  EXPECT_EQ(2, subchild->GetChildCount());
+  EXPECT_EQ(2, subchild->child_count());
   subsubchild = subchild->GetChild(0);
-  EXPECT_EQ(0, subsubchild->GetChildCount());
+  EXPECT_EQ(0, subsubchild->child_count());
   subsubchild = subchild->GetChild(1);
-  EXPECT_EQ(0, subsubchild->GetChildCount());
+  EXPECT_EQ(0, subsubchild->child_count());
   subchild = child->GetChild(4);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   // c
   child = root.GetChild(2);
-  EXPECT_EQ(4, child->GetChildCount());
+  EXPECT_EQ(4, child->child_count());
   subchild = child->GetChild(0);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(1);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(2);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(3);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   // d
   child = root.GetChild(3);
-  EXPECT_EQ(0, child->GetChildCount());
+  EXPECT_EQ(0, child->child_count());
   [controller_ cancel:nil];
 }
 
@@ -144,7 +144,7 @@ TEST_F(BookmarkEditorBaseControllerTest, NodeSelection) {
 }
 
 TEST_F(BookmarkEditorBaseControllerTest, CreateFolder) {
-  EXPECT_EQ(2, group_b_3_->GetChildCount());
+  EXPECT_EQ(2, group_b_3_->child_count());
   [controller_ selectTestNodeInBrowser:group_b_3_];
   NSString* expectedName =
       l10n_util::GetNSStringWithFixup(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME);
@@ -160,7 +160,7 @@ TEST_F(BookmarkEditorBaseControllerTest, CreateFolder) {
   EXPECT_NSEQ(expectedName, newFolderName);
   [controller_ createNewFolders];
   // Verify that the tab folder was added to the new folder.
-  EXPECT_EQ(3, group_b_3_->GetChildCount());
+  EXPECT_EQ(3, group_b_3_->child_count());
   [controller_ cancel:nil];
 }
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm
index 557150f..c320e9c 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -126,10 +126,10 @@
     model->SetTitle(node_, newTitle);
     const BookmarkNode* oldParentNode = [self parentNode];
     if (newParentNode != oldParentNode)
-      model->Move(node_, newParentNode, newParentNode->GetChildCount());
+      model->Move(node_, newParentNode, newParentNode->child_count());
   } else {
     // Otherwise, add a new bookmark at the end of the newly selected folder.
-    model->AddURL(newParentNode, newParentNode->GetChildCount(), newTitle,
+    model->AddURL(newParentNode, newParentNode->child_count(), newTitle,
                   newURL);
   }
   return [NSNumber numberWithBool:YES];
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
index 5e27422..ae9c383 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
@@ -50,7 +50,7 @@ class BookmarkEditorControllerTest : public CocoaTest {
 
 TEST_F(BookmarkEditorControllerTest, NoEdit) {
   [controller_ cancel:nil];
-  ASSERT_EQ(default_parent_->GetChildCount(), 1);
+  ASSERT_EQ(default_parent_->child_count(), 1);
   const BookmarkNode* child = default_parent_->GetChild(0);
   EXPECT_EQ(child->GetTitle(), default_title_);
   EXPECT_EQ(child->GetURL(), GURL(default_name_));
@@ -59,7 +59,7 @@ TEST_F(BookmarkEditorControllerTest, NoEdit) {
 TEST_F(BookmarkEditorControllerTest, EditTitle) {
   [controller_ setDisplayName:@"whamma jamma bamma"];
   [controller_ ok:nil];
-  ASSERT_EQ(default_parent_->GetChildCount(), 1);
+  ASSERT_EQ(default_parent_->child_count(), 1);
   const BookmarkNode* child = default_parent_->GetChild(0);
   EXPECT_EQ(child->GetTitle(), ASCIIToUTF16("whamma jamma bamma"));
   EXPECT_EQ(child->GetURL(), GURL(default_name_));
@@ -70,7 +70,7 @@ TEST_F(BookmarkEditorControllerTest, EditURL) {
   [controller_ setDisplayURL:@"http://yellow-sneakers.com/"];
   EXPECT_TRUE([controller_ okButtonEnabled]);
   [controller_ ok:nil];
-  ASSERT_EQ(default_parent_->GetChildCount(), 1);
+  ASSERT_EQ(default_parent_->child_count(), 1);
   const BookmarkNode* child = default_parent_->GetChild(0);
   EXPECT_EQ(child->GetTitle(), default_title_);
   EXPECT_EQ(child->GetURL(), GURL("http://yellow-sneakers.com/"));
@@ -79,7 +79,7 @@ TEST_F(BookmarkEditorControllerTest, EditURL) {
 TEST_F(BookmarkEditorControllerTest, EditAndFixPrefix) {
   [controller_ setDisplayURL:@"x"];
   [controller_ ok:nil];
-  ASSERT_EQ(default_parent_->GetChildCount(), 1);
+  ASSERT_EQ(default_parent_->child_count(), 1);
   const BookmarkNode* child = default_parent_->GetChild(0);
   EXPECT_TRUE(child->GetURL().is_valid());
 }
@@ -300,50 +300,50 @@ TEST_F(BookmarkEditorControllerTreeTest, VerifyBookmarkTestModel) {
   BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
   model.root_node();
   const BookmarkNode& root(*model.GetBookmarkBarNode());
-  EXPECT_EQ(4, root.GetChildCount());
+  EXPECT_EQ(4, root.child_count());
   const BookmarkNode* child = root.GetChild(0);
-  EXPECT_EQ(3, child->GetChildCount());
+  EXPECT_EQ(3, child->child_count());
   const BookmarkNode* subchild = child->GetChild(0);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(1);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(2);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
 
   child = root.GetChild(1);
-  EXPECT_EQ(4, child->GetChildCount());
+  EXPECT_EQ(4, child->child_count());
   subchild = child->GetChild(0);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(1);
-  EXPECT_EQ(5, subchild->GetChildCount());
+  EXPECT_EQ(5, subchild->child_count());
   const BookmarkNode* subsubchild = subchild->GetChild(0);
-  EXPECT_EQ(0, subsubchild->GetChildCount());
+  EXPECT_EQ(0, subsubchild->child_count());
   subsubchild = subchild->GetChild(1);
-  EXPECT_EQ(0, subsubchild->GetChildCount());
+  EXPECT_EQ(0, subsubchild->child_count());
   subsubchild = subchild->GetChild(2);
-  EXPECT_EQ(0, subsubchild->GetChildCount());
+  EXPECT_EQ(0, subsubchild->child_count());
   subsubchild = subchild->GetChild(3);
-  EXPECT_EQ(0, subsubchild->GetChildCount());
+  EXPECT_EQ(0, subsubchild->child_count());
   subsubchild = subchild->GetChild(4);
-  EXPECT_EQ(0, subsubchild->GetChildCount());
+  EXPECT_EQ(0, subsubchild->child_count());
   subchild = child->GetChild(2);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(3);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
 
   child = root.GetChild(2);
-  EXPECT_EQ(4, child->GetChildCount());
+  EXPECT_EQ(4, child->child_count());
   subchild = child->GetChild(0);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(1);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(2);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
   subchild = child->GetChild(3);
-  EXPECT_EQ(0, subchild->GetChildCount());
+  EXPECT_EQ(0, subchild->child_count());
 
   child = root.GetChild(3);
-  EXPECT_EQ(0, child->GetChildCount());
+  EXPECT_EQ(0, child->child_count());
   [controller_ cancel:nil];
 }
 
@@ -395,7 +395,7 @@ TEST_F(BookmarkEditorControllerTreeTest, AddFolderWithGroupSelected) {
   // Folders are NOT added unless the OK button is pressed.
   [controller_ newFolder:nil];
   [controller_ cancel:nil];
-  EXPECT_EQ(5, group_bb_->GetChildCount());
+  EXPECT_EQ(5, group_bb_->child_count());
 }
 
 class BookmarkEditorControllerTreeNoNodeTest :
@@ -417,7 +417,7 @@ TEST_F(BookmarkEditorControllerTreeNoNodeTest, NewBookmarkNoNode) {
   [controller_ setDisplayURL:@"http://NEWURL.com"];
   [controller_ ok:nil];
   const BookmarkNode* new_node = group_bb_->GetChild(5);
-  ASSERT_EQ(0, new_node->GetChildCount());
+  ASSERT_EQ(0, new_node->child_count());
   EXPECT_EQ(new_node->GetTitle(), ASCIIToUTF16("NEW BOOKMARK"));
   EXPECT_EQ(new_node->GetURL(), GURL("http://NEWURL.com"));
 }
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
index 339e94c..510d09b 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -63,7 +63,7 @@ void BookmarkMenuBridge::UpdateMenu(NSMenu* bookmark_menu) {
   // Add bookmark bar items, if any.
   const BookmarkNode* barNode = model->GetBookmarkBarNode();
   CHECK(barNode);
-  if (barNode->GetChildCount()) {
+  if (barNode->child_count()) {
     [bookmark_menu addItem:[NSMenuItem separatorItem]];
     AddNodeToMenu(barNode, bookmark_menu);
   }
@@ -187,7 +187,7 @@ void BookmarkMenuBridge::AddNodeAsSubmenu(NSMenu* menu,
 
 // TODO(jrg): limit the number of bookmarks in the menubar?
 void BookmarkMenuBridge::AddNodeToMenu(const BookmarkNode* node, NSMenu* menu) {
-  int child_count = node->GetChildCount();
+  int child_count = node->child_count();
   if (!child_count) {
     NSString* empty_string = l10n_util::GetNSString(IDS_MENU_EMPTY_SUBMENU);
     NSMenuItem* item = [[[NSMenuItem alloc] initWithTitle:empty_string
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
index c4ea6a6..fea87f1 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -323,9 +323,9 @@ TEST_F(BookmarkMenuBridgeTest, TestGetMenuItemForNode) {
   EXPECT_TRUE(MenuItemForNode(bridge_.get(), root->GetChild(1)));
 
   const BookmarkNode* removed_node = root->GetChild(0);
-  EXPECT_EQ(2, root->GetChildCount());
+  EXPECT_EQ(2, root->child_count());
   model->Remove(root, 0);
-  EXPECT_EQ(1, root->GetChildCount());
+  EXPECT_EQ(1, root->child_count());
   bridge_->UpdateMenu(menu);
   EXPECT_FALSE(MenuItemForNode(bridge_.get(), removed_node));
   EXPECT_TRUE(MenuItemForNode(bridge_.get(), root->GetChild(0)));
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm
index fa369a2..eadc44d 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -30,7 +30,7 @@
     parent_ = parent;
     newIndex_ = newIndex;
     if (parent) {
-      DCHECK_LE(newIndex, parent->GetChildCount());
+      DCHECK_LE(newIndex, parent->child_count());
     }
     if (node_) {
       initialName_.reset([base::SysUTF16ToNSString(node_->GetTitle()) retain]);
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
index 69fb939..599a881 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -23,7 +23,7 @@ class BookmarkNameFolderControllerTest : public CocoaTest {
 TEST_F(BookmarkNameFolderControllerTest, AddNew) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->GetBookmarkBarNode();
-  EXPECT_EQ(0, parent->GetChildCount());
+  EXPECT_EQ(0, parent->child_count());
 
   scoped_nsobject<BookmarkNameFolderController>
     controller([[BookmarkNameFolderController alloc]
@@ -35,16 +35,16 @@ TEST_F(BookmarkNameFolderControllerTest, AddNew) {
 
   // Do nothing.
   [controller cancel:nil];
-  EXPECT_EQ(0, parent->GetChildCount());
+  EXPECT_EQ(0, parent->child_count());
 
   // Change name then cancel.
   [controller setFolderName:@"Bozo"];
   [controller cancel:nil];
-  EXPECT_EQ(0, parent->GetChildCount());
+  EXPECT_EQ(0, parent->child_count());
 
   // Add a new folder.
   [controller ok:nil];
-  EXPECT_EQ(1, parent->GetChildCount());
+  EXPECT_EQ(1, parent->child_count());
   EXPECT_TRUE(parent->GetChild(0)->is_folder());
   EXPECT_EQ(ASCIIToUTF16("Bozo"), parent->GetChild(0)->GetTitle());
 }
@@ -59,7 +59,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewWithSibling) {
                 GURL("http://www.google.com"));
   model->AddURL(parent, 1, ASCIIToUTF16("title 3"),
                 GURL("http://www.google.com"));
-  EXPECT_EQ(2, parent->GetChildCount());
+  EXPECT_EQ(2, parent->child_count());
 
   scoped_nsobject<BookmarkNameFolderController>
     controller([[BookmarkNameFolderController alloc]
@@ -74,7 +74,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewWithSibling) {
   [controller ok:nil];
 
   // Confirm we now have 3, and that the new one is in the middle.
-  EXPECT_EQ(3, parent->GetChildCount());
+  EXPECT_EQ(3, parent->child_count());
   EXPECT_TRUE(parent->GetChild(1)->is_folder());
   EXPECT_EQ(ASCIIToUTF16("middle"), parent->GetChild(1)->GetTitle());
 }
@@ -83,7 +83,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewWithSibling) {
 TEST_F(BookmarkNameFolderControllerTest, AddNewDefaultName) {
  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->GetBookmarkBarNode();
-  EXPECT_EQ(0, parent->GetChildCount());
+  EXPECT_EQ(0, parent->child_count());
 
   scoped_nsobject<BookmarkNameFolderController>
     controller([[BookmarkNameFolderController alloc]
@@ -96,7 +96,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewDefaultName) {
 
   // Click OK without changing the name
   [controller ok:nil];
-  EXPECT_EQ(1, parent->GetChildCount());
+  EXPECT_EQ(1, parent->child_count());
   EXPECT_TRUE(parent->GetChild(0)->is_folder());
 }
 
@@ -104,7 +104,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewDefaultName) {
 TEST_F(BookmarkNameFolderControllerTest, AddNewBlankName) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->GetBookmarkBarNode();
-  EXPECT_EQ(0, parent->GetChildCount());
+  EXPECT_EQ(0, parent->child_count());
 
   scoped_nsobject<BookmarkNameFolderController>
   controller([[BookmarkNameFolderController alloc]
@@ -117,7 +117,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewBlankName) {
   // Change the name to blank, click OK.
   [controller setFolderName:@""];
   [controller ok:nil];
-  EXPECT_EQ(1, parent->GetChildCount());
+  EXPECT_EQ(1, parent->child_count());
   EXPECT_TRUE(parent->GetChild(0)->is_folder());
 }
 
@@ -125,7 +125,7 @@ TEST_F(BookmarkNameFolderControllerTest, Rename) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   const BookmarkNode* folder = model->AddGroup(parent,
-                                               parent->GetChildCount(),
+                                               parent->child_count(),
                                                ASCIIToUTF16("group"));
 
   // Rename the folder by creating a controller that originates from
@@ -140,7 +140,7 @@ TEST_F(BookmarkNameFolderControllerTest, Rename) {
   EXPECT_NSEQ(@"group", [controller folderName]);
   [controller setFolderName:@"Zobo"];
   [controller ok:nil];
-  EXPECT_EQ(1, parent->GetChildCount());
+  EXPECT_EQ(1, parent->child_count());
   EXPECT_TRUE(parent->GetChild(0)->is_folder());
   EXPECT_EQ(ASCIIToUTF16("Zobo"), parent->GetChild(0)->GetTitle());
 }
@@ -148,7 +148,7 @@ TEST_F(BookmarkNameFolderControllerTest, Rename) {
 TEST_F(BookmarkNameFolderControllerTest, EditAndConfirmOKButton) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* parent = model->GetBookmarkBarNode();
-  EXPECT_EQ(0, parent->GetChildCount());
+  EXPECT_EQ(0, parent->child_count());
 
   scoped_nsobject<BookmarkNameFolderController>
     controller([[BookmarkNameFolderController alloc]
diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_tree_node.mm b/chrome/browser/ui/cocoa/content_settings/cookie_tree_node.mm
index e6a08bd..92aad45 100644
--- a/chrome/browser/ui/cocoa/content_settings/cookie_tree_node.mm
+++ b/chrome/browser/ui/cocoa/content_settings/cookie_tree_node.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -39,7 +39,7 @@
 
 - (NSMutableArray*)mutableChildren {
   if (!children_.get()) {
-    const int childCount = treeNode_->GetChildCount();
+    const int childCount = treeNode_->child_count();
     children_.reset([[NSMutableArray alloc] initWithCapacity:childCount]);
     for (int i = 0; i < childCount; ++i) {
       CookieTreeNode* child = treeNode_->GetChild(i);
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
index b107030..114a867 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
@@ -509,7 +509,7 @@ void BookmarkBarGtk::CreateAllBookmarkButtons() {
   DCHECK(bar && model_->other_node());
 
   // Create a button for each of the children on the bookmark bar.
-  for (int i = 0; i < bar->GetChildCount(); ++i) {
+  for (int i = 0; i < bar->child_count(); ++i) {
     const BookmarkNode* node = bar->GetChild(i);
     GtkToolItem* item = CreateBookmarkToolItem(node);
     gtk_toolbar_insert(GTK_TOOLBAR(bookmark_toolbar_.get()), item, -1);
@@ -525,7 +525,7 @@ void BookmarkBarGtk::CreateAllBookmarkButtons() {
 }
 
 void BookmarkBarGtk::SetInstructionState() {
-  show_instructions_ = (model_->GetBookmarkBarNode()->GetChildCount() == 0);
+  show_instructions_ = (model_->GetBookmarkBarNode()->child_count() == 0);
   if (show_instructions_) {
     gtk_widget_hide(bookmark_toolbar_.get());
     gtk_widget_show_all(instructions_);
@@ -1254,7 +1254,7 @@ void BookmarkBarGtk::OnDragReceived(GtkWidget* widget,
     index = GetToolbarIndexForDragOverFolder(widget, x);
     if (index < 0) {
       dest_node = GetNodeForToolButton(widget);
-      index = dest_node->GetChildCount();
+      index = dest_node->child_count();
     }
   }
 
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
index 0d05b28..4aa1017 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
@@ -71,7 +71,7 @@ TEST_F(BookmarkBarGtkUnittest, HidesHelpMessageWithBookmark) {
   BookmarkModel* model = profile_->GetBookmarkModel();
 
   const BookmarkNode* parent = model->GetBookmarkBarNode();
-  model->AddURL(parent, parent->GetChildCount(),
+  model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("title"), GURL("http://one.com"));
 
   bookmark_bar_->Loaded(model);
@@ -82,9 +82,9 @@ TEST_F(BookmarkBarGtkUnittest, BuildsButtons) {
   BookmarkModel* model = profile_->GetBookmarkModel();
 
   const BookmarkNode* parent = model->GetBookmarkBarNode();
-  model->AddURL(parent, parent->GetChildCount(),
+  model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("title"), GURL("http://one.com"));
-  model->AddURL(parent, parent->GetChildCount(),
+  model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("other"), GURL("http://two.com"));
 
   bookmark_bar_->Loaded(model);
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc
index 351997a..d285c1d 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc
@@ -290,7 +290,7 @@ void BookmarkBubbleGtk::ApplyEdits() {
       if (new_parent != node->parent()) {
         UserMetrics::RecordAction(
             UserMetricsAction("BookmarkBubble_ChangeParent"), profile_);
-        model->Move(node, new_parent, new_parent->GetChildCount());
+        model->Move(node, new_parent, new_parent->child_count());
       }
     }
   }
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
index 912bdba..e20fa18 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
@@ -250,7 +250,7 @@ TEST_F(BookmarkEditorGtkTest, MoveToNewParent) {
   const BookmarkNode* mf2 = bb_node->GetChild(1);
 
   // F2 in the model should have two children now: F21 and the node edited.
-  ASSERT_EQ(2, mf2->GetChildCount());
+  ASSERT_EQ(2, mf2->child_count());
   // F21 should be first.
   ASSERT_EQ(ASCIIToUTF16("F21"), mf2->GetChild(0)->GetTitle());
   // Then a.
@@ -258,7 +258,7 @@ TEST_F(BookmarkEditorGtkTest, MoveToNewParent) {
 
   // F21 should have one child, F211.
   const BookmarkNode* mf21 = mf2->GetChild(0);
-  ASSERT_EQ(1, mf21->GetChildCount());
+  ASSERT_EQ(1, mf21->child_count());
   ASSERT_EQ(ASCIIToUTF16("F211"), mf21->GetChild(0)->GetTitle());
 }
 
@@ -279,7 +279,7 @@ TEST_F(BookmarkEditorGtkTest, NewURL) {
 
   const BookmarkNode* bb_node =
       profile_->GetBookmarkModel()->GetBookmarkBarNode();
-  ASSERT_EQ(4, bb_node->GetChildCount());
+  ASSERT_EQ(4, bb_node->child_count());
 
   const BookmarkNode* new_node = bb_node->GetChild(3);
   EXPECT_EQ(ASCIIToUTF16("new_a"), new_node->GetTitle());
@@ -300,7 +300,7 @@ TEST_F(BookmarkEditorGtkTest, ChangeURLNoTree) {
   editor.ApplyEdits(NULL);
 
   const BookmarkNode* other_node = profile_->GetBookmarkModel()->other_node();
-  ASSERT_EQ(2, other_node->GetChildCount());
+  ASSERT_EQ(2, other_node->child_count());
 
   const BookmarkNode* new_node = other_node->GetChild(0);
 
@@ -319,7 +319,7 @@ TEST_F(BookmarkEditorGtkTest, ChangeTitleNoTree) {
   editor.ApplyEdits();
 
   const BookmarkNode* other_node = profile_->GetBookmarkModel()->other_node();
-  ASSERT_EQ(2, other_node->GetChildCount());
+  ASSERT_EQ(2, other_node->child_count());
 
   const BookmarkNode* new_node = other_node->GetChild(0);
   EXPECT_EQ(ASCIIToUTF16("new_a"), new_node->GetTitle());
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
index 837fbb2..2a3c869 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
@@ -142,15 +142,15 @@ void BookmarkMenuController::NavigateToMenuItem(
 void BookmarkMenuController::BuildMenu(const BookmarkNode* parent,
                                        int start_child_index,
                                        GtkWidget* menu) {
-  DCHECK(!parent->GetChildCount() ||
-         start_child_index < parent->GetChildCount());
+  DCHECK(!parent->child_count() ||
+         start_child_index < parent->child_count());
 
   signals_.Connect(menu, "button-press-event",
                    G_CALLBACK(OnMenuButtonPressedOrReleasedThunk), this);
   signals_.Connect(menu, "button-release-event",
                    G_CALLBACK(OnMenuButtonPressedOrReleasedThunk), this);
 
-  for (int i = start_child_index; i < parent->GetChildCount(); ++i) {
+  for (int i = start_child_index; i < parent->child_count(); ++i) {
     const BookmarkNode* node = parent->GetChild(i);
 
     // This breaks on word boundaries. Ideally we would break on character
@@ -201,7 +201,7 @@ void BookmarkMenuController::BuildMenu(const BookmarkNode* parent,
     node_to_menu_widget_map_[node] = menu_item;
   }
 
-  if (parent->GetChildCount() == 0) {
+  if (parent->child_count() == 0) {
     GtkWidget* empty_menu = gtk_menu_item_new_with_label(
         l10n_util::GetStringUTF8(IDS_MENU_EMPTY_SUBMENU).c_str());
     gtk_widget_set_sensitive(empty_menu, FALSE);
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc
index c4a3df6..c3ca016 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc
@@ -55,12 +55,12 @@ void RecursiveResolve(BookmarkModel* bb_model, const BookmarkNode* bb_node,
           bookmark_utils::GetTitleFromTreeIter(tree_model, &child_iter);
       const BookmarkNode* child_bb_node = NULL;
       if (id == 0) {
-        child_bb_node = bb_model->AddGroup(bb_node, bb_node->GetChildCount(),
+        child_bb_node = bb_model->AddGroup(bb_node, bb_node->child_count(),
                                            title);
       } else {
         // Existing node, reset the title (BBModel ignores changes if the title
         // is the same).
-        for (int j = 0; j < bb_node->GetChildCount(); ++j) {
+        for (int j = 0; j < bb_node->child_count(); ++j) {
           const BookmarkNode* node = bb_node->GetChild(j);
           if (node->is_folder() && node->id() == id) {
             child_bb_node = node;
@@ -103,7 +103,7 @@ GtkTreeStore* MakeFolderTreeStore() {
 void AddToTreeStore(BookmarkModel* model, int64 selected_id,
                     GtkTreeStore* store, GtkTreeIter* selected_iter) {
   const BookmarkNode* root_node = model->root_node();
-  for (int i = 0; i < root_node->GetChildCount(); ++i) {
+  for (int i = 0; i < root_node->child_count(); ++i) {
     AddToTreeStoreAt(root_node->GetChild(i), selected_id, store, selected_iter,
                      NULL);
   }
@@ -154,7 +154,7 @@ void AddToTreeStoreAt(const BookmarkNode* node, int64 selected_id,
      *selected_iter = iter;
   }
 
-  for (int i = 0; i < node->GetChildCount(); ++i) {
+  for (int i = 0; i < node->child_count(); ++i) {
     AddToTreeStoreAt(node->GetChild(i), selected_id, store, selected_iter,
                      &iter);
   }
@@ -183,7 +183,7 @@ const BookmarkNode* CommitTreeStoreDifferencesBetween(
 
     int64 id = GetIdFromTreeIter(tree_model, &tree_root);
     const BookmarkNode* child_node = NULL;
-    for (int j = 0; j < root_node->GetChildCount(); ++j) {
+    for (int j = 0; j < root_node->child_count(); ++j) {
       const BookmarkNode* node = root_node->GetChild(j);
       if (node->is_folder() && node->id() == id) {
         child_node = node;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index e8e95ab..bc1aebc 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -655,10 +655,10 @@ int BookmarkBarView::OnPerformDrop(const DropTargetEvent& event) {
   const BookmarkNode* parent_node;
   if (is_over_other) {
     parent_node = root;
-    index = parent_node->GetChildCount();
+    index = parent_node->child_count();
   } else if (drop_on) {
     parent_node = root->GetChild(index);
-    index = parent_node->GetChildCount();
+    index = parent_node->child_count();
   } else {
     parent_node = root;
   }
@@ -933,7 +933,7 @@ void BookmarkBarView::Loaded(BookmarkModel* model) {
   const BookmarkNode* node = model_->GetBookmarkBarNode();
   DCHECK(node && model_->other_node());
   // Create a button for each of the children on the bookmark bar.
-  for (int i = 0, child_count = node->GetChildCount(); i < child_count; ++i)
+  for (int i = 0, child_count = node->child_count(); i < child_count; ++i)
     AddChildViewAt(CreateBookmarkButton(node->GetChild(i)), i);
   UpdateColors();
   UpdateOtherBookmarksVisibility();
@@ -1060,7 +1060,7 @@ void BookmarkBarView::BookmarkNodeChildrenReordered(BookmarkModel* model,
   }
 
   // Create the new buttons.
-  for (int i = 0, child_count = node->GetChildCount(); i < child_count; ++i)
+  for (int i = 0, child_count = node->child_count(); i < child_count; ++i)
     AddChildViewAt(CreateBookmarkButton(node->GetChild(i)), i);
   UpdateColors();
 
@@ -1466,7 +1466,7 @@ int BookmarkBarView::CalculateDropOperation(const DropTargetEvent& event,
                          model_->GetBookmarkBarNode()->GetChild(*index);
     int operation =
         bookmark_utils::BookmarkDropOperation(profile_, event, data, parent,
-                                              parent->GetChildCount());
+                                              parent->child_count());
     if (!operation && !data.has_single_url() &&
         data.GetFirstNode(profile_) == parent) {
       // Don't open a menu if the node being dragged is the the menu to
@@ -1588,7 +1588,7 @@ void BookmarkBarView::UpdateColors() {
 }
 
 void BookmarkBarView::UpdateOtherBookmarksVisibility() {
-  bool has_other_children = model_->other_node()->GetChildCount() > 0;
+  bool has_other_children = model_->other_node()->child_count() > 0;
   if (has_other_children == other_bookmarked_button_->IsVisible())
     return;
   other_bookmarked_button_->SetVisible(has_other_children);
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index a4881ea..47be100 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -419,7 +419,7 @@ void BookmarkBubbleView::ApplyEdits() {
       if (new_parent != node->parent()) {
         UserMetrics::RecordAction(
             UserMetricsAction("BookmarkBubble_ChangeParent"), profile_);
-        model->Move(node, new_parent, new_parent->GetChildCount());
+        model->Move(node, new_parent, new_parent->child_count());
       }
     }
   }
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
index 28e997e..6e2abb1 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
@@ -299,11 +299,11 @@ TEST_F(BookmarkContextMenuTest, CutCopyPasteNode) {
 
   controller.reset(new BookmarkContextMenu(
       NULL, profile_.get(), NULL, nodes[0]->parent(), nodes));
-  int old_count = model_->GetBookmarkBarNode()->GetChildCount();
+  int old_count = model_->GetBookmarkBarNode()->child_count();
   controller->ExecuteCommand(IDC_PASTE);
 
   ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_url());
-  ASSERT_EQ(old_count + 1, model_->GetBookmarkBarNode()->GetChildCount());
+  ASSERT_EQ(old_count + 1, model_->GetBookmarkBarNode()->child_count());
   ASSERT_EQ(model_->GetBookmarkBarNode()->GetChild(0)->GetURL(),
             model_->GetBookmarkBarNode()->GetChild(1)->GetURL());
 
@@ -313,5 +313,5 @@ TEST_F(BookmarkContextMenuTest, CutCopyPasteNode) {
   controller->ExecuteCommand(IDC_CUT);
   ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(0)->is_url());
   ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_folder());
-  ASSERT_EQ(old_count, model_->GetBookmarkBarNode()->GetChildCount());
+  ASSERT_EQ(old_count, model_->GetBookmarkBarNode()->child_count());
 }
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
index 3522049..897c92d 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
@@ -462,7 +462,7 @@ BookmarkEditorView::EditorNode* BookmarkEditorView::AddNewGroup(
       l10n_util::GetStringUTF16(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME));
   new_node->value = 0;
   // new_node is now owned by parent.
-  tree_model_->Add(parent, parent->GetChildCount(), new_node);
+  tree_model_->Add(parent, parent->child_count(), new_node);
   return new_node;
 }
 
@@ -485,7 +485,7 @@ BookmarkEditorView::EditorNode* BookmarkEditorView::CreateRootNode() {
   EditorNode* root_node = new EditorNode(std::wstring(), 0);
   const BookmarkNode* bb_root_node = bb_model_->root_node();
   CreateNodes(bb_root_node, root_node);
-  DCHECK(root_node->GetChildCount() == 2);
+  DCHECK(root_node->child_count() == 2);
   DCHECK(bb_root_node->GetChild(0)->type() == BookmarkNode::BOOKMARK_BAR);
   DCHECK(bb_root_node->GetChild(1)->type() == BookmarkNode::OTHER_NODE);
   return root_node;
@@ -493,13 +493,13 @@ BookmarkEditorView::EditorNode* BookmarkEditorView::CreateRootNode() {
 
 void BookmarkEditorView::CreateNodes(const BookmarkNode* bb_node,
                                      BookmarkEditorView::EditorNode* b_node) {
-  for (int i = 0; i < bb_node->GetChildCount(); ++i) {
+  for (int i = 0; i < bb_node->child_count(); ++i) {
     const BookmarkNode* child_bb_node = bb_node->GetChild(i);
     if (child_bb_node->is_folder()) {
       EditorNode* new_b_node =
           new EditorNode(WideToUTF16(child_bb_node->GetTitle()),
                                      child_bb_node->id());
-      b_node->Add(b_node->GetChildCount(), new_b_node);
+      b_node->Add(b_node->child_count(), new_b_node);
       CreateNodes(child_bb_node, new_b_node);
     }
   }
@@ -510,7 +510,7 @@ BookmarkEditorView::EditorNode* BookmarkEditorView::FindNodeWithID(
     int64 id) {
   if (node->value == id)
     return node;
-  for (int i = 0; i < node->GetChildCount(); ++i) {
+  for (int i = 0; i < node->child_count(); ++i) {
     EditorNode* result = FindNodeWithID(node->GetChild(i), id);
     if (result)
       return result;
@@ -563,17 +563,17 @@ void BookmarkEditorView::ApplyNameChangesAndCreateNewGroups(
     const BookmarkNode** parent_bb_node) {
   if (parent_b_node == b_node)
     *parent_bb_node = bb_node;
-  for (int i = 0; i < b_node->GetChildCount(); ++i) {
+  for (int i = 0; i < b_node->child_count(); ++i) {
     EditorNode* child_b_node = b_node->GetChild(i);
     const BookmarkNode* child_bb_node = NULL;
     if (child_b_node->value == 0) {
       // New group.
       child_bb_node = bb_model_->AddGroup(bb_node,
-          bb_node->GetChildCount(), child_b_node->GetTitle());
+          bb_node->child_count(), child_b_node->GetTitle());
     } else {
       // Existing node, reset the title (BBModel ignores changes if the title
       // is the same).
-      for (int j = 0; j < bb_node->GetChildCount(); ++j) {
+      for (int j = 0; j < bb_node->child_count(); ++j) {
         const BookmarkNode* node = bb_node->GetChild(j);
         if (node->is_folder() && node->id() == child_b_node->value) {
           child_bb_node = node;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
index 7c937f8..0ec1afb 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
@@ -134,21 +134,21 @@ TEST_F(BookmarkEditorViewTest, ModelsMatch) {
   BookmarkEditorView::EditorNode* editor_root = editor_tree_model()->GetRoot();
   // The root should have two children, one for the bookmark bar node,
   // the other for the 'other bookmarks' folder.
-  ASSERT_EQ(2, editor_root->GetChildCount());
+  ASSERT_EQ(2, editor_root->child_count());
 
   BookmarkEditorView::EditorNode* bb_node = editor_root->GetChild(0);
   // The root should have 2 nodes: folder F1 and F2.
-  ASSERT_EQ(2, bb_node->GetChildCount());
+  ASSERT_EQ(2, bb_node->child_count());
   ASSERT_EQ(ASCIIToUTF16("F1"), bb_node->GetChild(0)->GetTitle());
   ASSERT_EQ(ASCIIToUTF16("F2"), bb_node->GetChild(1)->GetTitle());
 
   // F1 should have one child, F11
-  ASSERT_EQ(1, bb_node->GetChild(0)->GetChildCount());
+  ASSERT_EQ(1, bb_node->GetChild(0)->child_count());
   ASSERT_EQ(ASCIIToUTF16("F11"), bb_node->GetChild(0)->GetChild(0)->GetTitle());
 
   BookmarkEditorView::EditorNode* other_node = editor_root->GetChild(1);
   // Other node should have one child (OF1).
-  ASSERT_EQ(1, other_node->GetChildCount());
+  ASSERT_EQ(1, other_node->child_count());
   ASSERT_EQ(ASCIIToUTF16("OF1"), other_node->GetChild(0)->GetTitle());
 }
 
@@ -236,7 +236,7 @@ TEST_F(BookmarkEditorViewTest, MoveToNewParent) {
   const BookmarkNode* mf2 = bb_node->GetChild(1);
 
   // F2 in the model should have two children now: F21 and the node edited.
-  ASSERT_EQ(2, mf2->GetChildCount());
+  ASSERT_EQ(2, mf2->child_count());
   // F21 should be first.
   ASSERT_EQ(ASCIIToUTF16("F21"), mf2->GetChild(0)->GetTitle());
   // Then a.
@@ -244,7 +244,7 @@ TEST_F(BookmarkEditorViewTest, MoveToNewParent) {
 
   // F21 should have one child, F211.
   const BookmarkNode* mf21 = mf2->GetChild(0);
-  ASSERT_EQ(1, mf21->GetChildCount());
+  ASSERT_EQ(1, mf21->child_count());
   ASSERT_EQ(ASCIIToUTF16("F211"), mf21->GetChild(0)->GetTitle());
 }
 
@@ -260,7 +260,7 @@ TEST_F(BookmarkEditorViewTest, NewURL) {
 
   const BookmarkNode* bb_node =
       profile_->GetBookmarkModel()->GetBookmarkBarNode();
-  ASSERT_EQ(4, bb_node->GetChildCount());
+  ASSERT_EQ(4, bb_node->child_count());
 
   const BookmarkNode* new_node = bb_node->GetChild(3);
 
@@ -280,7 +280,7 @@ TEST_F(BookmarkEditorViewTest, ChangeURLNoTree) {
   ApplyEdits(NULL);
 
   const BookmarkNode* other_node = profile_->GetBookmarkModel()->other_node();
-  ASSERT_EQ(2, other_node->GetChildCount());
+  ASSERT_EQ(2, other_node->child_count());
 
   const BookmarkNode* new_node = other_node->GetChild(0);
 
@@ -299,7 +299,7 @@ TEST_F(BookmarkEditorViewTest, ChangeTitleNoTree) {
   ApplyEdits(NULL);
 
   const BookmarkNode* other_node = profile_->GetBookmarkModel()->other_node();
-  ASSERT_EQ(2, other_node->GetChildCount());
+  ASSERT_EQ(2, other_node->child_count());
 
   const BookmarkNode* new_node = other_node->GetChild(0);
 
@@ -322,13 +322,13 @@ TEST_F(BookmarkEditorViewTest, NewFolder) {
   ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0));
 
   // Make sure the folder was created.
-  ASSERT_EQ(4, model_->GetBookmarkBarNode()->GetChildCount());
+  ASSERT_EQ(4, model_->GetBookmarkBarNode()->child_count());
   const BookmarkNode* new_node =
       model_->GetBookmarkBarNode()->GetChild(3);
   EXPECT_EQ(BookmarkNode::FOLDER, new_node->type());
   EXPECT_EQ(ASCIIToUTF16("new_F"), new_node->GetTitle());
   // The node should have one child.
-  ASSERT_EQ(1, new_node->GetChildCount());
+  ASSERT_EQ(1, new_node->child_count());
   const BookmarkNode* new_child = new_node->GetChild(0);
   // Make sure the child url/title match.
   EXPECT_EQ(BookmarkNode::URL, new_child->type());
@@ -352,12 +352,12 @@ TEST_F(BookmarkEditorViewTest, MoveFolder) {
   ApplyEdits(editor_tree_model()->GetRoot()->GetChild(1));
 
   // Make sure the folder we edited is still there.
-  ASSERT_EQ(3, model_->other_node()->GetChildCount());
+  ASSERT_EQ(3, model_->other_node()->child_count());
   const BookmarkNode* new_node = model_->other_node()->GetChild(2);
   EXPECT_EQ(BookmarkNode::FOLDER, new_node->type());
   EXPECT_EQ(ASCIIToUTF16("new_F"), new_node->GetTitle());
   // The node should have one child.
-  ASSERT_EQ(1, new_node->GetChildCount());
+  ASSERT_EQ(1, new_node->child_count());
   const BookmarkNode* new_child = new_node->GetChild(0);
   // Make sure the child url/title match.
   EXPECT_EQ(BookmarkNode::URL, new_child->type());
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc
index 9eb382b..3597fa1 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc
@@ -168,7 +168,7 @@ int BookmarkMenuController::GetDropOperation(
     index_to_drop_at++;
   } else if (*position == DROP_ON) {
     drop_parent = node;
-    index_to_drop_at = node->GetChildCount();
+    index_to_drop_at = node->child_count();
   }
   DCHECK(drop_parent);
   return bookmark_utils::BookmarkDropOperation(
@@ -190,7 +190,7 @@ int BookmarkMenuController::OnPerformDrop(MenuItemView* menu,
   } else if (position == DROP_ON) {
     DCHECK(drop_node->is_folder());
     drop_parent = drop_node;
-    index_to_drop_at = drop_node->GetChildCount();
+    index_to_drop_at = drop_node->child_count();
   }
 
   int result = bookmark_utils::PerformBookmarkDrop(
@@ -326,9 +326,9 @@ void BookmarkMenuController::BuildMenu(const BookmarkNode* parent,
                                        int start_child_index,
                                        MenuItemView* menu,
                                        int* next_menu_id) {
-  DCHECK(!parent->GetChildCount() ||
-         start_child_index < parent->GetChildCount());
-  for (int i = start_child_index; i < parent->GetChildCount(); ++i) {
+  DCHECK(!parent->child_count() ||
+         start_child_index < parent->child_count());
+  for (int i = start_child_index; i < parent->child_count(); ++i) {
     const BookmarkNode* node = parent->GetChild(i);
     int id = *next_menu_id;
 
diff --git a/chrome/browser/ui/views/options/cookies_view.cc b/chrome/browser/ui/views/options/cookies_view.cc
index 05439cc..c29cf74 100644
--- a/chrome/browser/ui/views/options/cookies_view.cc
+++ b/chrome/browser/ui/views/options/cookies_view.cc
@@ -121,7 +121,7 @@ void CookiesView::ButtonPressed(
     views::Button* sender, const views::Event& event) {
   if (sender == remove_button_) {
     cookies_tree_->RemoveSelectedItems();
-    if (cookies_tree_model_->GetRoot()->GetChildCount() == 0)
+    if (cookies_tree_model_->GetRoot()->child_count() == 0)
       UpdateForEmptyState();
   } else if (sender == remove_all_button_) {
     cookies_tree_model_->DeleteAllStoredObjects();
@@ -375,7 +375,7 @@ void CookiesView::Init() {
   // Add the Remove/Remove All buttons to the ClientView
   parent()->AddChildView(remove_button_);
   parent()->AddChildView(remove_all_button_);
-  if (!cookies_tree_model_.get()->GetRoot()->GetChildCount()) {
+  if (!cookies_tree_model_.get()->GetRoot()->child_count()) {
     UpdateForEmptyState();
   } else {
     UpdateVisibleDetailedInfo(cookie_info_view_);
diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.cc b/chrome/browser/ui/webui/cookies_tree_model_util.cc
index 8a2d638..cde03bb 100644
--- a/chrome/browser/ui/webui/cookies_tree_model_util.cc
+++ b/chrome/browser/ui/webui/cookies_tree_model_util.cc
@@ -66,7 +66,7 @@ void GetCookieTreeNodeDictionary(const CookieTreeNode& node,
   // Use node's address as an id for WebUI to look it up.
   dict->SetString(kKeyId, PointerToHexString(&node));
   dict->SetString(kKeyTitle, node.GetTitle());
-  dict->SetBoolean(kKeyHasChildren, !!node.GetChildCount());
+  dict->SetBoolean(kKeyHasChildren, !!node.child_count());
 
   switch (node.GetDetailedInfo().node_type) {
     case CookieTreeNode::DetailedInfo::TYPE_ORIGIN: {
diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.cc b/chrome/browser/ui/webui/options/cookies_view_handler.cc
index 7710df2..b63b3e8 100644
--- a/chrome/browser/ui/webui/options/cookies_view_handler.cc
+++ b/chrome/browser/ui/webui/options/cookies_view_handler.cc
@@ -198,7 +198,7 @@ void CookiesViewHandler::LoadChildren(const ListValue* args) {
 
 void CookiesViewHandler::SendChildren(CookieTreeNode* parent) {
   ListValue* children = new ListValue;
-  cookies_tree_model_util::GetChildNodeList(parent, 0, parent->GetChildCount(),
+  cookies_tree_model_util::GetChildNodeList(parent, 0, parent->child_count(),
       children);
 
   ListValue args;