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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/extensions_helper.h"
 #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;
 using extensions_helper::InstallExtension;
 using extensions_helper::InstallExtensionsPendingForSync;
 using extensions_helper::UninstallExtension;
 
 class TwoClientExtensionsSyncTest : public SyncTest {
  public:
   TwoClientExtensionsSyncTest() : SyncTest(TWO_CLIENT) {}
@@ skipping 151 matching lines @@
 
   InstallExtension(GetProfile(1), 3);
   InstallExtension(verifier(), 3);
 
   ASSERT_TRUE(AwaitQuiescence());
   InstallExtensionsPendingForSync(GetProfile(0));
   InstallExtensionsPendingForSync(GetProfile(1));
   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) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 
   InstallExtension(GetProfile(0), 0);
   InstallExtension(GetProfile(1), 0);
   InstallExtension(verifier(), 0);
   ASSERT_TRUE(AwaitQuiescence());
@@ skipping 76 matching lines @@
 
   UninstallExtension(GetProfile(0), 0);
   UninstallExtension(verifier(), 0);
 
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
 // TODO(akalin): Add tests exercising:
 //   - Offline installation/uninstallation behavior