Lands http://codereview.chromium.org/155428 for Thiago, which changes

from me to get the thing to work.

Merging two versions of BookmarkNodeRemoved into one.

BUG=None
TEST=Remove some bookmarks from BookmarkBar or Bookmarks Manager and make sure
everything works ok.

Review URL: http://codereview.chromium.org/155572

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20739 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 11 deletions

diff --git a/chrome/browser/bookmarks/base_bookmark_model_observer.h b/chrome/browser/bookmarks/base_bookmark_model_observer.h
index 045afb9..1242d18 100644
--- a/chrome/browser/bookmarks/base_bookmark_model_observer.h
+++ b/chrome/browser/bookmarks/base_bookmark_model_observer.h
@@ -35,7 +35,8 @@ class BaseBookmarkModelObserver : public BookmarkModelObserver {
   }
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
-                                   int index) {
+                                   int old_index,
+                                   const BookmarkNode* node) {
     BookmarkModelChanged();
   }
   virtual void BookmarkNodeChanged(BookmarkModel* model,
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index c8ba083..4157089 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -181,16 +181,14 @@ class BookmarkModelObserver {
                                  int index) = 0;
 
   // Invoked when a node has been removed, the item may still be starred though.
-  // TODO(sky): merge these two into one.
-  virtual void BookmarkNodeRemoved(BookmarkModel* model,
-                                   const BookmarkNode* parent,
-                                   int index) {}
+  // |parent| the parent of the node that was removed.
+  // |old_index| the index of the removed node in |parent| before it was
+  // removed.
+  // |node| is the node that was removed.
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
                                    int old_index,
-                                   const BookmarkNode* node) {
-    BookmarkNodeRemoved(model, parent, old_index);
-  }
+                                   const BookmarkNode* node) = 0;
 
   // Invoked when the title or favicon of a node has changed.
   virtual void BookmarkNodeChanged(BookmarkModel* model,
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 627a058..d0160e5 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -96,9 +96,10 @@ class BookmarkModelTest : public testing::Test, public BookmarkModelObserver {
 
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
-                                   int index) {
+                                   int old_index,
+                                   const BookmarkNode* node) {
     removed_count++;
-    observer_details.Set(parent, NULL, index, -1);
+    observer_details.Set(parent, NULL, old_index, -1);
   }
 
   virtual void BookmarkNodeChanged(BookmarkModel* model,
@@ -639,7 +640,8 @@ class BookmarkModelTestWithProfile : public testing::Test,
                                  int index) {}
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
-                                   int index) {}
+                                   int old_index,
+                                   const BookmarkNode* node) {}
   virtual void BookmarkNodeChanged(BookmarkModel* model,
                                    const BookmarkNode* node) {}
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,