Index: chrome/browser/sync/test/integration/two_client_printers_sync_test.cc |
diff --git a/chrome/browser/sync/test/integration/two_client_printers_sync_test.cc b/chrome/browser/sync/test/integration/two_client_printers_sync_test.cc |
index 29ea6f0ad839b74b4c9d21db9a117fdca5598f18..96338833df49c594bf8f26f862e9ccc849289b86 100644 |
--- a/chrome/browser/sync/test/integration/two_client_printers_sync_test.cc |
+++ b/chrome/browser/sync/test/integration/two_client_printers_sync_test.cc |
@@ -128,13 +128,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientPrintersSyncTest, ConflictResolution) { |
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(); |