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

4 files changed, 28 insertions, 28 deletions

diff --git a/chrome/test/live_sync/bookmark_model_verifier.cc b/chrome/test/live_sync/bookmark_model_verifier.cc
index c53009f..4278b0f 100644
--- a/chrome/test/live_sync/bookmark_model_verifier.cc
+++ b/chrome/test/live_sync/bookmark_model_verifier.cc
@@ -196,7 +196,7 @@ void BookmarkModelVerifier::FindNodeInVerifier(BookmarkModel* foreign_model,
   // Climb down.
   while (!path.empty()) {
     ASSERT_TRUE(walker->is_folder());
-    ASSERT_LT(path.top(), walker->GetChildCount());
+    ASSERT_LT(path.top(), walker->child_count());
     walker = walker->GetChild(path.top());
     path.pop();
   }
@@ -315,7 +315,7 @@ void BookmarkModelVerifier::SortChildren(BookmarkModel* model,
 
 void BookmarkModelVerifier::ReverseChildOrder(BookmarkModel* model,
                                               const BookmarkNode* parent) {
-  int child_count = parent->GetChildCount();
+  int child_count = parent->child_count();
   if (child_count <= 0)
     return;
   for (int index = 0; index < child_count; index++)
diff --git a/chrome/test/live_sync/single_client_live_bookmarks_sync_test.cc b/chrome/test/live_sync/single_client_live_bookmarks_sync_test.cc
index 6e04ffe..fdc6733 100644
--- a/chrome/test/live_sync/single_client_live_bookmarks_sync_test.cc
+++ b/chrome/test/live_sync/single_client_live_bookmarks_sync_test.cc
@@ -93,12 +93,12 @@ IN_PROC_BROWSER_TEST_F(SingleClientLiveBookmarksSyncTest, Sanity) {
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
   ASSERT_EQ(1, tier1_a_url0->parent()->GetIndexOf(tier1_a_url0));
-  Move(0, tier1_a_url0, bar, bar->GetChildCount());
-  const BookmarkNode* boa = AddURL(0, bar, bar->GetChildCount(),
+  Move(0, tier1_a_url0, bar, bar->child_count());
+  const BookmarkNode* boa = AddURL(0, bar, bar->child_count(),
       L"Bank of America", GURL("https://www.bankofamerica.com"));
   ASSERT_TRUE(boa != NULL);
-  Move(0, tier1_a_url0, top, top->GetChildCount());
-  const BookmarkNode* bubble = AddURL(0, bar, bar->GetChildCount(),
+  Move(0, tier1_a_url0, top, top->child_count());
+  const BookmarkNode* bubble = AddURL(0, bar, bar->child_count(),
       L"Seattle Bubble", GURL("http://seattlebubble.com"));
   ASSERT_TRUE(bubble != NULL);
   const BookmarkNode* wired = AddURL(0, bar, 2, L"Wired News",
@@ -111,8 +111,8 @@ IN_PROC_BROWSER_TEST_F(SingleClientLiveBookmarksSyncTest, Sanity) {
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Change title."));
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
-  ASSERT_EQ(tier1_a_url0->id(), top->GetChild(top->GetChildCount() - 1)->id());
-  Remove(0, top, top->GetChildCount() - 1);
+  ASSERT_EQ(tier1_a_url0->id(), top->GetChild(top->child_count() - 1)->id());
+  Remove(0, top, top->child_count() - 1);
   Move(0, wired, tier1_b, 0);
   Move(0, porsche, bar, 3);
   const BookmarkNode* tier3_b = AddGroup(0, tier2_b, 1, L"tier3_b");
diff --git a/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc b/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
index ca2eb9e..c1e5702 100644
--- a/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
@@ -506,7 +506,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllModelsMatchVerifier());
 
-  Remove(0, folder, folder->GetChildCount() - 1);
+  Remove(0, folder, folder->child_count() - 1);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllModelsMatchVerifier());
 }
@@ -548,7 +548,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllModelsMatchVerifier());
 
-  int child_count = folder->GetChildCount();
+  int child_count = folder->child_count();
   for (int i = 0; i < child_count; ++i) {
     Remove(0, folder, 0);
   }
@@ -769,7 +769,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllModelsMatchVerifier());
 
-  int num_bookmarks_to_move = GetBookmarkBarNode(0)->GetChildCount() - 2;
+  int num_bookmarks_to_move = GetBookmarkBarNode(0)->child_count() - 2;
   for (int i = 0; i < num_bookmarks_to_move; ++i) {
     Move(0, GetBookmarkBarNode(0)->GetChild(2), folder, i);
     ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
@@ -794,7 +794,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllModelsMatchVerifier());
 
-  int num_bookmarks_to_move = folder->GetChildCount() - 2;
+  int num_bookmarks_to_move = folder->child_count() - 2;
   for (int i = 0; i < num_bookmarks_to_move; ++i) {
     Move(0, folder->GetChild(0), GetBookmarkBarNode(0), i);
     ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
@@ -880,7 +880,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest, SC_HoistBMs10LevelUp) {
       ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);
     }
     std::wstring title = IndexedFolderName(level);
-    folder = AddGroup(0, folder, folder->GetChildCount(), title);
+    folder = AddGroup(0, folder, folder->child_count(), title);
     ASSERT_TRUE(folder != NULL);
     if (level == 0) folder_L0 = folder;
     if (level == 10) folder_L10 = folder;
@@ -894,7 +894,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest, SC_HoistBMs10LevelUp) {
   ASSERT_TRUE(AllModelsMatchVerifier());
 
   GURL url10 = GURL(IndexedURL(10));
-  Move(0, GetUniqueNodeByURL(0, url10), folder_L0, folder_L0->GetChildCount());
+  Move(0, GetUniqueNodeByURL(0, url10), folder_L0, folder_L0->child_count());
   GURL url11 = GURL(IndexedURL(11));
   Move(0, GetUniqueNodeByURL(0, url11), folder_L0, 0);
   GURL url12 = GURL(IndexedURL(12));
@@ -921,7 +921,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
       ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);
     }
     std::wstring title = IndexedFolderName(level);
-    folder = AddGroup(0, folder, folder->GetChildCount(), title);
+    folder = AddGroup(0, folder, folder->child_count(), title);
     ASSERT_TRUE(folder != NULL);
     if (level == 0) folder_L0 = folder;
     if (level == 10) folder_L10 = folder;
@@ -936,7 +936,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
 
   GURL url10 = GURL(IndexedURL(10));
   Move(0, GetUniqueNodeByURL(0, url10), folder_L10,
-      folder_L10->GetChildCount());
+      folder_L10->child_count());
   GURL url11 = GURL(IndexedURL(11));
   Move(0, GetUniqueNodeByURL(0, url11), folder_L10, 0);
   GURL url12 = GURL(IndexedURL(12));
@@ -961,17 +961,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
       ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);
     }
     std::wstring title = IndexedFolderName(level);
-    folder = AddGroup(0, folder, folder->GetChildCount(), title);
+    folder = AddGroup(0, folder, folder->child_count(), title);
     ASSERT_TRUE(folder != NULL);
     if (level == 5) folder_L5 = folder;
   }
   folder =
-      AddGroup(0, GetBookmarkBarNode(0)->GetChildCount(), kGenericFolderName);
+      AddGroup(0, GetBookmarkBarNode(0)->child_count(), kGenericFolderName);
   ASSERT_TRUE(folder != NULL);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllModelsMatchVerifier());
 
-  Move(0, folder, folder_L5, folder_L5->GetChildCount());
+  Move(0, folder, folder_L5, folder_L5->child_count());
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllModelsMatchVerifier());
 }
@@ -992,12 +992,12 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
       ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);
     }
     std::wstring title = IndexedFolderName(level);
-    folder = AddGroup(0, folder, folder->GetChildCount(), title);
+    folder = AddGroup(0, folder, folder->child_count(), title);
     ASSERT_TRUE(folder != NULL);
     if (level == 5) folder_L5 = folder;
   }
   folder =
-      AddGroup(0, GetBookmarkBarNode(0)->GetChildCount(), kGenericFolderName);
+      AddGroup(0, GetBookmarkBarNode(0)->child_count(), kGenericFolderName);
   ASSERT_TRUE(folder != NULL);
   for (int i = 0; i < 10; ++i) {
     std::wstring title = IndexedURLTitle(i);
@@ -1007,7 +1007,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllModelsMatchVerifier());
 
-  Move(0, folder, folder_L5, folder_L5->GetChildCount());
+  Move(0, folder, folder_L5, folder_L5->child_count());
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllModelsMatchVerifier());
 }
@@ -1028,12 +1028,12 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
       ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);
     }
     std::wstring title = IndexedFolderName(level);
-    folder = AddGroup(0, folder, folder->GetChildCount(), title);
+    folder = AddGroup(0, folder, folder->child_count(), title);
     ASSERT_TRUE(folder != NULL);
     if (level == 5) folder_L5 = folder;
   }
   folder =
-      AddGroup(0, folder_L5, folder_L5->GetChildCount(), kGenericFolderName);
+      AddGroup(0, folder_L5, folder_L5->child_count(), kGenericFolderName);
   ASSERT_TRUE(folder != NULL);
   for (int i = 0; i < 10; ++i) {
     std::wstring title = IndexedURLTitle(i);
@@ -1044,7 +1044,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
   ASSERT_TRUE(AllModelsMatchVerifier());
 
   Move(0, folder, GetBookmarkBarNode(0),
-      GetBookmarkBarNode(0)->GetChildCount());
+      GetBookmarkBarNode(0)->child_count());
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllModelsMatchVerifier());
 }
diff --git a/chrome/test/model_test_utils.cc b/chrome/test/model_test_utils.cc
index 27a1d79..0f8be71 100644
--- a/chrome/test/model_test_utils.cc
+++ b/chrome/test/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.
 
@@ -13,7 +13,7 @@ namespace model_test_utils {
 std::string ModelStringFromNode(const BookmarkNode* node) {
   // Since the children of the node are not available as a vector,
   // we'll just have to do it the hard way.
-  int child_count = node->GetChildCount();
+  int child_count = node->child_count();
   std::string child_string;
   for (int i = 0; i < child_count; ++i) {
     const BookmarkNode* child = node->GetChild(i);
@@ -34,7 +34,7 @@ std::string::size_type AddNodesFromString(BookmarkModel& model,
                                           const std::string& model_string,
                                           std::string::size_type start_pos) {
   DCHECK(node);
-  int index = node->GetChildCount();
+  int index = node->child_count();
   static const std::string folder_tell(":[");
   std::string::size_type end_pos = model_string.find(' ', start_pos);
   while (end_pos != std::string::npos) {