Avoid conversion of index to BookmarkNode pointer unnacessarily.

chrome/browser/sync/profile_sync_service_bookmark_unittest.cc

 // Copyright (c) 2012 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.
 
 // TODO(akalin): This file is basically just a unit test for
 // BookmarkChangeProcessor.  Write unit tests for
 // BookmarkModelAssociator separately.
 
 #include <map>
 #include <queue>
@@ skipping 1028 matching lines @@
   ExpectModelMatch();
   model_->SetTitle(folder, base::ASCIIToUTF16("who's nested now?"));
   ExpectModelMatch();
   model_->Copy(url2, model_->bookmark_bar_node(), 0);
   ExpectModelMatch();
   model_->SetTitle(mobile_folder, base::ASCIIToUTF16("strawberry"));
   ExpectModelMatch();
 
   // Test deletion.
   // Delete a single item.
-  model_->Remove(url2->parent(), url2->parent()->GetIndexOf(url2));
+  model_->Remove(url2);
   ExpectModelMatch();
   // Delete an item with several children.
-  model_->Remove(folder2->parent(),
-                 folder2->parent()->GetIndexOf(folder2));
+  model_->Remove(folder2);
   ExpectModelMatch();
-  model_->Remove(model_->mobile_node(), 0);
+  model_->Remove(model_->mobile_node()->GetChild(0));
   ExpectModelMatch();
 }
 
 TEST_F(ProfileSyncServiceBookmarkTest, ServerChangeProcessing) {
   LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
   StartSync();
 
   syncer::WriteTransaction trans(FROM_HERE, test_user_share_.user_share());
 
   FakeServerChange adds(&trans);
@@ skipping 850 matching lines @@
   WriteTestDataToBookmarkModel();
   ExpectBookmarkModelMatchesTestData();
 
   // Remove some nodes and reorder some nodes.
   const BookmarkNode* bookmark_bar_node = model_->bookmark_bar_node();
   int remove_index = 2;
   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);
+  model_->Remove(bookmark_bar_node->GetChild(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);
+  model_->Remove(bookmark_bar_node->GetChild(remove_index));
 
   const BookmarkNode* other_node = model_->other_node();
   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->child_count(), remove_index);
-  model_->Remove(f3_node, remove_index);
+  model_->Remove(f3_node->GetChild(remove_index));
   ASSERT_GT(f3_node->child_count(), remove_index);
-  model_->Remove(f3_node, remove_index);
+  model_->Remove(f3_node->GetChild(remove_index));
 
   StartSync();
   ExpectModelMatch();
   StopSync();
 
   LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
   WriteTestDataToBookmarkModel();
   ExpectBookmarkModelMatchesTestData();
 
   // Remove some nodes and reorder some nodes.
   bookmark_bar_node = model_->bookmark_bar_node();
   remove_index = 0;
   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);
+  model_->Remove(bookmark_bar_node->GetChild(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);
+  model_->Remove(bookmark_bar_node->GetChild(remove_index));
 
   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->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->child_count(), remove_index);
-  model_->Remove(f3_node, remove_index);
+  model_->Remove(f3_node->GetChild(remove_index));
   ASSERT_GT(f3_node->child_count(), remove_index);
-  model_->Remove(f3_node, remove_index);
+  model_->Remove(f3_node->GetChild(remove_index));
 
   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);
 
   StartSync();
   ExpectModelMatch();
 
   // After the merge, the model should match the test data.
   ExpectBookmarkModelMatchesTestData();
@@ skipping 343 matching lines @@
   ExpectTransactionVersionMatch(model_->bookmark_bar_node(),
                                 BookmarkNodeVersionMap());
   ExpectTransactionVersionMatch(model_->other_node(),
                                 BookmarkNodeVersionMap());
   ExpectTransactionVersionMatch(model_->mobile_node(),
                                 BookmarkNodeVersionMap());
 
   // Verify model version is incremented and bookmark node versions remain
   // the same.
   const BookmarkNode* bookmark_bar = model_->bookmark_bar_node();
-  model_->Remove(bookmark_bar, 0);
+  model_->Remove(bookmark_bar->GetChild(0));
   base::MessageLoop::current()->RunUntilIdle();
   BookmarkNodeVersionMap new_versions;
   GetTransactionVersions(model_->root_node(), &new_versions);
   EXPECT_EQ(initial_versions[model_->root_node()->id()] + 1,
             new_versions[model_->root_node()->id()]);
   ExpectTransactionVersionMatch(model_->bookmark_bar_node(), initial_versions);
   ExpectTransactionVersionMatch(model_->other_node(), initial_versions);
   ExpectTransactionVersionMatch(model_->mobile_node(), initial_versions);
 
   // Verify model version and version of changed bookmark are incremented and
@@ skipping 78 matching lines @@
   ExpectModelMatch();
 
   // Then simulate the add call arriving late.
   change_processor_->BookmarkNodeAdded(model_, model_->bookmark_bar_node(), 0);
   ExpectModelMatch();
 }
 
 }  // namespace
 
 }  // namespace browser_sync