Merge 233885 "Revert 231221 - "Remove enabled/disabled state fro..."

chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc

Index: chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc
===================================================================
--- chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc	(revision 234311)
+++ chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc	(working copy)
@@ -8,6 +8,8 @@
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 using extensions_helper::AllProfilesHaveSameExtensionsAsVerifier;
+using extensions_helper::DisableExtension;
+using extensions_helper::EnableExtension;
 using extensions_helper::HasSameExtensionsAsVerifier;
 using extensions_helper::IncognitoDisableExtension;
 using extensions_helper::IncognitoEnableExtension;
@@ -179,6 +181,35 @@
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
+// TCM ID - 3605300.
+IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest,
+                       UpdateEnableDisableExtension) {
+  ASSERT_TRUE(SetupSync());
+  ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
+
+  InstallExtension(GetProfile(0), 0);
+  InstallExtension(GetProfile(1), 0);
+  InstallExtension(verifier(), 0);
+  ASSERT_TRUE(AwaitQuiescence());
+  ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
+
+  DisableExtension(GetProfile(0), 0);
+  DisableExtension(verifier(), 0);
+  ASSERT_TRUE(HasSameExtensionsAsVerifier(0));
+  ASSERT_FALSE(HasSameExtensionsAsVerifier(1));
+
+  ASSERT_TRUE(AwaitQuiescence());
+  ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
+
+  EnableExtension(GetProfile(1), 0);
+  EnableExtension(verifier(), 0);
+  ASSERT_TRUE(HasSameExtensionsAsVerifier(1));
+  ASSERT_FALSE(HasSameExtensionsAsVerifier(0));
+
+  ASSERT_TRUE(AwaitQuiescence());
+  ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
+}
+
 // TCM ID - 3728322.
 IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest,
                        UpdateIncognitoEnableDisable) {