Mass-rename of BookmarkModel::RemoveAll().

That call only removes nodes editable by the user now. Also renamed the
corresponding BookmarkModelObserver callbacks.

Note: this is a reland of https://codereview.chromium.org/323563003.

BUG=49598
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/314193003

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

3 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/undo/bookmark_undo_service.cc b/chrome/browser/undo/bookmark_undo_service.cc
index 7bd1f28..e47158d 100644
--- a/chrome/browser/undo/bookmark_undo_service.cc
+++ b/chrome/browser/undo/bookmark_undo_service.cc
@@ -433,7 +433,7 @@ void BookmarkUndoService::OnWillRemoveBookmarks(BookmarkModel* model,
   undo_manager()->AddUndoOperation(op.Pass());
 }
 
-void BookmarkUndoService::OnWillRemoveAllBookmarks(BookmarkModel* model) {
+void BookmarkUndoService::OnWillRemoveAllUserBookmarks(BookmarkModel* model) {
   bookmarks::ScopedGroupBookmarkActions merge_removes(model);
   for (int i = 0; i < model->root_node()->child_count(); ++i) {
     const BookmarkNode* permanent_node = model->root_node()->GetChild(i);
diff --git a/chrome/browser/undo/bookmark_undo_service.h b/chrome/browser/undo/bookmark_undo_service.h
index ef5686f..cd024bf 100644
--- a/chrome/browser/undo/bookmark_undo_service.h
+++ b/chrome/browser/undo/bookmark_undo_service.h
@@ -49,7 +49,7 @@ class BookmarkUndoService : public BaseBookmarkModelObserver,
                                      const BookmarkNode* parent,
                                      int old_index,
                                      const BookmarkNode* node) OVERRIDE;
-  virtual void OnWillRemoveAllBookmarks(BookmarkModel* model) OVERRIDE;
+  virtual void OnWillRemoveAllUserBookmarks(BookmarkModel* model) OVERRIDE;
   virtual void OnWillChangeBookmarkNode(BookmarkModel* model,
                                         const BookmarkNode* node) OVERRIDE;
   virtual void OnWillReorderBookmarkNode(BookmarkModel* model,
diff --git a/chrome/browser/undo/bookmark_undo_service_test.cc b/chrome/browser/undo/bookmark_undo_service_test.cc
index 4478264..e8008f9 100644
--- a/chrome/browser/undo/bookmark_undo_service_test.cc
+++ b/chrome/browser/undo/bookmark_undo_service_test.cc
@@ -329,9 +329,10 @@ TEST_F(BookmarkUndoServiceTest, UndoBookmarkRemoveAll) {
   new_folder = model->AddFolder(parent, 1, ASCIIToUTF16("folder"));
   model->AddURL(new_folder, 0, ASCIIToUTF16("b"), GURL("http://www.b.com"));
 
-  model->RemoveAll();
+  model->RemoveAllUserBookmarks();
 
-  // Test that the undo of RemoveAll restores all folders and bookmarks.
+  // Test that the undo of RemoveAllUserBookmarks restores all folders and
+  // bookmarks.
   undo_service->undo_manager()->Undo();
 
   ASSERT_EQ(2, model->other_node()->child_count());