Try the original CL "Always persist bookmark IDs" again with the fix to...

chrome/browser/views/bookmark_editor_view.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_
 
 #include <set>
 
 #include "app/tree_node_model.h"
@@ skipping 95 matching lines @@
   void Close();
 
   // Shows the context menu.
   virtual void ShowContextMenu(View* source,
                                int x,
                                int y,
                                bool is_mouse_gesture);
 
  private:
   // Type of node in the tree.
-  typedef TreeNodeWithValue<int> EditorNode;
+  typedef TreeNodeWithValue<int64> EditorNode;
 
   // Model for the TreeView. Trivial subclass that doesn't allow titles with
   // empty strings.
   class EditorTreeModel : public TreeNodeModel<EditorNode> {
    public:
     explicit EditorTreeModel(EditorNode* root)
         : TreeNodeModel<EditorNode>(root) {}
 
     virtual void SetTitle(TreeModelNode* node,
                           const std::wstring& title) {
@@ skipping 41 matching lines @@
 
   // Creates a returns the new root node. This invokes CreateNodes to do
   // the real work.
   EditorNode* CreateRootNode();
 
   // Adds and creates a child node in b_node for all children of bb_node that
   // are groups.
   void CreateNodes(const BookmarkNode* bb_node, EditorNode* b_node);
 
   // Returns the node with the specified id, or NULL if one can't be found.
-  EditorNode* FindNodeWithID(BookmarkEditorView::EditorNode* node, int id);
+  EditorNode* FindNodeWithID(BookmarkEditorView::EditorNode* node, int64 id);
 
   // Invokes ApplyEdits with the selected node.
   void ApplyEdits();
 
   // Applies the edits done by the user. |parent| gives the parent of the URL
   // being edited.
   void ApplyEdits(EditorNode* parent);
 
   // Recursively adds newly created groups and sets the title of nodes to
   // match the user edited title.
@@ skipping 67 matching lines @@
 
   // Is the tree shown?
   bool show_tree_;
 
   scoped_ptr<BookmarkEditor::Handler> handler_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkEditorView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_