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

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

Issue 65983002: Revert 231221 - "Remove enabled/disabled state from extension and app sync." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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_apps_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
index efe941c99f2c12f9516eddf9409e39200fa419c0..475759a5465de745c5d8090fdac11b21180a9401 100644
--- a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
@@ -15,6 +15,8 @@
using apps_helper::AllProfilesHaveSameAppsAsVerifier;
using apps_helper::CopyNTPOrdinals;
+using apps_helper::DisableApp;
+using apps_helper::EnableApp;
using apps_helper::FixNTPOrdinalCollisions;
using apps_helper::GetAppLaunchOrdinalForApp;
using apps_helper::HasSameAppsAsVerifier;
@@ -239,6 +241,34 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, Merge) {
ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
}
+// TCM ID - 7723126.
+IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateEnableDisableApp) {
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+
+ InstallApp(GetProfile(0), 0);
+ InstallApp(GetProfile(1), 0);
+ InstallApp(verifier(), 0);
+ ASSERT_TRUE(AwaitQuiescence());
+ ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+
+ DisableApp(GetProfile(0), 0);
+ DisableApp(verifier(), 0);
+ ASSERT_TRUE(HasSameAppsAsVerifier(0));
+ ASSERT_FALSE(HasSameAppsAsVerifier(1));
+
+ ASSERT_TRUE(AwaitQuiescence());
+ ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+
+ EnableApp(GetProfile(1), 0);
+ EnableApp(verifier(), 0);
+ ASSERT_TRUE(HasSameAppsAsVerifier(1));
+ ASSERT_FALSE(HasSameAppsAsVerifier(0));
+
+ ASSERT_TRUE(AwaitQuiescence());
+ ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+}
+
// TCM ID - 7706637.
IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateIncognitoEnableDisable) {
ASSERT_TRUE(SetupSync());

Powered by Google App Engine
This is Rietveld 408576698