Enable printers sync_integration_tests on chromeos

chrome/browser/sync/test/integration/single_client_printers_sync_test.cc

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 c7a6a0f79507439d9a1196045436efe32d5bfc63..4b41c7e3da990f7a4b52cf7480e2d9da9b44afca 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
@@ -25,14 +25,6 @@ class SingleClientPrintersSyncTest : public SyncTest {
   SingleClientPrintersSyncTest() : SyncTest(SINGLE_CLIENT) {}
   ~SingleClientPrintersSyncTest() override {}
 
-  bool SetupSync() override {
-    if (!SyncTest::SetupSync())
-      return false;
-
-    // Wait for sync to complete initialization before proceeding.
-    return UpdatedProgressMarkerChecker(GetSyncService(0)).Wait();
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(SingleClientPrintersSyncTest);
 };
@@ -40,6 +32,7 @@ class SingleClientPrintersSyncTest : public SyncTest {
 // Verify that printers aren't added with a sync call.
 IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, NoPrinters) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());

[skym, 2017/04/06 16:48:44]

Why is this being added back? I know this isn't your fault, but we should not be
using UpdatedProgressMarkerChecker here. Part of its checks are directory
specific.

It seems like we're trying to wait for sync to have potentially sent something
something between devices. And then we verify no printers data was sent. Some
tests send a bookmark, wait for it, and then verify their data type did not go.
I like this approach more, because if
UpdatedProgressMarkerChecker(GetSyncService(0)).Wait() doesn't actually wait for
long enough/correctly, then this test silently fails.

If you feel fixing this is out of scope, add a todo and add a bunch of
explanation.

[Gang Wu, 2017/04/06 19:22:59]

Done.

   EXPECT_TRUE(ProfileContainsSamePrintersAsVerifier(0));
 }
 
@@ -60,13 +53,7 @@ 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.";
 
   AddPrinter(GetPrinterStore(0), printers_helper::CreateTestPrinter(0));
@@ -92,13 +79,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, RemovePrinter) {
 }
 
 // Verify that merging data added before sync works.
-// crbug.com/689662
-#if defined(OS_CHROMEOS)
-#define MAYBE_AddBeforeSetup DISABLED_AddBeforeSetup
-#else
-#define MAYBE_AddBeforeSetup AddBeforeSetup
-#endif
-IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, MAYBE_AddBeforeSetup) {
+IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, AddBeforeSetup) {
   ASSERT_TRUE(SetupClients());
 
   AddPrinter(GetPrinterStore(0), printers_helper::CreateTestPrinter(0));