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

chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc

Index: chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
===================================================================
--- chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc	(revision 29276)
+++ chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc	(working copy)
@@ -389,10 +389,10 @@
   {
     const BookmarkNode* google_one = GetByUniqueURL(model_one, initial_url);
     const BookmarkNode* google_two = GetByUniqueURL(model_two, initial_url);
-    bookmark_utils::ApplyEditsWithNoGroupChange(model_one, bbn_one, google_one,
-                                                title, second_url, NULL);
-    bookmark_utils::ApplyEditsWithNoGroupChange(model_two, bbn_two, google_two,
-                                                title, third_url, NULL);
+    bookmark_utils::ApplyEditsWithNoGroupChange(model_one, bbn_one,
+        BookmarkEditor::EditDetails(google_one), title, second_url, NULL);
+    bookmark_utils::ApplyEditsWithNoGroupChange(model_two, bbn_two,
+        BookmarkEditor::EditDetails(google_two), title, third_url, NULL);
   }
   ASSERT_TRUE(client1()->AwaitMutualSyncCycleCompletionWithConflict(client2()));
   BookmarkModelVerifier::ExpectModelsMatch(model_one, model_two);