[Sync] Remove special cased sessions default commit

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

Index: chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
index 633f84fe9890b44689e9a2e7bb82860c1b49b6b1..7692200bece7940b64185771d7f3d5accf9e5d9f 100644
--- a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
@@ -44,22 +44,9 @@ static const char* kURL2 = "http://127.0.0.1/bubba2";
 // (as well as multi-window). We're currently only checking basic single-window/
 // single-tab functionality.
 
-// Fails on Win, see http://crbug.com/232313
-#if defined(OS_WIN)
-#define MAYBE_SingleClientChanged DISABLED_SingleClientChanged
-#define MAYBE_BothChanged DISABLED_BothChanged
-#define MAYBE_DeleteIdleSession DISABLED_DeleteIdleSession
-#define MAYBE_AllChanged DISABLED_AllChanged
-#else
-#define MAYBE_SingleClientChanged SingleClientChanged
-#define MAYBE_BothChanged BothChanged
-#define MAYBE_DeleteIdleSession DeleteIdleSession
-#define MAYBE_AllChanged AllChanged
-#endif
-
 
 IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
-                       E2E_ENABLED(MAYBE_SingleClientChanged)) {
+                       E2E_ENABLED(SingleClientChanged)) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Open tab and access a url on client 0
@@ -77,7 +64,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
-                       E2E_ENABLED(MAYBE_AllChanged)) {
+                       E2E_ENABLED(AllChanged)) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Open tabs on all clients and retain window information.
@@ -149,7 +136,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
   ASSERT_TRUE(IsEncryptionComplete(1));
 }
 
-IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, MAYBE_BothChanged) {
+IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, BothChanged) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   ASSERT_TRUE(CheckInitialState(0));
@@ -178,7 +165,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, MAYBE_BothChanged) {
   ASSERT_TRUE(WindowsMatch(sessions0[0]->windows, client1_windows));
 }
 
-IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, MAYBE_DeleteIdleSession) {
+IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, DeleteIdleSession) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   ASSERT_TRUE(CheckInitialState(0));
@@ -206,7 +193,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, MAYBE_DeleteIdleSession) {
 
 // Fails all release trybots. crbug.com/263369.
 IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
-                       DISABLED_DeleteActiveSession) {
+                       DeleteActiveSession) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   ASSERT_TRUE(CheckInitialState(0));