Revert "[Sync] Re-enable a flaky testUploadMovedBookmark() test"

This reverts commit ead171ec.

Reason for revert: Test is still flaky.

Original change's description:
> [Sync] Re-enable a flaky testUploadMovedBookmark() test
> 
> The test
> org.chromium.chrome.browser.sync.BookmarksTest#testUploadMovedBookmark
> has been disabled for long time due to
> flakiness.
> 
> This CL does the following:
> 1- Adds an assert() that's missing from the test start up.
> 2- Enables the test.
> 
> The plan is to enable it again to get measurements for how long it
> takes to fail and pass to rule out a time-out problem.
> 
> The flakiness dashboard has been replaced with a newer one since the
> reporting of the attached bug.
> 
> TBR=mastiz@chromium.org
> 
> Bug: 823484
> Change-Id: I827ff84ad953c56f01619b4aa07643714d0ffc6f
> Reviewed-on: https://chromium-review.googlesource.com/c/1348116
> Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
> Reviewed-by: Mikel Astiz <mastiz@chromium.org>
> Reviewed-by: Marc Treib <treib@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#610449}

TBR=treib@chromium.org,mastiz@chromium.org,mamir@chromium.org

Change-Id: I0d56f7d5f7590e9c15abbd4392ebfd75c987ca6c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 823484
Reviewed-on: https://chromium-review.googlesource.com/c/1349333Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610571}

chrome/android/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java

@@ -17,6 +17,7 @@ import org.junit.runner.RunWith;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
@@ -103,7 +104,6 @@ public class BookmarksTest {
         assertClientBookmarkCount(0);
         assertServerBookmarkCountWithName(0, TITLE);
         assertServerBookmarkCountWithName(0, MODIFIED_TITLE);
-        assertServerBookmarkCountWithName(0, FOLDER_TITLE);
     }
 
     // Test syncing a new bookmark from server to client.
@@ -315,6 +315,7 @@ public class BookmarksTest {
     @Test
     @LargeTest
     @Feature({"Sync"})
+    @DisabledTest(message = "crbug.com/823484")
     public void testUploadMovedBookmark() throws Exception {
         // Add the entity to test moving.
         BookmarkId bookmarkId = addClientBookmark(TITLE, URL);