Avoid conversion of index to BookmarkNode pointer unnacessarily.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
@@ skipping 511 matching lines @@
   BookmarkBarView* view = [bar_ buttonView];
   DCHECK(view);
   NSView* noItemContainer = [view noItemContainer];
   DCHECK(noItemContainer);
 
   EXPECT_FALSE([noItemContainer isHidden]);
   const BookmarkNode* node = model->AddURL(bar, bar->child_count(),
                                            ASCIIToUTF16("title"),
                                            GURL("http://www.google.com"));
   EXPECT_TRUE([noItemContainer isHidden]);
-  model->Remove(bar, bar->GetIndexOf(node));
+  model->Remove(node);
   EXPECT_FALSE([noItemContainer isHidden]);
 
   // Now try it using a bookmark from the Other Bookmarks.
   const BookmarkNode* otherBookmarks = model->other_node();
   node = model->AddURL(otherBookmarks, otherBookmarks->child_count(),
                        ASCIIToUTF16("TheOther"),
                        GURL("http://www.other.com"));
   EXPECT_FALSE([noItemContainer isHidden]);
   // Move it from Other Bookmarks to the bar.
   model->Move(node, bar, 0);
@@ skipping 32 matching lines @@
   // Open "off the side" menu.
   [bar_ openOffTheSideFolderFromButton:offTheSideButton];
   BookmarkBarFolderController* bbfc = [bar_ folderController];
   EXPECT_TRUE(bbfc);
   [bbfc setIgnoreAnimations:YES];
   while (!parent->empty()) {
     // We've completed the job so we're done.
     if ([bar_ offTheSideButtonIsHidden])
       break;
     // Delete the last button.
-    model->Remove(parent, parent->child_count() - 1);
+    model->Remove(parent->GetChild(parent->child_count() - 1));
     // If last one make sure the menu is closed and the button is hidden.
     // Else make sure menu stays open.
     if ([bar_ offTheSideButtonIsHidden]) {
       EXPECT_FALSE([bar_ folderController]);
     } else {
       EXPECT_TRUE([bar_ folderController]);
     }
   }
 }
 
@@ skipping 30 matching lines @@
         // First we mouse-enter the button to make things harder.
         NSArray* buttons = [bbfc buttons];
         for (BookmarkButton* button in buttons) {
           if ([button bookmarkNode] == parent->GetChild(indices[i])) {
             [bbfc mouseEnteredButton:button event:nil];
             break;
           }
         }
         // Then we remove the node.  This triggers the button to get
         // deleted.
-        model->Remove(parent, indices[i]);
+        model->Remove(parent->GetChild(indices[i]));
         // Force visual update which is otherwise delayed.
         [[bbfc window] displayIfNeeded];
       }
     }
   }
 }
 
 // Test whether |-dragShouldLockBarVisibility| returns NO iff the bar is
 // detached.
 TEST_F(BookmarkBarControllerTest, TestDragShouldLockBarVisibility) {
@@ skipping 149 matching lines @@
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   EXPECT_EQ(0U, [[bar_ buttons] count]);
   // Add one; make sure we see it.
   const BookmarkNode* parent = model->bookmark_bar_node();
   model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("title"), GURL("http://www.google.com"));
   EXPECT_EQ(1U, [[bar_ buttons] count]);
 
   // Add 30 which we expect to be 'too many'.  Make sure we don't see
   // 30 buttons.
-  model->Remove(parent, 0);
+  model->Remove(parent->GetChild(0));
   EXPECT_EQ(0U, [[bar_ buttons] count]);
   for (int i=0; i<30; i++) {
     model->AddURL(parent, parent->child_count(),
                   ASCIIToUTF16("title"), GURL("http://www.google.com"));
   }
   int count = [[bar_ buttons] count];
   EXPECT_LT(count, 30L);
 
   // Add 10 more (to the front of the list so the on-screen buttons
   // would change) and make sure the count stays the same.
@@ skipping 68 matching lines @@
   const char* urls[] = { "https://secret.url.com",
                          "http://super.duper.web.site.for.doodz.gov",
                          "http://www.foo-bar-baz.com/" };
   const BookmarkNode* parent = model->bookmark_bar_node();
   for (unsigned int i = 0; i < arraysize(urls); i++) {
     model->AddURL(parent, parent->child_count(),
                   ASCIIToUTF16("title"), GURL(urls[i]));
   }
   EXPECT_EQ(3, parent->child_count());
   const BookmarkNode* middle_node = parent->GetChild(1);
-  model->Remove(middle_node->parent(),
-                middle_node->parent()->GetIndexOf(middle_node));
+  model->Remove(middle_node);
 
   EXPECT_EQ(2, parent->child_count());
   EXPECT_EQ(parent->GetChild(0)->url(), GURL(urls[0]));
   // node 2 moved into spot 1
   EXPECT_EQ(parent->GetChild(1)->url(), GURL(urls[2]));
 }
 
 // TODO(jrg): write a test to confirm that nodeFaviconLoaded calls
 // checkForBookmarkButtonGrowth:.
 
@@ skipping 458 matching lines @@
     for (BookmarkButton* barButton in barButtons) {
       if ([barButton superview]) {
         EXPECT_NE([folderButton bookmarkNode], [barButton bookmarkNode]);
       }
     }
   }
 
   // Delete a bookmark in the off-the-side and verify it's gone.
   BookmarkButton* button = [bbfc buttonWithTitleEqualTo:@"DELETE_ME"];
   EXPECT_TRUE(button);
-  model->Remove(parent, parent->child_count() - 2);
+  model->Remove(parent->GetChild(parent->child_count() - 2));
   button = [bbfc buttonWithTitleEqualTo:@"DELETE_ME"];
   EXPECT_FALSE(button);
 }
 
 TEST_F(BookmarkBarControllerTest, EventToExitCheck) {
   NSEvent* event = cocoa_test_event_utils::MouseEventWithType(NSMouseMoved, 0);
   EXPECT_FALSE([bar_ isEventAnExitEvent:event]);
 
   BookmarkBarFolderWindow* folderWindow = [[[BookmarkBarFolderWindow alloc]
                                              init] autorelease];
@@ skipping 744 matching lines @@
                              "2f3b ] 4b ");
   actual = bookmarks::test::ModelStringFromNode(root);
   EXPECT_EQ(expected, actual);
 
   // Verify that the other bookmark folder can't be deleted.
   BookmarkButton *otherButton = [bar_ otherBookmarksButton];
   EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);
 }
 
 }  // namespace