diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 00:26:31 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 00:26:31 +0000 |
| commit | 913870606f9b2eb75bbc3e3b77873170be91cc39 (patch) | |
| tree | 54e53e3c36dad278918ff89512e48ba775eb9b6a /sync/notifier | |
| parent | f37d0264850aa59c6d7beab37e97ba7f8cf66b62 (diff) | |
| download | chromium_src-913870606f9b2eb75bbc3e3b77873170be91cc39.zip chromium_src-913870606f9b2eb75bbc3e3b77873170be91cc39.tar.gz chromium_src-913870606f9b2eb75bbc3e3b77873170be91cc39.tar.bz2 | |
Do not create default sync notifier for android.
BUG=124138
TEST=
Review URL: http://codereview.chromium.org/10095034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/notifier')
| -rw-r--r-- | sync/notifier/sync_notifier_factory.cc | 6 | ||||
| -rw-r--r-- | sync/notifier/sync_notifier_factory_unittest.cc | 8 |
2 files changed, 14 insertions, 0 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 |