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

10 files changed, 57 insertions, 57 deletions

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;
   }