diff options
| -rw-r--r-- | chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc b/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc index 0904166..69834c1 100644 --- a/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc +++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc @@ -657,7 +657,13 @@ TEST_F(ChromeNotifierServiceTest, ServiceEnabledTest) { } -TEST_F(ChromeNotifierServiceTest, InitializePrefsTest) { +// Failing new test on Win. http://crbug.com/294658 +#if defined(OS_WIN) +#define MAYBE_InitializePrefsTest DISABLED_InitializePrefsTest +#else +#define MAYBE_InitializePrefsTest InitializePrefsTest +#endif +TEST_F(ChromeNotifierServiceTest, MAYBE_InitializePrefsTest) { StubNotificationUIManager notification_manager; // The CTOR will call InitializePrefs(). ChromeNotifierService notifier(profile_.get(), ¬ification_manager); |