Update python sync server to support recursive deletion.

chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc

 // Copyright (c) 2010 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/bookmarks/bookmark_utils.h"
 #include "chrome/test/live_sync/live_bookmarks_sync_test.h"
 #include "base/rand_util.h"
 
 using std::string;
 using std::wstring;
@@ skipping 924 matching lines @@
   v->Remove(bm0, bm_bar0, 0);
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 }
 
 // Test Scribe ID - 371879.
 // TODO(rsimha): This currently fails due to http://crbug.com/50306.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_SC_DelBMFoldWithBMsNonEmptyAccountAfterwards) {
+    SC_DelBMFoldWithBMsNonEmptyAccountAfterwards) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
   ASSERT_TRUE(bm_bar0 != NULL);
   const BookmarkNode* bm_other0 = bm0->other_node();
   ASSERT_TRUE(bm_other0 != NULL);
 
   v->ExpectMatch(bm0);
@@ skipping 45 matching lines @@
   // Let's delete the bookmark folder (bm_folder_one)
   v->Remove(bm0, bm_bar0, 1);
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   BookmarkModelVerifier::ExpectModelsMatch(bm0, bm1);
 }
 
 // Test Scribe ID - 371880.
 // TODO(rsimha): This currently fails due to http://crbug.com/50306.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_SC_DelBMFoldWithBMsAndBMFoldsNonEmptyACAfterwards) {
+    SC_DelBMFoldWithBMsAndBMFoldsNonEmptyACAfterwards) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
   const BookmarkNode* bm_other0 = bm0->other_node();
   ASSERT_TRUE(bm_other0 != NULL);
 
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
@@ skipping 81 matching lines @@
   // Let's delete the bookmark folder (bm_folder_one)
   v->Remove(bm0, bm_bar0, 1);
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   BookmarkModelVerifier::ExpectModelsMatch(bm0, bm1);
 }
 
 // Test Scribe ID - 371882.
 // TODO(rsimha): This currently fails due to http://crbug.com/50306.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_SC_DelBMFoldWithParentAndChildrenBMsAndBMFolds) {
+    SC_DelBMFoldWithParentAndChildrenBMsAndBMFolds) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
 
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 
   // Let's add first bookmark folder to under bookmark_bar.
@@ skipping 905 matching lines @@
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Wait for changes to propagate.
   ASSERT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
   // Let's make sure there aren't any duplicates after sync.
   BookmarkModelVerifier::VerifyNoDuplicates(bm0);
   // Let's compare and make sure both bookmark models are same after sync.
   BookmarkModelVerifier::ExpectModelsMatchIncludingFavicon(
       bm0, bm1, false);
 }