diff options
| author | michaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-29 20:43:09 +0000 |
|---|---|---|
| committer | michaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-29 20:43:09 +0000 |
| commit | 443accdb9fbb91fc3c978cf11f02d1ac815003a5 (patch) | |
| tree | 90592cbe2509916419a1a5504451d50539c914e8 /chrome/browser/sync | |
| parent | ba6b5cfec256bf3e2050a128289c062effede0d2 (diff) | |
| download | chromium_src-443accdb9fbb91fc3c978cf11f02d1ac815003a5.zip chromium_src-443accdb9fbb91fc3c978cf11f02d1ac815003a5.tar.gz chromium_src-443accdb9fbb91fc3c978cf11f02d1ac815003a5.tar.bz2 | |
Re-enable a previously disabled test. Failure is not reproducible.
BUG=33443
TEST=existing tests apply
Review URL: http://codereview.chromium.org/2833037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51160 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_unittest.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc index bcc6be7..b1db58d 100644 --- a/chrome/browser/sync/profile_sync_service_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_unittest.cc @@ -1314,17 +1314,9 @@ TEST_F(ProfileSyncServiceTestWithData, RecoverAfterDeletingSyncDataDirectory) { ExpectModelMatch(); } -#if defined(OS_MACOSX) -// TODO(dantasse) This test fails on the mac. See http://crbug.com/33443 -#define MAYBE_TestStartupWithOldSyncData DISABLED_TestStartupWithOldSyncData -#else -#define MAYBE_TestStartupWithOldSyncData TestStartupWithOldSyncData -#endif - // Make sure that things still work if sync is not enabled, but some old sync // databases are lingering in the "Sync Data" folder. - -TEST_F(ProfileSyncServiceTestWithData, MAYBE_TestStartupWithOldSyncData) { +TEST_F(ProfileSyncServiceTestWithData, TestStartupWithOldSyncData) { const char* nonsense1 = "reginald"; const char* nonsense2 = "beartato"; const char* nonsense3 = "harrison"; |