Commit 1c0ae29c authored by Mikel Astiz's avatar Mikel Astiz Committed by Commit Bot

Revert "Disable a crashing TwoClientBookmarksSyncTest."

This reverts commit 664491ff.

Reason for revert: the underlying issue is believed to be fixed after
https://chromium-review.googlesource.com/c/chromium/src/+/1029853

Original change's description:
> Disable a crashing TwoClientBookmarksSyncTest.
> 
> BUG=836426
> TBR=skym@chromium.org
> NOTRY=true
> 
> Change-Id: Ie9c07c1417ab693d517e1ac4ee3dc8082465a58a
> Reviewed-on: https://chromium-review.googlesource.com/1026790
> Reviewed-by: Lei Zhang <thestig@chromium.org>
> Commit-Queue: Lei Zhang <thestig@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#553299}

TBR=thestig@chromium.org,skym@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 836426
Change-Id: I53b2cac1ee6720cbbbd9d2650292cac6cc551bfe
Reviewed-on: https://chromium-review.googlesource.com/1032411Reviewed-by: default avatarMikel Astiz <mastiz@chromium.org>
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554350}
parent 9a04b240
...@@ -1815,10 +1815,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, ...@@ -1815,10 +1815,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait()); ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
} }
// Test is crashing. https://crbug.com/836426 IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F( FirstClientEnablesEncryptionWithPassSecondChanges) {
TwoClientBookmarksSyncTest,
DISABLED_FirstClientEnablesEncryptionWithPassSecondChanges) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier()); ASSERT_TRUE(AllModelsMatchVerifier());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment