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

chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc

 // Copyright (c) 2006-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.
 
 #ifdef CHROME_PERSONALIZATION
 
 #include <stdlib.h>
 
 #include "base/string16.h"
 #include "base/rand_util.h"
@@ skipping 371 matching lines @@
   std::wstring title = L"Google";
   {
     const BookmarkNode* google = verifier->AddURL(model_one, bbn_one, 0,
         title, initial_url);
   }
   ASSERT_TRUE(client1()->AwaitMutualSyncCycleCompletion(client2()));
 
   {
     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);
 
   {
     const BookmarkNode* google_one = bbn_one->GetChild(0);
     model_one->SetTitle(google_one, L"Google1");
   }
   ASSERT_TRUE(client1()->AwaitMutualSyncCycleCompletion(client2()));
   BookmarkModelVerifier::ExpectModelsMatch(model_one, model_two);
@@ skipping 2073 matching lines @@
   BookmarkModelVerifier::VerifyNoDuplicates(model_one);
   // Let's compare and make sure both bookmark models are same after sync.
   BookmarkModelVerifier::ExpectModelsMatchIncludingFavicon(
       model_one, model_two, false);
 
   Cleanup();
 }
 
 
 #endif  // CHROME_PERSONALIZATION