Enable AddExpiredThenUpdate on MACOSX

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

Index: chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc
index 999bb1fa15a80c5af90efcf88b7c8e495f22c625..03958d308ffdae6941a0ac4ec7bbeffa97e07bb4 100644
--- a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc
@@ -126,13 +126,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, AddExpired) {
   EXPECT_FALSE(CheckSyncDirectoryHasURL(0, new_url));
 }
 
-// Flake on mac: http://crbug/115526
-#if defined(OS_MACOSX)
-#define MAYBE_AddExpiredThenUpdate DISABLED_AddExpiredThenUpdate
-#else
-#define MAYBE_AddExpiredThenUpdate AddExpiredThenUpdate
-#endif
-IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, MAYBE_AddExpiredThenUpdate) {
+IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, AddExpiredThenUpdate) {
   const base::string16 kHistoryUrl(
       ASCIIToUTF16("http://www.add-one-history.google.com/"));
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";