Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: chrome/browser/sync/test/integration/two_client_printers_sync_test.cc

Issue 2799103002: Enable printers sync_integration_tests on chromeos (Closed)
Patch Set: add todo Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/test/integration/single_client_printers_sync_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « chrome/browser/sync/test/integration/single_client_printers_sync_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698