Re-enable sync E2E extensions tests on Mac and Windows

These tests were disabled a while ago by previous sync owners, let's try
re-enabling them.

Bug: 597319
Change-Id: Id66800f53f2af4ae0accb368f06dbf8c33642e6c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2462257Reviewed-by: Marc Treib <treib@chromium.org>
Commit-Queue: Victor Vianna <victorvianna@google.com>
Cr-Commit-Position: refs/heads/master@{#815519}

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

@@ -39,13 +39,6 @@ IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest,
   ASSERT_TRUE(ExtensionsMatchChecker().Wait());
 }
 
-// E2E tests flaky on Mac and Windows: https://crbug.com/597319
-#if defined(OS_MAC) || defined(OS_WIN)
-#define MAYBE_E2E(test_name) test_name
-#else
-#define MAYBE_E2E(test_name) E2E_ENABLED(test_name)
-#endif
-
 // Flaky on Mac: http://crbug.com/535996
 #if defined(OS_MAC)
 #define MAYBE_StartWithSameExtensions DISABLED_StartWithSameExtensions
@@ -76,7 +69,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest,
 #define MAYBE_StartWithDifferentExtensions StartWithDifferentExtensions
 #endif
 IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest,
-                       MAYBE_E2E(MAYBE_StartWithDifferentExtensions)) {
+                       E2E_ENABLED(MAYBE_StartWithDifferentExtensions)) {
   ResetSyncForPrimaryAccount();
   ASSERT_TRUE(SetupClients());
 
@@ -137,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest,
       static_cast<int>(GetInstalledExtensions(GetProfile(0)).size()));
 }
 
-IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, MAYBE_E2E(Add)) {
+IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, E2E_ENABLED(Add)) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameExtensions());
 
@@ -147,7 +140,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, MAYBE_E2E(Add)) {
   EXPECT_EQ(1u, GetInstalledExtensions(GetProfile(0)).size());
 }
 
-IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, MAYBE_E2E(Uninstall)) {
+IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, E2E_ENABLED(Uninstall)) {
   ResetSyncForPrimaryAccount();
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameExtensions());
@@ -161,7 +154,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, MAYBE_E2E(Uninstall)) {
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest,
-                       MAYBE_E2E(UpdateEnableDisableExtension)) {
+                       E2E_ENABLED(UpdateEnableDisableExtension)) {
   ResetSyncForPrimaryAccount();
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameExtensions());