Index: chrome/browser/sync/test/integration/single_client_printers_sync_test.cc |
diff --git a/chrome/browser/sync/test/integration/single_client_printers_sync_test.cc b/chrome/browser/sync/test/integration/single_client_printers_sync_test.cc |
index 0f9ecd65446432e487cfff6c811ed683fd791f27..73c04a93be568446dc8b941de5e5621bee9f5b5a 100644 |
--- a/chrome/browser/sync/test/integration/single_client_printers_sync_test.cc |
+++ b/chrome/browser/sync/test/integration/single_client_printers_sync_test.cc |
@@ -53,15 +53,12 @@ IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, SingleNewPrinter) { |
} |
// Verify editing a printer doesn't add it. |
-// Flaky on ChromeOS. http://crbug.com/701999 |
-#if defined(OS_CHROMEOS) |
-#define MAYBE_EditPrinter DISABLED_EditPrinter |
-#else |
-#define MAYBE_EditPrinter EditPrinter |
-#endif |
-IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, MAYBE_EditPrinter) { |
+IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, EditPrinter) { |
ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
+ // Wait for sync service initialization before proceeding. |
skym
2017/03/16 23:41:00
It concerns me that this is needed, and that you'r
skau
2017/03/18 00:04:55
I've moved it into SetupSync so it's used in the o
|
+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); |
+ |
AddPrinter(GetPrinterStore(0), printers_helper::CreateTestPrinter(0)); |
AddPrinter(GetVerifierPrinterStore(), printers_helper::CreateTestPrinter(0)); |