Makes canceling 'bookmark all tabs' delete the folder. Or rather,...

chrome/browser/gtk/bookmark_editor_gtk_unittest.cc

Index: chrome/browser/gtk/bookmark_editor_gtk_unittest.cc
===================================================================
--- chrome/browser/gtk/bookmark_editor_gtk_unittest.cc	(revision 29276)
+++ chrome/browser/gtk/bookmark_editor_gtk_unittest.cc	(working copy)
@@ -88,7 +88,8 @@
 
 // Makes sure the tree model matches that of the bookmark bar model.
 TEST_F(BookmarkEditorGtkTest, ModelsMatch) {
-  BookmarkEditorGtk editor(NULL, profile_.get(), NULL, NULL,
+  BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
+                           BookmarkEditor::EditDetails(),
                            BookmarkEditor::SHOW_TREE, NULL);
 
   // The root should have two children, one for the bookmark bar node,
@@ -127,7 +128,8 @@
 
 // Changes the title and makes sure parent/visual order doesn't change.
 TEST_F(BookmarkEditorGtkTest, EditTitleKeepsPosition) {
-  BookmarkEditorGtk editor(NULL, profile_.get(), NULL, GetNode("a"),
+  BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
+                           BookmarkEditor::EditDetails(GetNode("a")),
                            BookmarkEditor::SHOW_TREE, NULL);
   gtk_entry_set_text(GTK_ENTRY(editor.name_entry_), "new_a");
 
@@ -146,7 +148,8 @@
 // Changes the url and makes sure parent/visual order doesn't change.
 TEST_F(BookmarkEditorGtkTest, EditURLKeepsPosition) {
   Time node_time = GetNode("a")->date_added();
-  BookmarkEditorGtk editor(NULL, profile_.get(), NULL, GetNode("a"),
+  BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
+                           BookmarkEditor::EditDetails(GetNode("a")),
                            BookmarkEditor::SHOW_TREE, NULL);
   gtk_entry_set_text(GTK_ENTRY(editor.url_entry_),
                      GURL(base_path() + "new_a").spec().c_str());
@@ -166,7 +169,8 @@
 
 // Moves 'a' to be a child of the other node.
 TEST_F(BookmarkEditorGtkTest, ChangeParent) {
-  BookmarkEditorGtk editor(NULL, profile_.get(), NULL, GetNode("a"),
+  BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
+                           BookmarkEditor::EditDetails(GetNode("a")),
                            BookmarkEditor::SHOW_TREE, NULL);
 
   GtkTreeModel* store = GTK_TREE_MODEL(editor.tree_store_);
@@ -184,7 +188,8 @@
 // Moves 'a' to be a child of the other node and changes its url to new_a.
 TEST_F(BookmarkEditorGtkTest, ChangeParentAndURL) {
   Time node_time = GetNode("a")->date_added();
-  BookmarkEditorGtk editor(NULL, profile_.get(), NULL, GetNode("a"),
+  BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
+                           BookmarkEditor::EditDetails(GetNode("a")),
                            BookmarkEditor::SHOW_TREE, NULL);
 
   gtk_entry_set_text(GTK_ENTRY(editor.url_entry_),
@@ -204,7 +209,8 @@
 
 // Creates a new folder and moves a node to it.
 TEST_F(BookmarkEditorGtkTest, MoveToNewParent) {
-  BookmarkEditorGtk editor(NULL, profile_.get(), NULL, GetNode("a"),
+  BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
+                           BookmarkEditor::EditDetails(GetNode("a")),
                            BookmarkEditor::SHOW_TREE, NULL);
 
   GtkTreeIter bookmark_bar_node;
@@ -251,7 +257,8 @@
 
 // Brings up the editor, creating a new URL on the bookmark bar.
 TEST_F(BookmarkEditorGtkTest, NewURL) {
-  BookmarkEditorGtk editor(NULL, profile_.get(), NULL, NULL,
+  BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
+                           BookmarkEditor::EditDetails(),
                            BookmarkEditor::SHOW_TREE, NULL);
 
   gtk_entry_set_text(GTK_ENTRY(editor.url_entry_),
@@ -275,7 +282,8 @@
 // Brings up the editor with no tree and modifies the url.
 TEST_F(BookmarkEditorGtkTest, ChangeURLNoTree) {
   BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
-                           model_->other_node()->GetChild(0),
+                           BookmarkEditor::EditDetails(
+                               model_->other_node()->GetChild(0)),
                            BookmarkEditor::NO_TREE, NULL);
 
   gtk_entry_set_text(GTK_ENTRY(editor.url_entry_),
@@ -296,7 +304,8 @@
 // Brings up the editor with no tree and modifies only the title.
 TEST_F(BookmarkEditorGtkTest, ChangeTitleNoTree) {
   BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
-                           model_->other_node()->GetChild(0),
+                           BookmarkEditor::EditDetails(
+                               model_->other_node()->GetChild(0)),
                            BookmarkEditor::NO_TREE, NULL);
   gtk_entry_set_text(GTK_ENTRY(editor.name_entry_), "new_a");