Avoid conversion of index to BookmarkNode pointer unnacessarily.

chrome/browser/sync/glue/bookmark_change_processor.cc

 // Copyright 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 "chrome/browser/sync/glue/bookmark_change_processor.h"
 
 #include <map>
 #include <stack>
 #include <vector>
 
@@ skipping 589 matching lines @@
                     foster_parent->child_count());
       }
     }
     DCHECK_EQ(dst->child_count(), 0) << "Node being deleted has children";
 
     model_associator_->Disassociate(it->id);
 
     const BookmarkNode* parent = dst->parent();
     int index = parent->GetIndexOf(dst);
     if (index > -1)
-      model->Remove(parent, index);
+      model->Remove(parent->GetChild(index));
   }
 
   // A map to keep track of some reordering work we defer until later.
   std::multimap<int, const BookmarkNode*> to_reposition;
 
   syncer::ReadNode synced_bookmarks(trans);
   int64 synced_bookmarks_id = syncer::kInvalidId;
   if (synced_bookmarks.InitByTagLookupForBookmarks(kMobileBookmarksTag) ==
       syncer::BaseNode::INIT_OK) {
     synced_bookmarks_id = synced_bookmarks.GetId();
@@ skipping 81 matching lines @@
   for (std::multimap<int, const BookmarkNode*>::iterator it =
        to_reposition.begin(); it != to_reposition.end(); ++it) {
     const BookmarkNode* parent = it->second->parent();
     model->Move(it->second, parent, it->first);
   }
 
   // Clean up the temporary node.
   if (foster_parent) {
     // There should be no nodes left under the foster parent.
     DCHECK_EQ(foster_parent->child_count(), 0);
-    model->Remove(foster_parent->parent(),
-                  foster_parent->parent()->GetIndexOf(foster_parent));
+    model->Remove(foster_parent);
     foster_parent = NULL;
   }
 
   // The visibility of the mobile node may need to change.
   model_associator_->UpdatePermanentNodeVisibility();
 
   // Notify UI intensive observers of BookmarkModel that all updates have been
   // applied, and that they may now be consumed. This prevents issues like the
   // one described in crbug.com/281562, where old and new items on the bookmarks
   // bar would overlap.
@@ skipping 214 matching lines @@
     updated_specifics.set_icon_url(bookmark_node->icon_url().spec());
     sync_node->SetBookmarkSpecifics(updated_specifics);
   }
 }
 
 bool BookmarkChangeProcessor::CanSyncNode(const BookmarkNode* node) {
   return bookmark_model_->client()->CanSyncNode(node);
 }
 
 }  // namespace browser_sync