Revert r252832: Eliminate Bookmarks dependence to bookmark_undo_utils.h.

chrome/browser/undo/bookmark_undo_service.cc

 // Copyright 2013 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/undo/bookmark_undo_service.h"
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
-#include "chrome/browser/bookmarks/scoped_group_bookmark_actions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/undo/bookmark_renumber_observer.h"
 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
+#include "chrome/browser/undo/bookmark_undo_utils.h"
 #include "chrome/browser/undo/undo_operation.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // BookmarkUndoOperation ------------------------------------------------------
 
 // Base class for all bookmark related UndoOperations that facilitates access to
 // the BookmarkUndoService.
@@ skipping 359 matching lines @@
 
 // BookmarkUndoService --------------------------------------------------------
 
 BookmarkUndoService::BookmarkUndoService(Profile* profile) : profile_(profile) {
 }
 
 BookmarkUndoService::~BookmarkUndoService() {
   BookmarkModelFactory::GetForProfile(profile_)->RemoveObserver(this);
 }
 
+void BookmarkUndoService::OnBookmarkRenumbered(int64 old_id, int64 new_id) {
+  std::vector<UndoOperation*> all_operations =
+      undo_manager()->GetAllUndoOperations();
+  for (std::vector<UndoOperation*>::iterator it = all_operations.begin();
+       it != all_operations.end(); ++it) {
+    static_cast<BookmarkUndoOperation*>(*it)->OnBookmarkRenumbered(old_id,
+                                                                   new_id);
+  }
+}
+
 void BookmarkUndoService::BookmarkModelLoaded(BookmarkModel* model,
                                               bool ids_reassigned) {
   undo_manager_.RemoveAllOperations();
 }
 
 void BookmarkUndoService::BookmarkModelBeingDeleted(BookmarkModel* model) {
   undo_manager_.RemoveAllOperations();
 }
 
 void BookmarkUndoService::BookmarkNodeMoved(BookmarkModel* model,
@@ skipping 45 matching lines @@
                                                    const BookmarkNode* node) {
   scoped_ptr<UndoOperation> op(new BookmarkEditOperation(profile_, node));
   undo_manager()->AddUndoOperation(op.Pass());
 }
 
 void BookmarkUndoService::OnWillReorderBookmarkNode(BookmarkModel* model,
                                                     const BookmarkNode* node) {
   scoped_ptr<UndoOperation> op(new BookmarkReorderOperation(profile_, node));
   undo_manager()->AddUndoOperation(op.Pass());
 }
-
-void BookmarkUndoService::GroupedBookmarkChangesBeginning(
-    BookmarkModel* model) {
-  undo_manager()->StartGroupingActions();
-}
-
-void BookmarkUndoService::GroupedBookmarkChangesEnded(BookmarkModel* model) {
-  undo_manager()->EndGroupingActions();
-}
-
-void BookmarkUndoService::OnBookmarkRenumbered(int64 old_id, int64 new_id) {
-  std::vector<UndoOperation*> all_operations =
-      undo_manager()->GetAllUndoOperations();
-  for (std::vector<UndoOperation*>::iterator it = all_operations.begin();
-       it != all_operations.end(); ++it) {
-    static_cast<BookmarkUndoOperation*>(*it)->OnBookmarkRenumbered(old_id,
-                                                                   new_id);
-  }
-}
-