Commit 76d948a3 authored by Jan Krcal's avatar Jan Krcal Committed by Commit Bot

Revert "Disabling TwoClientAutofillProfileSyncTest.ClientsAddSameProfile_Test on desktop"

This reverts commit d6f90584.

Reason for revert: The culprit for the flakiness has been reverted in https://chromium-review.googlesource.com/c/chromium/src/+/2013281.

Original change's description:
> Disabling TwoClientAutofillProfileSyncTest.ClientsAddSameProfile_Test on desktop
> 
> 
> Failing
> 
> TBR=vitaliii@chromium.org
> 
> Bug: 1044514
> Change-Id: I698c4527a69a6e689e4be99e145b1bbf7bef327b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2013047
> Reviewed-by: Olga Sharonova <olka@chromium.org>
> Commit-Queue: Olga Sharonova <olka@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#733922}

TBR=olka@chromium.org

Change-Id: Ie468acf3fe421a5aa186fa96e057a4e9637b6271
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1044514
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2013128Reviewed-by: default avatarJan Krcal <jkrcal@chromium.org>
Commit-Queue: Jan Krcal <jkrcal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733976}
parent 3bfc0979
...@@ -302,14 +302,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientAutofillProfileSyncTest, ...@@ -302,14 +302,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientAutofillProfileSyncTest,
// Tests that adding the same profile on the two clients before sync is started // Tests that adding the same profile on the two clients before sync is started
// results in each client only having one profile after sync is started // results in each client only having one profile after sync is started
// Failing on Linux/Win/Mac. http://crbug.com/1044514
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
#define MAYBE_ClientsAddSameProfile DISABLED_ClientsAddSameProfile
#else
#define MAYBE_ClientsAddSameProfile ClientsAddSameProfile
#endif
IN_PROC_BROWSER_TEST_F(TwoClientAutofillProfileSyncTest, IN_PROC_BROWSER_TEST_F(TwoClientAutofillProfileSyncTest,
MAYBE_ClientsAddSameProfile) { ClientsAddSameProfile) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed"; ASSERT_TRUE(SetupClients()) << "SetupClients() failed";
base::HistogramTester histograms; base::HistogramTester histograms;
......
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