Avoid conversion of index to BookmarkNode pointer unnacessarily.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm

 // 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.
 
 #include "base/basictypes.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
@@ skipping 19 matching lines @@
 
 namespace {
 
 const int kLotsOfNodesCount = 150;
 
 // Deletes the bookmark corresponding to |button|.
 void DeleteBookmark(BookmarkButton* button, Profile* profile) {
   const BookmarkNode* node = [button bookmarkNode];
   if (node) {
     BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
-    model->Remove(node->parent(), node->parent()->GetIndexOf(node));
+    model->Remove(node);
   }
 }
 
 }  // namespace
 
 // Add a redirect to make testing easier.
 @interface BookmarkBarFolderController(MakeTestingEasier)
 - (void)validateMenuSpacing;
 @end
 
@@ skipping 134 matching lines @@
     NSView* fakeToolbarView = [[[NSView alloc] initWithFrame:frame]
                                 autorelease];
     [[test_window() contentView] addSubview:fakeToolbarView];
     [fakeToolbarView addSubview:[bar_ view]];
     [bar_ setBookmarkBarEnabled:YES];
   }
 
   // Remove the bookmark with the long title.
   void RemoveLongTitleNode() {
     BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
-    model->Remove(longTitleNode_->parent(),
-                  longTitleNode_->parent()->GetIndexOf(longTitleNode_));
+    model->Remove(longTitleNode_);
   }
 
   // Add LOTS of nodes to our model if needed (e.g. scrolling).
   // Returns the number of nodes added.
   int AddLotsOfNodes() {
     BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
     for (int i = 0; i < kLotsOfNodesCount; i++) {
       model->AddURL(folderA_, folderA_->child_count(),
                     ASCIIToUTF16("repeated title"),
                     GURL("http://www.google.com/repeated/url"));
@@ skipping 1108 matching lines @@
   while (![folderController canScrollUp] && ++tripWire < 1000) {
     model->AddURL(folder, folder->child_count(), ASCIIToUTF16("B"),
                   GURL("http://b.com/"));
   }
   EXPECT_TRUE([folderController canScrollUp]);
 
   // Remove one bookmark and make sure the scroll down arrow has been removed.
   // We'll remove the really long node so we can see if the buttons get resized.
   scrollerWidth = NSWidth([folderView frame]);
   buttonWidth = NSWidth([button frame]);
-  model->Remove(folder, reallyWideButtonNumber);
+  model->Remove(folder->GetChild(reallyWideButtonNumber));
   EXPECT_FALSE([folderController canScrollUp]);
   EXPECT_FALSE([folderController canScrollDown]);
 
   // Check the size. It should have reduced.
   EXPECT_GT(scrollerWidth, NSWidth([folderView frame]));
   EXPECT_GT(buttonWidth, NSWidth([button frame]));
 
   // Check button spacing.
   [folderController validateMenuSpacing];
 }
@@ skipping 18 matching lines @@
 
   // Hover over a button and verify that it is now known.
   button = [buttons objectAtIndex:3];
   BookmarkButton* buttonThatMouseIsIn = [bbfc buttonThatMouseIsIn];
   EXPECT_FALSE(buttonThatMouseIsIn);
   [bbfc mouseEnteredButton:button event:nil];
   buttonThatMouseIsIn = [bbfc buttonThatMouseIsIn];
   EXPECT_EQ(button, buttonThatMouseIsIn);
 
   // Delete the bookmark and verify that it is now not known.
-  model->Remove(folder, 3);
+  model->Remove(folder->GetChild(3));
   buttonThatMouseIsIn = [bbfc buttonThatMouseIsIn];
   EXPECT_FALSE(buttonThatMouseIsIn);
 }
 
 // Just like a BookmarkBarFolderController but intercedes when providing
 // pasteboard drag data.
 @interface BookmarkBarFolderControllerDragData : BookmarkBarFolderController {
   const BookmarkNode* dragDataNode_;  // Weak
 }
 - (void)setDragDataNode:(const BookmarkNode*)node;
@@ skipping 267 matching lines @@
   DeleteBookmark([folder parentButton], profile());
   EXPECT_FALSE([folder folderController]);
 }
 
 // TODO(jrg): draggingEntered: and draggingExited: trigger timers so
 // they are hard to test.  Factor out "fire timers" into routines
 // which can be overridden to fire immediately to make behavior
 // confirmable.
 // There is a similar problem with mouseEnteredButton: and
 // mouseExitedButton:.