Eliminate Bookmarks dependence to bookmark_undo_utils.h.

chrome/browser/ui/bookmarks/bookmark_drag_drop.cc

Index: chrome/browser/ui/bookmarks/bookmark_drag_drop.cc
diff --git a/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc b/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc
index 701ec32898d25544a669a06c6d2b370195c9c40a..e0d8bcc3b617b203585e22585d39e0bf3f015729 100644
--- a/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc
@@ -1,45 +1,44 @@
-// 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/ui/bookmarks/bookmark_drag_drop.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/undo/bookmark_undo_service.h"
-#include "chrome/browser/undo/bookmark_undo_service_factory.h"
-#include "chrome/browser/undo/bookmark_undo_utils.h"
-#include "ui/base/dragdrop/drag_drop_types.h"
-
-namespace chrome {
-
-int DropBookmarks(Profile* profile,
-                  const BookmarkNodeData& data,
-                  const BookmarkNode* parent_node,
-                  int index) {
-#if !defined(OS_ANDROID)
-  ScopedGroupBookmarkActions group_drops(profile);
-#endif
-  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
-  if (data.IsFromProfile(profile)) {
-    const std::vector<const BookmarkNode*> dragged_nodes =
-        data.GetNodes(profile);
-    if (!dragged_nodes.empty()) {
-      // Drag from same profile. Move nodes.
-      for (size_t i = 0; i < dragged_nodes.size(); ++i) {
-        model->Move(dragged_nodes[i], parent_node, index);
-        index = parent_node->GetIndexOf(dragged_nodes[i]) + 1;
-      }
-      return ui::DragDropTypes::DRAG_MOVE;
-    }
-    return ui::DragDropTypes::DRAG_NONE;
-  }
-  // Dropping a folder from different profile. Always accept.
-  bookmark_utils::CloneBookmarkNode(model, data.elements, parent_node,
-                                    index, true);
-  return ui::DragDropTypes::DRAG_COPY;
-}
-
-}  // namespace chrome
+// 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/ui/bookmarks/bookmark_drag_drop.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/undo/bookmark_undo_service.h"
+#include "chrome/browser/undo/bookmark_undo_service_factory.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
+
+namespace chrome {
+
+int DropBookmarks(Profile* profile,
+                  const BookmarkNodeData& data,
+                  const BookmarkNode* parent_node,
+                  int index) {
+#if !defined(OS_ANDROID)
+  bookmark_utils::ScopedGroupBookmarkActions group_drops(profile);
+#endif
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
+  if (data.IsFromProfile(profile)) {
+    const std::vector<const BookmarkNode*> dragged_nodes =
+        data.GetNodes(profile);
+    if (!dragged_nodes.empty()) {
+      // Drag from same profile. Move nodes.
+      for (size_t i = 0; i < dragged_nodes.size(); ++i) {
+        model->Move(dragged_nodes[i], parent_node, index);
+        index = parent_node->GetIndexOf(dragged_nodes[i]) + 1;
+      }
+      return ui::DragDropTypes::DRAG_MOVE;
+    }
+    return ui::DragDropTypes::DRAG_NONE;
+  }
+  // Dropping a folder from different profile. Always accept.
+  bookmark_utils::CloneBookmarkNode(model, data.elements, parent_node,
+                                    index, true);
+  return ui::DragDropTypes::DRAG_COPY;
+}
+
+}  // namespace chrome