diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 08:02:39 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 08:02:39 +0000 |
| commit | 53ae39da3c63e99fb7622037f8525ac4f67fb23f (patch) | |
| tree | c2c41704b91daabbe9549877b1df7e17469092a1 /sync/notifier | |
| parent | 58eff2ecab0db9fcccb9968150f6619e508706ac (diff) | |
| download | chromium_src-53ae39da3c63e99fb7622037f8525ac4f67fb23f.zip chromium_src-53ae39da3c63e99fb7622037f8525ac4f67fb23f.tar.gz chromium_src-53ae39da3c63e99fb7622037f8525ac4f67fb23f.tar.bz2 | |
sync: fix and enable InvalidationNotifierTest.Basic
BUG=119467
TEST=InvalidationNotifierTest.Basic
Review URL: https://chromiumcodereview.appspot.com/10446073
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/notifier')
| -rw-r--r-- | sync/notifier/invalidation_notifier_unittest.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sync/notifier/invalidation_notifier_unittest.cc b/sync/notifier/invalidation_notifier_unittest.cc index 00db644..9c6d593 100644 --- a/sync/notifier/invalidation_notifier_unittest.cc +++ b/sync/notifier/invalidation_notifier_unittest.cc @@ -52,19 +52,13 @@ class InvalidationNotifierTest : public testing::Test { invalidation_notifier_.reset(); } - MessageLoop message_loop_; + MessageLoopForIO message_loop_; scoped_ptr<InvalidationNotifier> invalidation_notifier_; StrictMock<MockSyncNotifierObserver> mock_observer_; notifier::FakeBaseTask fake_base_task_; }; -// Crashes on Linux and Mac, http://crbug.com/119467 -#if defined(OS_LINUX) || defined(OS_MACOSX) -#define MAYBE_Basic DISABLED_Basic -#else -#define MAYBE_Basic Basic -#endif -TEST_F(InvalidationNotifierTest, MAYBE_Basic) { +TEST_F(InvalidationNotifierTest, Basic) { InSequence dummy; syncable::ModelTypePayloadMap type_payloads; |