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

chrome/browser/views/bookmark_editor_view.cc

 // Copyright (c) 2006-2008 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/views/bookmark_editor_view.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 425 matching lines @@
   new_node->value = 0;
   // new_node is now owned by parent.
   tree_model_->Add(parent, parent->GetChildCount(), new_node);
   return new_node;
 }
 
 void BookmarkEditorView::ExpandAndSelect() {
   tree_view_->ExpandAll();
 
   const BookmarkNode* to_select = node_ ? node_->GetParent() : parent_;
-  int group_id_to_select = to_select->id();
+  int64 group_id_to_select = to_select->id();
   DCHECK(group_id_to_select);  // GetMostRecentParent should never return NULL.
   EditorNode* b_node =
       FindNodeWithID(tree_model_->GetRoot(), group_id_to_select);
   if (!b_node)
     b_node = tree_model_->GetRoot()->GetChild(0);  // Bookmark bar node.
 
   tree_view_->SetSelectedNode(b_node);
 }
 
 BookmarkEditorView::EditorNode* BookmarkEditorView::CreateRootNode() {
@@ skipping 14 matching lines @@
       EditorNode* new_b_node = new EditorNode(child_bb_node->GetTitle(),
                                                   child_bb_node->id());
       b_node->Add(b_node->GetChildCount(), new_b_node);
       CreateNodes(child_bb_node, new_b_node);
     }
   }
 }
 
 BookmarkEditorView::EditorNode* BookmarkEditorView::FindNodeWithID(
     BookmarkEditorView::EditorNode* node,
-    int id) {
+    int64 id) {
   if (node->value == id)
     return node;
   for (int i = 0; i < node->GetChildCount(); ++i) {
     EditorNode* result = FindNodeWithID(node->GetChild(i), id);
     if (result)
       return result;
   }
   return NULL;
 }
 
@@ skipping 59 matching lines @@
           break;
         }
       }
       DCHECK(child_bb_node);
       bb_model_->SetTitle(child_bb_node, child_b_node->GetTitle());
     }
     ApplyNameChangesAndCreateNewGroups(child_bb_node, child_b_node,
                                        parent_b_node, parent_bb_node);
   }
 }