diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 21:33:00 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 21:33:00 +0000 |
| commit | 6040af94afce8f5953b8c19c5258a6d8be122152 (patch) | |
| tree | 4b5ac1a229555694d24103633386b192d8132594 /sync/notifier | |
| parent | ea91a2bf8536adfed57c70d56df741dbd8aeb8d2 (diff) | |
| download | chromium_src-6040af94afce8f5953b8c19c5258a6d8be122152.zip chromium_src-6040af94afce8f5953b8c19c5258a6d8be122152.tar.gz chromium_src-6040af94afce8f5953b8c19c5258a6d8be122152.tar.bz2 | |
Makes the necessary changes to sync.gyp as well as its dependencies (most notably jingle) in order to bring up the complete sync_notifier target on iOS.
TBR=thakis
Review URL: https://chromiumcodereview.appspot.com/12041016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/notifier')
| -rw-r--r-- | sync/notifier/invalidator_registrar_unittest.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sync/notifier/invalidator_registrar_unittest.cc b/sync/notifier/invalidator_registrar_unittest.cc index 4d5df6c..00f04e2 100644 --- a/sync/notifier/invalidator_registrar_unittest.cc +++ b/sync/notifier/invalidator_registrar_unittest.cc @@ -130,6 +130,7 @@ class InvalidatorRegistrarTest : public testing::Test {}; // When we expect a death via CHECK(), we can't match against the // CHECK() message since they are removed in official builds. +#if GTEST_HAS_DEATH_TEST // Having registered handlers on destruction should cause a CHECK. TEST_F(InvalidatorRegistrarTest, RegisteredHandlerOnDestruction) { scoped_ptr<InvalidatorRegistrar> registrar(new InvalidatorRegistrar()); @@ -168,6 +169,7 @@ TEST_F(InvalidatorRegistrarTest, MultipleRegistration) { registrar.UnregisterHandler(&handler2); registrar.UnregisterHandler(&handler1); } +#endif // GTEST_HAS_DEATH_TEST } // namespace |