Avoid conversion of index to BookmarkNode pointer unnacessarily.

components/undo/bookmark_undo_service_test.cc

 // Copyright 2013 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.
 
 #include "components/undo/bookmark_undo_service.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/bookmarks/test/test_bookmark_client.h"
@@ skipping 72 matching lines @@
   EXPECT_EQ(node->url(), GURL("http://www.bar.com"));
 }
 
 // Test that a bookmark removal action can be undone and redone.
 TEST_F(BookmarkUndoServiceTest, UndoBookmarkRemove) {
   BookmarkModel* model = GetModel();
   BookmarkUndoService* undo_service = GetUndoService();
 
   const BookmarkNode* parent = model->other_node();
   model->AddURL(parent, 0, ASCIIToUTF16("foo"), GURL("http://www.bar.com"));
-  model->Remove(parent, 0);
+  model->Remove(parent, parent->GetChild(0));
 
   EXPECT_EQ(2U, undo_service->undo_manager()->undo_count());
   EXPECT_EQ(0U, undo_service->undo_manager()->redo_count());
 
   // Undo the deletion of the only bookmark and check the bookmark values.
   undo_service->undo_manager()->Undo();
   EXPECT_EQ(1, model->other_node()->child_count());
   const BookmarkNode* node = parent->GetChild(0);
   EXPECT_EQ(node->GetTitle(), ASCIIToUTF16("foo"));
   EXPECT_EQ(node->url(), GURL("http://www.bar.com"));
@@ skipping 121 matching lines @@
 // bookmark identifiers.
 TEST_F(BookmarkUndoServiceTest, UndoBookmarkRenameDelete) {
   BookmarkModel* model = GetModel();
   BookmarkUndoService* undo_service = GetUndoService();
 
   const BookmarkNode* f1 = model->AddFolder(model->other_node(),
                                            0,
                                            ASCIIToUTF16("folder"));
   model->AddURL(f1, 0, ASCIIToUTF16("foo"), GURL("http://www.foo.com"));
   model->SetTitle(f1, ASCIIToUTF16("Renamed"));
-  model->Remove(model->other_node(), 0);
+  model->Remove(model->other_node(), model->other_node()->GetChild(0));
 
   // Undo the folder removal and ensure the folder and bookmark were restored.
   undo_service->undo_manager()->Undo();
   ASSERT_EQ(1, model->other_node()->child_count());
   ASSERT_EQ(1, model->other_node()->GetChild(0)->child_count());
   const BookmarkNode* node = model->other_node()->GetChild(0);
   EXPECT_EQ(node->GetTitle(), ASCIIToUTF16("Renamed"));
 
   node = model->other_node()->GetChild(0)->GetChild(0);
   EXPECT_EQ(node->GetTitle(), ASCIIToUTF16("foo"));
@@ skipping 113 matching lines @@
 TEST_F(BookmarkUndoServiceTest, UndoRemoveFolderWithBookmarks) {
   BookmarkModel* model = GetModel();
   BookmarkUndoService* undo_service = GetUndoService();
 
   // Setup bookmarks in the Other Bookmarks.
   const BookmarkNode* new_folder;
   const BookmarkNode* parent = model->other_node();
   new_folder = model->AddFolder(parent, 0, ASCIIToUTF16("folder"));
   model->AddURL(new_folder, 0, ASCIIToUTF16("bar"), GURL("http://www.bar.com"));
 
-  model->Remove(parent, 0);
+  model->Remove(parent, parent->GetChild(0));
 
   // Test that the undo restores the bookmark and folder.
   undo_service->undo_manager()->Undo();
 
   ASSERT_EQ(1, model->other_node()->child_count());
   new_folder = model->other_node()->GetChild(0);
   EXPECT_EQ(1, new_folder->child_count());
   const BookmarkNode* node = new_folder->GetChild(0);
   EXPECT_EQ(node->GetTitle(), ASCIIToUTF16("bar"));
   EXPECT_EQ(node->url(), GURL("http://www.bar.com"));
@@ skipping 32 matching lines @@
   while (undo_service->undo_manager()->undo_count())
     undo_service->undo_manager()->Undo();
 
   EXPECT_EQ(1, parent->child_count());
   const BookmarkNode* node = model->other_node()->GetChild(0);
   EXPECT_EQ(node->GetTitle(), ASCIIToUTF16("foo"));
   EXPECT_EQ(node->url(), GURL("http://www.foo.com"));
 }
 
 } // namespace