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

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

Issue 2738243002: [Sync] Enable Sync_integration_tests on chromeos (Closed)
Patch Set: add to main waterfall Created 3 years, 9 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
Index: chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
index b46323a9c5b45bade861f394c5e99c5ab72e6eef..c8d22d291725e4c1fa4b2c49201c2296504892bc 100644
--- a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
@@ -332,7 +332,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, UpdateIncognitoEnableDisable) {
ASSERT_FALSE(IsIncognitoEnabled(GetProfile(1), 0));
}
-IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, DisableApps) {
+// crbug.com/689662
+#if defined(OS_CHROMEOS)
+#define MAYBE_DisableApps DISABLED_DisableApps
+#else
+#define MAYBE_DisableApps DisableApps
+#endif
+IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, MAYBE_DisableApps) {
ASSERT_TRUE(SetupSync());
ASSERT_TRUE(AllProfilesHaveSameAppList());
@@ -371,7 +377,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, DisableSync) {
// Install some apps on both clients, then sync. Move an app on one client
// and sync. Both clients should have the updated position for the app.
-IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, Move) {
+// crbug.com/689662
+#if defined(OS_CHROMEOS)
+#define MAYBE_Move DISABLED_Move
+#else
+#define MAYBE_Move Move
+#endif
+IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, MAYBE_Move) {
ASSERT_TRUE(SetupSync());
ASSERT_TRUE(AllProfilesHaveSameAppList());

Powered by Google App Engine
This is Rietveld 408576698