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

2 files changed, 7 insertions, 30 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
 
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 144d6b9..17201cd 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -218,6 +218,7 @@
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         # TODO(akalin): Remove this (http://crbug.com/133352).
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
+        '../third_party/libjingle/libjingle.gyp:libjingle',
         'sync_core',
       ],
       'export_dependent_settings': [
@@ -241,12 +242,7 @@
         'notifier/object_id_invalidation_map.h',
       ],
       'conditions': [
-        ['OS == "ios"', {
-          'sources!': [
-            'notifier/invalidator_factory.cc',
-          ],
-        }],
-        ['OS != "android" and OS != "ios"', {
+        ['OS != "android"', {
           'sources': [
             'notifier/ack_tracker.cc',
             'notifier/ack_tracker.h',
@@ -267,11 +263,6 @@
             'notifier/sync_system_resources.h',
           ],
         }],
-        ['OS != "ios"', {
-          'dependencies': [
-            '../third_party/libjingle/libjingle.gyp:libjingle',
-          ],
-        }],
       ],
     },
     # The sync internal API library.
@@ -761,6 +752,7 @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        '../third_party/libjingle/libjingle.gyp:libjingle',
         'sync_core',
         'sync_notifier',
         'test_support_sync_notifier',
@@ -774,6 +766,7 @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        '../third_party/libjingle/libjingle.gyp:libjingle',
         'sync_core',
         'sync_notifier',
         'test_support_sync_notifier',
@@ -786,15 +779,7 @@
           'notifier/invalidator_factory_unittest.cc',
         ],
         'conditions': [
-          ['OS == "ios"', {
-            'sources!': [
-              # TODO(ios): Re-enable this test on iOS once there is an iOS
-              # implementation of invalidator_factory.
-              'notifier/invalidator_factory_unittest.cc',
-              'notifier/sync_notifier_factory_unittest.cc',
-            ],
-          }],
-          ['OS != "android" and OS != "ios"', {
+          ['OS != "android"', {
             'sources': [
               'notifier/ack_tracker_unittest.cc',
               'notifier/fake_invalidator_unittest.cc',
@@ -810,16 +795,6 @@
           }],
         ],
       },
-      'conditions': [
-        ['OS != "ios"', {
-          'dependencies': [
-            '../third_party/libjingle/libjingle.gyp:libjingle',
-          ],
-          'export_dependent_settings': [
-            '../third_party/libjingle/libjingle.gyp:libjingle',
-          ],
-        }],
-      ],
     },
 
     # Unit tests for the 'sync_internal_api' target.  This cannot be a static