Avoid conversion of index to BookmarkNode pointer unnacessarily.

components/bookmarks/browser/bookmark_model.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/bookmarks/browser/bookmark_model.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/bind.h"
@@ skipping 170 matching lines @@
 void BookmarkModel::BeginGroupedChanges() {
   FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
                     GroupedBookmarkChangesBeginning(this));
 }
 
 void BookmarkModel::EndGroupedChanges() {
   FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
                     GroupedBookmarkChangesEnded(this));
 }
 
-void BookmarkModel::Remove(const BookmarkNode* parent, int index) {
-  if (!loaded_ || !IsValidIndex(parent, index, false) || is_root_node(parent)) {
+void BookmarkModel::Remove(const BookmarkNode* parent,
+                           const BookmarkNode* child) {
+  if (!loaded_ || is_root_node(parent)) {
     NOTREACHED();
     return;
   }
-  RemoveAndDeleteNode(AsMutable(parent->GetChild(index)));
+  RemoveAndDeleteNode(AsMutable(child));
 }
 
 void BookmarkModel::RemoveAllUserBookmarks() {
   std::set<GURL> removed_urls;
   ScopedVector<BookmarkNode> removed_nodes;
 
   FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
                     OnWillRemoveAllUserBookmarks(this));
 
   BeginExtensiveChanges();
@@ skipping 633 matching lines @@
   FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
                     BookmarkModelLoaded(this, details->ids_reassigned()));
 }
 
 void BookmarkModel::RemoveAndDeleteNode(BookmarkNode* delete_me) {
   scoped_ptr<BookmarkNode> node(delete_me);
 
   const BookmarkNode* parent = node->parent();
   DCHECK(parent);
   int index = parent->GetIndexOf(node.get());
+  if (!IsValidIndex(parent, index, false)) {
+    NOTREACHED();
+    return;
+  }
 
   FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
                     OnWillRemoveBookmarks(this, parent, index, node.get()));
 
   std::set<GURL> removed_urls;
   {
     base::AutoLock url_lock(url_lock_);
     RemoveNodeAndGetRemovedUrls(node.get(), &removed_urls);
   }
 
@@ skipping 187 matching lines @@
   return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails(
       bb_node,
       other_node,
       mobile_node,
       client_->GetLoadExtraNodesCallback(),
       new BookmarkIndex(client_, accept_languages),
       next_node_id_));
 }
 
 }  // namespace bookmarks