Enable printers sync_integration_tests on chromeos

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

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "chrome/browser/sync/test/integration/printers_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
@@ skipping 110 matching lines @@
 
   std::string valid_message = "YAY!  More recent changes win!";
   ASSERT_TRUE(EditPrinterDescription(GetPrinterStore(0), 0, valid_message));
 
   // Conflict resolution shoud run here.
   ASSERT_TRUE(PrintersMatchChecker().Wait());
   // The more recent update should win.
   EXPECT_EQ(valid_message, GetPrinterStore(1)->GetPrinters()[0]->description());
 }
 
-// crbug.com/689662
-#if defined(OS_CHROMEOS)
-#define MAYBE_SimpleMerge DISABLED_SimpleMerge
-#else
-#define MAYBE_SimpleMerge SimpleMerge
-#endif
-IN_PROC_BROWSER_TEST_F(TwoClientPrintersSyncTest, MAYBE_SimpleMerge) {
+IN_PROC_BROWSER_TEST_F(TwoClientPrintersSyncTest, SimpleMerge) {
   ASSERT_TRUE(SetupClients());
   base::RunLoop().RunUntilIdle();
 
   // Store 0 has the even printers
   AddPrinter(GetPrinterStore(0), CreateTestPrinter(0));
   AddPrinter(GetPrinterStore(0), CreateTestPrinter(2));
 
   // Store 1 has the odd printers
   AddPrinter(GetPrinterStore(1), CreateTestPrinter(1));
   AddPrinter(GetPrinterStore(1), CreateTestPrinter(3));
 
   ASSERT_TRUE(SetupSync());
 
   // Stores should contain the same values now.
   EXPECT_EQ(4, GetPrinterCount(0));
   EXPECT_TRUE(AllProfilesContainSamePrinters());
 }
 
 }  // namespace