diff options
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/notifier/sync_notifier_factory.cc | 6 | ||||
| -rw-r--r-- | sync/notifier/sync_notifier_factory_unittest.cc | 8 | ||||
| -rw-r--r-- | sync/sync.gyp | 63 |
3 files changed, 52 insertions, 25 deletions
diff --git a/sync/notifier/sync_notifier_factory.cc b/sync/notifier/sync_notifier_factory.cc index f547633..eaaf2ef 100644 --- a/sync/notifier/sync_notifier_factory.cc +++ b/sync/notifier/sync_notifier_factory.cc @@ -43,6 +43,7 @@ SyncNotifier* CreateDefaultSyncNotifier( } // namespace +// TODO(akalin): Remove the dependency on jingle if OS_ANDROID is defined. SyncNotifierFactory::SyncNotifierFactory( const notifier::NotifierOptions& notifier_options, const std::string& client_info, @@ -61,9 +62,14 @@ SyncNotifierFactory::~SyncNotifierFactory() { } SyncNotifier* SyncNotifierFactory::CreateSyncNotifier() { +#if defined(OS_ANDROID) + // Android uses ChromeSyncNotificationBridge exclusively. + return NULL; +#else return CreateDefaultSyncNotifier(notifier_options_, initial_max_invalidation_versions_, invalidation_version_tracker_, client_info_); +#endif } } // namespace sync_notifier diff --git a/sync/notifier/sync_notifier_factory_unittest.cc b/sync/notifier/sync_notifier_factory_unittest.cc index f895772..13738ce 100644 --- a/sync/notifier/sync_notifier_factory_unittest.cc +++ b/sync/notifier/sync_notifier_factory_unittest.cc @@ -56,9 +56,13 @@ TEST_F(SyncNotifierFactoryTest, Basic) { "test client info", base::WeakPtr<sync_notifier::InvalidationVersionTracker>()); scoped_ptr<SyncNotifier> notifier(factory.CreateSyncNotifier()); +#if defined(OS_ANDROID) + ASSERT_FALSE(notifier.get()); +#else ASSERT_TRUE(notifier.get()); notifier->AddObserver(&mock_observer_); notifier->RemoveObserver(&mock_observer_); +#endif } // Test basic creation of a P2PNotifier. @@ -69,9 +73,13 @@ TEST_F(SyncNotifierFactoryTest, Basic_P2P) { "test client info", base::WeakPtr<sync_notifier::InvalidationVersionTracker>()); scoped_ptr<SyncNotifier> notifier(factory.CreateSyncNotifier()); +#if defined(OS_ANDROID) + ASSERT_FALSE(notifier.get()); +#else ASSERT_TRUE(notifier.get()); notifier->AddObserver(&mock_observer_); notifier->RemoveObserver(&mock_observer_); +#endif } } // namespace diff --git a/sync/sync.gyp b/sync/sync.gyp index 59073ad..69221e3 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -204,27 +204,34 @@ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', ], 'sources': [ - 'notifier/cache_invalidation_packet_handler.cc', - 'notifier/cache_invalidation_packet_handler.h', - 'notifier/chrome_invalidation_client.cc', - 'notifier/chrome_invalidation_client.h', - 'notifier/chrome_system_resources.cc', - 'notifier/chrome_system_resources.h', - 'notifier/invalidation_notifier.h', - 'notifier/invalidation_notifier.cc', - 'notifier/invalidation_util.cc', - 'notifier/invalidation_util.h', - 'notifier/invalidation_version_tracker.h', - 'notifier/non_blocking_invalidation_notifier.h', - 'notifier/non_blocking_invalidation_notifier.cc', - 'notifier/p2p_notifier.h', - 'notifier/p2p_notifier.cc', - 'notifier/registration_manager.cc', - 'notifier/registration_manager.h', - 'notifier/state_writer.h', 'notifier/sync_notifier.h', 'notifier/sync_notifier_factory.h', 'notifier/sync_notifier_factory.cc', + 'notifier/sync_notifier_observer.h', + ], + 'conditions': [ + ['OS != "android"', { + 'sources': [ + 'notifier/cache_invalidation_packet_handler.cc', + 'notifier/cache_invalidation_packet_handler.h', + 'notifier/chrome_invalidation_client.cc', + 'notifier/chrome_invalidation_client.h', + 'notifier/chrome_system_resources.cc', + 'notifier/chrome_system_resources.h', + 'notifier/invalidation_notifier.h', + 'notifier/invalidation_notifier.cc', + 'notifier/invalidation_util.cc', + 'notifier/invalidation_util.h', + 'notifier/invalidation_version_tracker.h', + 'notifier/non_blocking_invalidation_notifier.h', + 'notifier/non_blocking_invalidation_notifier.cc', + 'notifier/p2p_notifier.h', + 'notifier/p2p_notifier.cc', + 'notifier/registration_manager.cc', + 'notifier/registration_manager.h', + 'notifier/state_writer.h', + ], + }], ], }, @@ -430,15 +437,21 @@ '..', ], 'sources': [ - 'notifier/cache_invalidation_packet_handler_unittest.cc', - 'notifier/chrome_invalidation_client_unittest.cc', - 'notifier/chrome_system_resources_unittest.cc', - 'notifier/invalidation_notifier_unittest.cc', - 'notifier/non_blocking_invalidation_notifier_unittest.cc', - 'notifier/p2p_notifier_unittest.cc', - 'notifier/registration_manager_unittest.cc', 'notifier/sync_notifier_factory_unittest.cc', ], + 'conditions': [ + ['OS != "android"', { + 'sources': [ + 'notifier/cache_invalidation_packet_handler_unittest.cc', + 'notifier/chrome_invalidation_client_unittest.cc', + 'notifier/chrome_system_resources_unittest.cc', + 'notifier/invalidation_notifier_unittest.cc', + 'notifier/non_blocking_invalidation_notifier_unittest.cc', + 'notifier/p2p_notifier_unittest.cc', + 'notifier/registration_manager_unittest.cc', + ], + }], + ], }, }, |