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

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

Issue 2771593002: [Sync] Disable/Enable APP_LIST by APPS (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | 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_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 fcf9958704c3189fa70237f4f68d7baea9f78140..7ddd650465ca5949ebd5a36d471058f1914f0b63 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,22 +332,18 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, UpdateIncognitoEnableDisable) {
ASSERT_FALSE(IsIncognitoEnabled(GetProfile(1), 0));
}
-// 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) {
+IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, DisableApps) {
ASSERT_TRUE(SetupSync());
ASSERT_TRUE(AllProfilesHaveSameAppList());
- ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncer::APP_LIST));
+ // Disable APP_LIST by disabling APPS since APP_LIST is in APPS groups.
+ ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncer::APPS));
InstallApp(GetProfile(0), 0);
ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());
ASSERT_FALSE(AllProfilesHaveSameAppList());
- ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncer::APP_LIST));
+ // Enable APP_LIST by enabling APPS since APP_LIST is in APPS groups.
+ ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncer::APPS));
ASSERT_TRUE(AwaitQuiescence());
InstallAppsPendingForSync(GetProfile(0));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698