Avoid conversion of index to BookmarkNode pointer unnacessarily.

components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc

 // Copyright 2014 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/enhanced_bookmarks/enhanced_bookmark_model.h"
 
 #include "base/base64.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 577 matching lines @@
   const BookmarkNode* folder = AddFolder();
   EXPECT_EQ(2, added_calls_);
   EXPECT_EQ(folder, last_added_);
 }
 
 TEST_F(EnhancedBookmarkModelTest, ObserverNodeRemovedEvent) {
   const BookmarkNode* node = AddBookmark();
   const BookmarkNode* folder = AddFolder();
 
   EXPECT_EQ(0, removed_calls_);
-  bookmark_model_->Remove(node->parent(), node->parent()->GetIndexOf(node));
+  bookmark_model_->Remove(node);
   EXPECT_EQ(1, removed_calls_);
   EXPECT_EQ(node, last_removed_);
 
-  bookmark_model_->Remove(folder->parent(),
-                          folder->parent()->GetIndexOf(folder));
+  bookmark_model_->Remove(folder);
   EXPECT_EQ(2, removed_calls_);
   EXPECT_EQ(folder, last_removed_);
 }
 
 TEST_F(EnhancedBookmarkModelTest, ObserverNodeChangedEvent) {
   const BookmarkNode* node = AddBookmark();
 
   EXPECT_EQ(0, changed_calls_);
   bookmark_model_->SetTitle(node, base::ASCIIToUTF16("New Title"));
   EXPECT_EQ(1, changed_calls_);
@@ skipping 54 matching lines @@
   model_->Shutdown();
   model_.reset();
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(EnhancedBookmarkModelTest, NodeRemovedWhileResetDuplicationScheduled) {
   const BookmarkNode* node1 = AddBookmark();
   const BookmarkNode* node2 = AddBookmark();
   bookmark_model_->SetNodeMetaInfo(node1, "stars.id", "c_1");
   bookmark_model_->SetNodeMetaInfo(node2, "stars.id", "c_1");
-  bookmark_model_->Remove(node1->parent(), node1->parent()->GetIndexOf(node1));
+  bookmark_model_->Remove(node1);
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(EnhancedBookmarkModelTest,
        RemoveParentShouldRemoveChildrenFromMaps) {
   const BookmarkNode* parent = AddFolder();
   const BookmarkNode* node = AddBookmark("Title", parent);
   std::string remote_id = GetId(node);
   EXPECT_EQ(node, model_->BookmarkForRemoteId(remote_id));
 
-  const BookmarkNode* gp = parent->parent();
-  bookmark_model_->Remove(gp, gp->GetIndexOf(parent));
+  bookmark_model_->Remove(parent);
   EXPECT_FALSE(model_->BookmarkForRemoteId(remote_id));
 }
 
 TEST_F(EnhancedBookmarkModelTest, AddsRemoteIdToNonClonedKeys) {
   const std::set<std::string>& non_cloned_keys =
       bookmark_model_->non_cloned_keys();
   EXPECT_TRUE(non_cloned_keys.find("stars.id") != non_cloned_keys.end());
 }
 
 TEST_F(EnhancedBookmarkModelTest, RemoveImageData) {
   const BookmarkNode* node = AddBookmark();
   model_->SetAllImages(node, GURL(IMAGE_URL), 64, 64, GURL(IMAGE_URL), 16, 16);
 
   GURL url;
   int width, height;
   EXPECT_TRUE(model_->GetOriginalImage(node, &url, &width, &height));
   EXPECT_TRUE(model_->GetThumbnailImage(node, &url, &width, &height));
 
   model_->RemoveImageData(node);
   EXPECT_FALSE(model_->GetOriginalImage(node, &url, &width, &height));
   EXPECT_FALSE(model_->GetThumbnailImage(node, &url, &width, &height));
 
   std::string meta_info = GetMetaInfoField(node, "stars.imageData");
   std::string decoded;
   ASSERT_TRUE(base::Base64Decode(meta_info, &decoded));
   image::collections::ImageData data;
   ASSERT_TRUE(data.ParseFromString(decoded));
   EXPECT_TRUE(data.user_removed_image());
 }