Rename TreeNode::GetParent() to TreeNode::parent(). Part 2

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=None

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

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

2 files changed, 19 insertions, 19 deletions

diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc
index 316fb3d..6ff25f6 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc
@@ -95,7 +95,7 @@ void BookmarkChangeProcessor::RemoveSyncNodeHierarchy(
   sync_api::WriteTransaction trans(share_handle());
 
   // Later logic assumes that |topmost| has been unlinked.
-  DCHECK(!topmost->GetParent());
+  DCHECK(!topmost->parent());
 
   // A BookmarkModel deletion event means that |node| and all its children were
   // deleted. Sync backend expects children to be deleted individually, so we do
@@ -107,13 +107,13 @@ void BookmarkChangeProcessor::RemoveSyncNodeHierarchy(
   int index = 0;
   while (node) {
     // The top of |index_stack| should always be |node|'s index.
-    DCHECK(!node->GetParent() || (node->GetParent()->GetIndexOf(node) ==
+    DCHECK(!node->parent() || (node->parent()->GetIndexOf(node) ==
       index_stack.top()));
     if (index == node->GetChildCount()) {
       // If we've processed all of |node|'s children, delete |node| and move
       // on to its successor.
       RemoveOneSyncNode(&trans, node);
-      node = node->GetParent();
+      node = node->parent();
       index = index_stack.top() + 1;      // (top() + 0) was what we removed.
       index_stack.pop();
     } else {
@@ -212,10 +212,10 @@ void BookmarkChangeProcessor::BookmarkNodeChanged(BookmarkModel* model,
   DCHECK_EQ(sync_node.GetIsFolder(), node->is_folder());
   DCHECK_EQ(model_associator_->GetChromeNodeFromSyncId(
             sync_node.GetParentId()),
-            node->GetParent());
+            node->parent());
   // This node's index should be one more than the predecessor's index.
-  DCHECK_EQ(node->GetParent()->GetIndexOf(node),
-            CalculateBookmarkModelInsertionIndex(node->GetParent(),
+  DCHECK_EQ(node->parent()->GetIndexOf(node),
+            CalculateBookmarkModelInsertionIndex(node->parent(),
                                                  &sync_node));
 }
 
@@ -342,7 +342,7 @@ int BookmarkChangeProcessor::CalculateBookmarkModelInsertionIndex(
   const BookmarkNode* predecessor =
       model_associator_->GetChromeNodeFromSyncId(predecessor_id);
   DCHECK(predecessor);
-  DCHECK_EQ(predecessor->GetParent(), parent);
+  DCHECK_EQ(predecessor->parent(), parent);
   return parent->GetIndexOf(predecessor) + 1;
 }
 
@@ -396,7 +396,7 @@ void BookmarkChangeProcessor::ApplyChangesFromSyncModel(
       // Children of a deleted node should not be deleted; they may be
       // 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->GetParent();
+      const BookmarkNode* parent = dst->parent();
       if (dst->GetChildCount()) {
         if (!foster_parent) {
           foster_parent = model->AddGroup(model->other_node(),
@@ -431,8 +431,8 @@ void BookmarkChangeProcessor::ApplyChangesFromSyncModel(
   if (foster_parent) {
     // There should be no nodes left under the foster parent.
     DCHECK_EQ(foster_parent->GetChildCount(), 0);
-    model->Remove(foster_parent->GetParent(),
-                  foster_parent->GetParent()->GetIndexOf(foster_parent));
+    model->Remove(foster_parent->parent(),
+                  foster_parent->parent()->GetIndexOf(foster_parent));
     foster_parent = NULL;
   }
 
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 07c0ceb..927b0d5 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -385,30 +385,30 @@ class ProfileSyncServiceTest : public testing::Test {
         bnode != model_->other_node()) {
       EXPECT_EQ(bnode->GetTitle(), WideToUTF16Hack(gnode.GetTitle()));
       EXPECT_EQ(associator()->GetChromeNodeFromSyncId(gnode.GetParentId()),
-        bnode->GetParent());
+        bnode->parent());
     }
     EXPECT_EQ(bnode->is_folder(), gnode.GetIsFolder());
     if (bnode->is_url())
       EXPECT_EQ(bnode->GetURL(), gnode.GetURL());
 
     // Check for position matches.
-    int browser_index = bnode->GetParent()->GetIndexOf(bnode);
+    int browser_index = bnode->parent()->GetIndexOf(bnode);
     if (browser_index == 0) {
       EXPECT_EQ(gnode.GetPredecessorId(), 0);
     } else {
       const BookmarkNode* bprev =
-          bnode->GetParent()->GetChild(browser_index - 1);
+          bnode->parent()->GetChild(browser_index - 1);
       sync_api::ReadNode gprev(trans);
       ASSERT_TRUE(associator()->InitSyncNodeFromChromeId(bprev->id(),
                                                          &gprev));
       EXPECT_EQ(gnode.GetPredecessorId(), gprev.GetId());
       EXPECT_EQ(gnode.GetParentId(), gprev.GetParentId());
     }
-    if (browser_index == bnode->GetParent()->GetChildCount() - 1) {
+    if (browser_index == bnode->parent()->GetChildCount() - 1) {
       EXPECT_EQ(gnode.GetSuccessorId(), 0);
     } else {
       const BookmarkNode* bnext =
-          bnode->GetParent()->GetChild(browser_index + 1);
+          bnode->parent()->GetChild(browser_index + 1);
       sync_api::ReadNode gnext(trans);
       ASSERT_TRUE(associator()->InitSyncNodeFromChromeId(bnext->id(),
                                                          &gnext));
@@ -474,7 +474,7 @@ class ProfileSyncServiceTest : public testing::Test {
     const BookmarkNode* parent =
         associator()->GetChromeNodeFromSyncId(parent_sync_id);
     EXPECT_TRUE(parent);
-    EXPECT_EQ(node->GetParent(), parent);
+    EXPECT_EQ(node->parent(), parent);
   }
 
   void ExpectModelMatch(sync_api::BaseTransaction* trans) {
@@ -613,11 +613,11 @@ TEST_F(ProfileSyncServiceTest, BookmarkModelOperations) {
 
   // Test deletion.
   // Delete a single item.
-  model_->Remove(url2->GetParent(), url2->GetParent()->GetIndexOf(url2));
+  model_->Remove(url2->parent(), url2->parent()->GetIndexOf(url2));
   ExpectModelMatch();
   // Delete an item with several children.
-  model_->Remove(folder2->GetParent(),
-                 folder2->GetParent()->GetIndexOf(folder2));
+  model_->Remove(folder2->parent(),
+                 folder2->parent()->GetIndexOf(folder2));
   ExpectModelMatch();
 }